From 5d35b11416e68df70192f2277659f707f9bb0d10 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 23 Aug 2025 19:05:43 +0200 Subject: [PATCH] package/sdl: improve existing patches - Replace patch 0001 by a properly Git-formatted patch, cherry-picked from the upstream Git repository at https://github.com/libsdl-org/SDL-1.2 - Add Upstream: tags on both patches, with the upstream Git commit. Updated .checkpackageignore accordingly. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour (cherry picked from commit da3996a39d3330722a8458c296c5bccfdd6a0adc) Signed-off-by: Thomas Perale --- .checkpackageignore | 2 - ...-compilation-with-libX11-1.5.99.902.patch} | 51 +++++++++++-------- ...x11yuv.c-fix-possible-use-after-free.patch | 5 +- 3 files changed, 33 insertions(+), 25 deletions(-) rename package/sdl/{0001-fix-compilation-with-libx11.patch => 0001-Fix-compilation-with-libX11-1.5.99.902.patch} (57%) diff --git a/.checkpackageignore b/.checkpackageignore index 2f88ef4698..541d3d3767 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1033,8 +1033,6 @@ package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch lib package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch lib_patch.Upstream -package/sdl/0001-fix-compilation-with-libx11.patch lib_patch.Upstream -package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch lib_patch.Upstream package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch lib_patch.Upstream package/sdl_mixer/0002-configure__set_macro_directory.patch lib_patch.Upstream package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch lib_patch.Upstream diff --git a/package/sdl/0001-fix-compilation-with-libx11.patch b/package/sdl/0001-Fix-compilation-with-libX11-1.5.99.902.patch similarity index 57% rename from package/sdl/0001-fix-compilation-with-libx11.patch rename to package/sdl/0001-Fix-compilation-with-libX11-1.5.99.902.patch index 27f244883e..83f0ab2bb1 100644 --- a/package/sdl/0001-fix-compilation-with-libx11.patch +++ b/package/sdl/0001-Fix-compilation-with-libX11-1.5.99.902.patch @@ -1,20 +1,24 @@ -sdl: Fix compilation with libX11 >= 1.5.99.902 -Signed-off-by: Vicente Olivert Riera - -# HG changeset patch -# User Azamat H. Hackimov -# Date 1370184533 -21600 -# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8 -# Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268 -Fix compilation with libX11 >= 1.5.99.902. +From 41410b72746cfc7ff515aefed62b0b179bf6e8da Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Sun, 2 Jun 2013 20:48:53 +0600 +Subject: [PATCH] Fix compilation with libX11 >= 1.5.99.902. These changes fixes bug #1769 for SDL 1.2 (http://bugzilla.libsdl.org/show_bug.cgi?id=1769). -diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in ---- a/configure.in Wed Apr 17 00:56:53 2013 -0700 -+++ b/configure.in Sun Jun 02 20:48:53 2013 +0600 -@@ -1169,6 +1169,17 @@ +Upstream: 5d79977ec7a6b58afa6e4817035aaaba186f7e9f +Signed-off-by: Vicente Olivert Riera +--- + configure.in | 11 +++++++++++ + include/SDL_config.h.in | 1 + + src/video/x11/SDL_x11sym.h | 4 ++++ + 3 files changed, 16 insertions(+) + +diff --git a/configure.in b/configure.in +index 08c8e1e9..89c526d4 100644 +--- a/configure.in ++++ b/configure.in +@@ -1127,6 +1127,17 @@ AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for ful if test x$definitely_enable_video_x11_xrandr = xyes; then AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) fi @@ -32,10 +36,11 @@ diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in fi fi } -diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in ---- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700 -+++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600 -@@ -283,6 +283,7 @@ +diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in +index 8bb1773c..78ca747b 100644 +--- a/include/SDL_config.h.in ++++ b/include/SDL_config.h.in +@@ -282,6 +282,7 @@ #undef SDL_VIDEO_DRIVER_WINDIB #undef SDL_VIDEO_DRIVER_WSCONS #undef SDL_VIDEO_DRIVER_X11 @@ -43,10 +48,11 @@ diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE #undef SDL_VIDEO_DRIVER_X11_DYNAMIC #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT -diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h ---- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700 -+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600 -@@ -165,7 +165,11 @@ +diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h +index 4875b989..bd83f7f5 100644 +--- a/src/video/x11/SDL_x11sym.h ++++ b/src/video/x11/SDL_x11sym.h +@@ -165,7 +165,11 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return) */ #ifdef LONG64 SDL_X11_MODULE(IO_32BIT) @@ -58,3 +64,6 @@ diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) #endif +-- +2.50.1 + diff --git a/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch index d7858d0f96..68e66bd5a2 100644 --- a/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch +++ b/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch @@ -1,9 +1,10 @@ -From d7e00208738a0bc6af302723fe64908ac35b777b Mon Sep 17 00:00:00 2001 +From c24c08c9aa0f92213793e5ef404f2c387603d7f8 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sat, 18 Jun 2022 14:55:00 +0300 Subject: [PATCH] SDL_x11yuv.c: fix possible use-after-free Fixes: https://github.com/libsdl-org/SDL-1.2/issues/863 +Upstream: d7e00208738a0bc6af302723fe64908ac35b777b Signed-off-by: Peter Korsgaard --- src/video/x11/SDL_x11yuv.c | 2 +- @@ -24,5 +25,5 @@ index 62698dfd..0d5754e3 100644 0, width, height); } -- -2.30.2 +2.50.1