Fix incorrect wayland flag and change install prefix to /opt/steam-screensaver-fix.

3 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33f2a461647f..cec31d152242 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = steam-screensaver-fix
 	pkgdesc = Fix for steam screensaving bug.
 	pkgver = 2.0.18
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ValveSoftware/steam-for-linux/issues/5607
 	arch = i686
 	arch = x86_64
@@ -34,6 +34,7 @@ pkgbase = steam-screensaver-fix
 	depends = libusb
 	source = https://www.libsdl.org/release/SDL2-2.0.18.tar.gz
 	source = https://www.libsdl.org/release/SDL2-2.0.18.tar.gz.sig
+	source = sdl2-wayland1.20.patch::https://github.com/libsdl-org/SDL/pull/5092.patch
 	source = steam-screensaver-fix-runtime.desktop
 	source = steam-screensaver-fix-native.desktop
 	source = 0001-SDL-allow-screensaver.patch
@@ -43,10 +44,11 @@ pkgbase = steam-screensaver-fix
 	validpgpkeys = 1528635D8053A57F77D1E08630A59377A7763BE6
 	sha256sums = 94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c
 	sha256sums = SKIP
+	sha256sums = 6eb61d5918b1567f88cf662dfd87ceaf40e3c97bb47d2c22ee02fdb1ae29237b
 	sha256sums = 114c7ca82e6b7605c9e88bf569bd7f0d3ddad3f7260ac79c255f7f8f833a5379
 	sha256sums = 1fdb424e1535aae8ae0acf045cc0b251f14563b7423f895abc6110b1da4c4ef1
 	sha256sums = a2f2935c0ae252a0e0fe924ebf4083b101689347f782c4a48637e41bdee849ef
-	sha256sums = fe684fd277bb27cc79c9648d2d44ae9e936717f32b7c099ba05579dd53524840
+	sha256sums = 2607f8e9115e2ba42d16813b5283f648044afac6443357ed35cf301b52b66eb4
 	sha256sums = c14b0f0a7a901d02de53ef7a511b7df7e87d670abb3181872a823d1ce57330f2
 	sha256sums = bcb88dd0640f53576c949a9f6e2c2c4b7af3665ea080c6e9a89ac9ac398cb220
 	depends_x86_64 = lib32-glibc
diff --git a/PKGBUILD b/PKGBUILD
index 560a79958f58..4c475b81c020 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=steam-screensaver-fix
 pkgver=2.0.18
-pkgrel=1
+pkgrel=2
 pkgdesc='Fix for steam screensaving bug.'
 arch=('i686' 'x86_64')
 url='https://github.com/ValveSoftware/steam-for-linux/issues/5607'
@@ -54,6 +54,7 @@ makedepends_x86_64=(
   'lib32-pipewire')
 source=(
 	"https://www.libsdl.org/release/SDL2-${pkgver}.tar.gz"{,.sig}
+	sdl2-wayland1.20.patch::https://github.com/libsdl-org/SDL/pull/5092.patch
 	'steam-screensaver-fix-runtime.desktop'
 	'steam-screensaver-fix-native.desktop'
 	'0001-SDL-allow-screensaver.patch'
@@ -62,15 +63,18 @@ source=(
 	'steam-screensaver-fix-native')
 sha256sums=('94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c'
             'SKIP'
+            '6eb61d5918b1567f88cf662dfd87ceaf40e3c97bb47d2c22ee02fdb1ae29237b'
             '114c7ca82e6b7605c9e88bf569bd7f0d3ddad3f7260ac79c255f7f8f833a5379'
             '1fdb424e1535aae8ae0acf045cc0b251f14563b7423f895abc6110b1da4c4ef1'
             'a2f2935c0ae252a0e0fe924ebf4083b101689347f782c4a48637e41bdee849ef'
-            'fe684fd277bb27cc79c9648d2d44ae9e936717f32b7c099ba05579dd53524840'
+            '2607f8e9115e2ba42d16813b5283f648044afac6443357ed35cf301b52b66eb4'
             'c14b0f0a7a901d02de53ef7a511b7df7e87d670abb3181872a823d1ce57330f2'
             'bcb88dd0640f53576c949a9f6e2c2c4b7af3665ea080c6e9a89ac9ac398cb220')
 validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6')
 
-_flags=( 
+_prefix='/opt/steam-screensaver-fix'
+
+_flags=(
 	-DSDL_STATIC=OFF
 	-DSDL_DLOPEN=ON
 	-DSDL_ARTS=OFF
@@ -78,7 +82,7 @@ _flags=(
 	-DSDL_NAS=OFF
 	-DSDL_ALSA=ON
 	-DSDL_PULSEAUDIO_SHARED=ON
-	-DSDL_VIDEO_WAYLAND=ON
+	-DSDL_WAYLAND=ON
 	-DSDL_RPATH=OFF
 	-DSDL_CLOCK_GETTIME=ON
 	-DSDL_JACK_SHARED=ON
@@ -89,6 +93,7 @@ _flags=(
 
 prepare() {
 	cd "SDL2-${pkgver}"
+	patch -Np1 -i "${srcdir}/sdl2-wayland1.20.patch"
 	patch -p1 -i "${srcdir}/0001-SDL-allow-screensaver.patch"
 	#patch -p1 -i "${srcdir}/fix-hidapi.patch"
 	sed -i '/pkg_search_module.*ibus-1.0/d' 'CMakeLists.txt'
@@ -113,8 +118,8 @@ build() {
 }
 
 package() {
-	[ "$CARCH" = 'x86_64' ] && install -Dm755 'lib32/libSDL2-2.0.so' "${pkgdir}/usr/lib32/libSDLsteam.so"
-	install -Dm755 'libnative/libSDL2-2.0.so' "${pkgdir}/usr/lib/libSDLsteam.so"
+	[ "$CARCH" = 'x86_64' ] && install -Dm755 'lib32/libSDL2-2.0.so' "${pkgdir}${_prefix}/lib32/libSDLsteam.so"
+	install -Dm755 'libnative/libSDL2-2.0.so' "${pkgdir}${_prefix}/lib/libSDLsteam.so"
 	
 	install -Dm755 'steam_sdl_injection.sh' 'steam-screensaver-fix-runtime' 'steam-screensaver-fix-native' -t "${pkgdir}/usr/bin/"
 	install -Dm755 'steam-screensaver-fix-runtime.desktop' 'steam-screensaver-fix-native.desktop' -t "${pkgdir}/usr/share/applications/"
diff --git a/steam_sdl_injection.sh b/steam_sdl_injection.sh
index f286be6802ba..f0d535709b5d 100755
--- a/steam_sdl_injection.sh
+++ b/steam_sdl_injection.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
-export LD_PRELOAD=libSDLsteam.so
+export LD_PRELOAD=/opt/steam-screensaver-fix/lib/libSDLsteam.so:/opt/steam-screensaver-fix/lib32/libSDLsteam.so
 "$@"