libsdl2-32: now uses cmake, supports pipewire, pulseaudio and wayland

3 files changed, 39 insertions, 19 deletions

diff --git a/libsdl2-32/.footprint b/libsdl2-32/.footprint
index 7d0b03b8..901d0d58 100644
--- a/libsdl2-32/.footprint
+++ b/libsdl2-32/.footprint
@@ -2,16 +2,14 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/cmake/
 drwxr-xr-x	root/root	usr/lib32/cmake/SDL2/
--rw-r--r--	root/root	usr/lib32/cmake/SDL2/sdl2-config-version.cmake
--rw-r--r--	root/root	usr/lib32/cmake/SDL2/sdl2-config.cmake
-lrwxrwxrwx	root/root	usr/lib32/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.16.0
+-rw-r--r--	root/root	usr/lib32/cmake/SDL2/SDL2Config.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/SDL2/SDL2ConfigVersion.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/SDL2/SDL2Targets.cmake
+-rw-r--r--	root/root	usr/lib32/cmake/SDL2/SDL2Targets-release.cmake
 -rwxr-xr-x	root/root	usr/lib32/libSDL2-2.0.so.0.16.0
--rw-r--r--	root/root	usr/lib32/libSDL2.a
--rwxr-xr-x	root/root	usr/lib32/libSDL2.la
-lrwxrwxrwx	root/root	usr/lib32/libSDL2.so -> libSDL2-2.0.so.0.16.0
--rw-r--r--	root/root	usr/lib32/libSDL2_test.a
--rwxr-xr-x	root/root	usr/lib32/libSDL2_test.la
+lrwxrwxrwx	root/root	usr/lib32/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.16.0
+lrwxrwxrwx	root/root	usr/lib32/libSDL2-2.0.so -> libSDL2-2.0.so.0
 -rw-r--r--	root/root	usr/lib32/libSDL2main.a
--rwxr-xr-x	root/root	usr/lib32/libSDL2main.la
+lrwxrwxrwx	root/root	usr/lib32/libSDL2.so -> libSDL2-2.0.so
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/sdl2.pc
diff --git a/libsdl2-32/.signature b/libsdl2-32/.signature
index b1449b16..4f166253 100644
--- a/libsdl2-32/.signature
+++ b/libsdl2-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXa4/WOzB6kCoDo7z2p8l2a7JLPPxkovfpUrZLk/ld5P1nxvuVSIPfU+/u2BDAqHnbPrOqlBbk18GoW7AgwEroAQ=
-SHA256 (Pkgfile) = cb34dce2b674808b153e91db94c33348d9aa6f3aa85ad9c0f04fec5940c47fce
-SHA256 (.footprint) = e4768d1d6276c641d3edb72be040d6a5ec9bd10b471a0aeb639846810169ba5d
+RWSwxGo/zH7eXeaY43jm4YjLWr4p7pdrsMv6bggvfgcaNbIb/7fZQXJUmN7BGMpDoFkAOg0/4An4tFNmIZ7rD23meBZuzNViwAg=
+SHA256 (Pkgfile) = 1a13d05c67d065564802579058575904f83e6a112b7ecd606c37631c8e245742
+SHA256 (.footprint) = 704f6124b7c7e82228cb6756c599c4ba5d06c6ceb19f41daa17964fa3c502ead
 SHA256 (SDL2-2.0.16.tar.gz) = 65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
diff --git a/libsdl2-32/Pkgfile b/libsdl2-32/Pkgfile
index cb4d64e0..3ceb8473 100644
--- a/libsdl2-32/Pkgfile
+++ b/libsdl2-32/Pkgfile
@@ -2,21 +2,43 @@
 # URL: https://www.libsdl.org/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 # Depends on: alsa-lib-32 libsdl2 mesa-32
+# Optional: ninja pipewire-32 pulseaudio-32 wayland-protocols-32
 
 name=libsdl2-32
 version=2.0.16
-release=1
+release=2
 source=(https://www.libsdl.org/release/SDL2-$version.tar.gz)
 
 build() {
-	cd SDL2-$version
+	prt-get isinst alsa-lib-32 && PKGMK_SDL2+=' -D ALSA=ON'
+	prt-get isinst ninja && PKGMK_SDL2+=' -G Ninja'
+	prt-get isinst jack && PKGMK_SDL2+=' -D JACK_SHARED=OFF'
+	#prt-get isinst jack-32 && PKGMK_SDL2+=' -D JACK_SHARED=ON'
+	prt-get isinst pipewire-32 && PKGMK_SDL2+=' -D PIPEWIRE_SHARED=ON'
+	prt-get isinst pulseaudio-32 && PKGMK_SDL2+=' -D PULSEAUDIO_SHARED=ON'
+	prt-get isinst wayland-protocols-32 && PKGMK_SDL2+=' -D VIDEO_WAYLAND=ON'
 
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib32
+	sed -i -e 's|lib/cmake|lib32/cmake|' \
+		-e '/pkg_search_module.*ibus-1.0/d' SDL2-$version/CMakeLists.txt
 
-	make
-	make DESTDIR=$PKG install
+	prt-get isinst ccache  && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
+
+	## Target "SDL2" links to item " -m32" which has leading or trailing
+	## whitespace.  This is now an error according to policy CMP0004.
+	LDFLAGS='-m32'
+
+	cmake -S SDL2-$version -B build $PKGMK_SDL2 \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_INSTALL_LIBDIR=lib \
+		-D LIB_SUFFIX=32 \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CLOCK_GETTIME=ON \
+		-D RPATH=OFF \
+		-D SDL_STATIC=OFF \
+		-D SDL_DLOPEN=ON \
+		-Wno-dev
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 
 	rm -r $PKG/usr/{bin,include,share}
 }