From cab0c68a4e59a952f4a83aaaf32fc0213a1632fd11bc6847ead733fd0555c45d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 2 Dec 2022 23:54:25 +0000 Subject: [PATCH 1/4] - Enable libsamplerate and libdecor components - Remove unused tslib build requirement - Link rather than dlopen libraries OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=145 --- SDL2.changes | 7 +++++++ SDL2.spec | 14 +++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index f2a33ef..cd3ec24 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 2 23:51:23 UTC 2022 - Jan Engelhardt + +- Enable libsamplerate and libdecor components +- Remove unused tslib build requirement +- Link rather than dlopen libraries + ------------------------------------------------------------------- Thu Dec 1 20:38:41 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index 211b38c..bf6a44c 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -33,6 +33,7 @@ Source4: baselibs.conf Patch1: sdl2-symvers.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libdecor-devel BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) >= 1.0.11 BuildRequires: pkgconfig(dbus-1) @@ -50,9 +51,10 @@ BuildRequires: pkgconfig(ice) # KMS/DRM driver needs libdrm and libgbm BuildRequires: pkgconfig(gbm) >= 11.1.0 BuildRequires: pkgconfig(libdrm) >= 2.4.82 +BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libpulse-simple) >= 0.9 BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(tslib) +BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(wayland-client) >= 1.18 BuildRequires: pkgconfig(wayland-cursor) @@ -84,9 +86,6 @@ This is the "Simple DirectMedia Layer" library. It provides a generic API for access to audio, keyboard, mouse, and display framebuffer across multiple platforms. -SDL2 uses dlopen, so if you experience problems under X11, check -again that libXrandr2 and libXi6 are in fact installed. - %package devel Summary: SDL2 Library Developer Files Group: Development/Libraries/X11 @@ -113,6 +112,7 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md %build %global _lto_cflags %_lto_cflags -ffat-lto-objects # In this instance, we do want --with-pic because of libSDL2main.a. +# --disable-*-shared -> controls dlopen rather than sharedness %configure --with-pic --disable-alsa-shared --disable-video-directfb \ --enable-video-kmsdrm --enable-video-wayland \ %if 0%{?sle_version} @@ -121,7 +121,11 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md %ifarch ix86 --enable-sse2=no \ %endif - --enable-sse3=no --disable-rpath --disable-3dnow + --enable-sse3=no --disable-rpath --disable-3dnow \ + --disable-alsa-shared --disable-pipewire-shared \ + --disable-pulseaudio-shared --disable-libsamplerate-shared \ + --disable-wayland-shared --disable-libdecor-shared \ + --disable-x11-shared --disable-kmsdrm-shared %make_build %install From e2cabecae06ae9d6c1a9c3fdc2833dbc6a1ce64d217f1087eba5df231ffadd24 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Jan 2023 22:39:59 +0000 Subject: [PATCH 2/4] osc copypac from project:games package:SDL2 revision:144 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=146 --- SDL2.changes | 7 ------- SDL2.spec | 14 +++++--------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index cd3ec24..f2a33ef 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Fri Dec 2 23:51:23 UTC 2022 - Jan Engelhardt - -- Enable libsamplerate and libdecor components -- Remove unused tslib build requirement -- Link rather than dlopen libraries - ------------------------------------------------------------------- Thu Dec 1 20:38:41 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index bf6a44c..211b38c 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -33,7 +33,6 @@ Source4: baselibs.conf Patch1: sdl2-symvers.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libdecor-devel BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) >= 1.0.11 BuildRequires: pkgconfig(dbus-1) @@ -51,10 +50,9 @@ BuildRequires: pkgconfig(ice) # KMS/DRM driver needs libdrm and libgbm BuildRequires: pkgconfig(gbm) >= 11.1.0 BuildRequires: pkgconfig(libdrm) >= 2.4.82 -BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libpulse-simple) >= 0.9 BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(tslib) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(wayland-client) >= 1.18 BuildRequires: pkgconfig(wayland-cursor) @@ -86,6 +84,9 @@ This is the "Simple DirectMedia Layer" library. It provides a generic API for access to audio, keyboard, mouse, and display framebuffer across multiple platforms. +SDL2 uses dlopen, so if you experience problems under X11, check +again that libXrandr2 and libXi6 are in fact installed. + %package devel Summary: SDL2 Library Developer Files Group: Development/Libraries/X11 @@ -112,7 +113,6 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md %build %global _lto_cflags %_lto_cflags -ffat-lto-objects # In this instance, we do want --with-pic because of libSDL2main.a. -# --disable-*-shared -> controls dlopen rather than sharedness %configure --with-pic --disable-alsa-shared --disable-video-directfb \ --enable-video-kmsdrm --enable-video-wayland \ %if 0%{?sle_version} @@ -121,11 +121,7 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md %ifarch ix86 --enable-sse2=no \ %endif - --enable-sse3=no --disable-rpath --disable-3dnow \ - --disable-alsa-shared --disable-pipewire-shared \ - --disable-pulseaudio-shared --disable-libsamplerate-shared \ - --disable-wayland-shared --disable-libdecor-shared \ - --disable-x11-shared --disable-kmsdrm-shared + --enable-sse3=no --disable-rpath --disable-3dnow %make_build %install From 131c19623f5d40d41120bc56cf9d30471ea1d6794caed1364c293598f4dcee6b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Jan 2023 22:41:40 +0000 Subject: [PATCH 3/4] - Update to release 2.26.2 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=147 --- SDL2-2.26.1.tar.gz | 3 --- SDL2-2.26.1.tar.gz.sig | Bin 95 -> 0 bytes SDL2-2.26.2.tar.gz | 3 +++ SDL2-2.26.2.tar.gz.sig | Bin 0 -> 95 bytes SDL2.changes | 9 +++++++++ SDL2.spec | 4 ++-- 6 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 SDL2-2.26.1.tar.gz delete mode 100644 SDL2-2.26.1.tar.gz.sig create mode 100644 SDL2-2.26.2.tar.gz create mode 100644 SDL2-2.26.2.tar.gz.sig diff --git a/SDL2-2.26.1.tar.gz b/SDL2-2.26.1.tar.gz deleted file mode 100644 index 718173b..0000000 --- a/SDL2-2.26.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02537cc7ebd74071631038b237ec4bfbb3f4830ba019e569434da33f42373e04 -size 8084125 diff --git a/SDL2-2.26.1.tar.gz.sig b/SDL2-2.26.1.tar.gz.sig deleted file mode 100644 index 0ecc0618d2cdf6216f14b7845bb79a575bbcc4e83cee5161da426dced1f08927..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WD(U!j%^5DT3>$gL7TzS$>qz-te>$mC3o^HVc_BvfQiToGA!7A vZ@Z#mG+uwa(CM{=Y7Nw=kCg6l%X1$O0H9P$7FX!<2b diff --git a/SDL2-2.26.2.tar.gz b/SDL2-2.26.2.tar.gz new file mode 100644 index 0000000..9becf4e --- /dev/null +++ b/SDL2-2.26.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95d39bc3de037fbdfa722623737340648de4f180a601b0afad27645d150b99e0 +size 8084120 diff --git a/SDL2-2.26.2.tar.gz.sig b/SDL2-2.26.2.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..6efa5993387cbba23dff51578bedb6d476e523447e0c5129674e1b9180864049 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WD(U!j%^5DT3>$gL7TzS$>qz-te>$mC2w)Mz`(^R02BGTiDAK1 v$(SkfY!gMdf4X&s)2a7m!THM@8Rp7agq>?;h*lDRbz3+~O60!UOV`x^o5m)E literal 0 HcmV?d00001 diff --git a/SDL2.changes b/SDL2.changes index f2a33ef..ff2a925 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 3 22:40:15 UTC 2023 - Jan Engelhardt + +- Update to release 2.26.2 + * Fixed long delay at startup when a Razer keyboard is + connected + * Fixed not receiving SDLK_5 or SDL_SCANCODE_5 when using the + AZERTY keyboard layout on Linux + ------------------------------------------------------------------- Thu Dec 1 20:38:41 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index 211b38c..7993914 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -1,7 +1,7 @@ # # spec file for package SDL2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define sle_version 0 Name: SDL2 %define lname libSDL2-2_0-0 -Version: 2.26.1 +Version: 2.26.2 Release: 0 Summary: Simple DirectMedia Layer Library License: Zlib From 52c71aee6c2b1c8d28a07ee6e311feedec14a16fdf1c45e519fe1e34ce7ef83b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Jan 2023 22:42:54 +0000 Subject: [PATCH 4/4] - Enable libsamplerate and libdecor components - Remove unused tslib build requirement OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=148 --- SDL2.changes | 2 ++ SDL2.spec | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SDL2.changes b/SDL2.changes index ff2a925..fb0ee66 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -6,6 +6,8 @@ Tue Jan 3 22:40:15 UTC 2023 - Jan Engelhardt connected * Fixed not receiving SDLK_5 or SDL_SCANCODE_5 when using the AZERTY keyboard layout on Linux +- Enable libsamplerate and libdecor components +- Remove unused tslib build requirement ------------------------------------------------------------------- Thu Dec 1 20:38:41 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index 7993914..606a456 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -33,6 +33,7 @@ Source4: baselibs.conf Patch1: sdl2-symvers.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libdecor-devel BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) >= 1.0.11 BuildRequires: pkgconfig(dbus-1) @@ -52,7 +53,7 @@ BuildRequires: pkgconfig(gbm) >= 11.1.0 BuildRequires: pkgconfig(libdrm) >= 2.4.82 BuildRequires: pkgconfig(libpulse-simple) >= 0.9 BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(tslib) +BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(wayland-client) >= 1.18 BuildRequires: pkgconfig(wayland-cursor)