* [Buildroot] [PATCH 1/2] package/sdl: improve existing patches
@ 2025-08-23 17:05 Thomas Petazzoni via buildroot
2025-08-23 17:05 ` [Buildroot] [PATCH 2/2] package/sdl: fix build with GCC 15.x with X.org support enabled Thomas Petazzoni via buildroot
2025-09-08 10:55 ` [Buildroot] [PATCH 1/2] package/sdl: improve existing patches Thomas Perale via buildroot
0 siblings, 2 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-08-23 17:05 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
- 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 <thomas.petazzoni@bootlin.com>
---
.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 ca7fec588a..7826734ecd 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1044,8 +1044,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 <Vincent.Riera@imgtec.com>
-
-# HG changeset patch
-# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
-# 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" <azamat.hackimov@gmail.com>
+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 <Vincent.Riera@imgtec.com>
+---
+ 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 <sezeroz@gmail.com>
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 <peter@korsgaard.com>
---
src/video/x11/SDL_x11yuv.c | 2 +-
@@ -24,5 +25,5 @@ index 62698dfd..0d5754e3 100644
0, width, height);
}
--
-2.30.2
+2.50.1
--
2.50.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/2] package/sdl: fix build with GCC 15.x with X.org support enabled
2025-08-23 17:05 [Buildroot] [PATCH 1/2] package/sdl: improve existing patches Thomas Petazzoni via buildroot
@ 2025-08-23 17:05 ` Thomas Petazzoni via buildroot
2025-08-23 18:51 ` Romain Naour via buildroot
2025-09-08 10:55 ` [Buildroot] [PATCH 1/2] package/sdl: improve existing patches Thomas Perale via buildroot
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2025-08-23 17:05 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Petazzoni
When building:
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_SDL=y
BR2_PACKAGE_SDL_X11=y
BR2_PACKAGE_XORG7=y
# BR2_TARGET_ROOTFS_TAR is not set
the build fails with:
./src/video/Xext/Xv/Xv.c:78:5: error: initialization of ‘int (*)(Display *, XEvent *, xEvent *)’ {aka ‘int (*)(Display *, XEvent *, struct _xEvent *)’} from incompatible pointer type ‘int (*)(void)’ [-Wincompatible-pointer-types]
and a number of similar errors in the X.org code.
We fix this by backporting an upstream commit.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
...ion-declarations-without-a-prototype.patch | 66 +++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch
diff --git a/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch b/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch
new file mode 100644
index 0000000000..cccc0464bb
--- /dev/null
+++ b/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch
@@ -0,0 +1,66 @@
+From 6fb5aadafc9d99c25fb4f1a37d225d5b79bc92e9 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 15 Oct 2022 15:10:48 -0700
+Subject: [PATCH] Xext: Fix function declarations without a prototype
+
+This is not supported with the upcoming clang 16.
+
+error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Werror,-Wdeprecated-non-prototype]
+
+reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+
+Upstream: e738cfffced8a006094d55337d917386582ada47
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ src/video/Xext/XME/xme.c | 2 +-
+ src/video/Xext/Xinerama/Xinerama.c | 3 ++-
+ src/video/Xext/Xv/Xv.c | 6 +++---
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c
+index 2cead35a..bb8d04d4 100644
+--- a/src/video/Xext/XME/xme.c
++++ b/src/video/Xext/XME/xme.c
+@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME;
+ /*
+ * find_display - locate the display info block
+ */
+-static int XiGMiscCloseDisplay();
++static int XiGMiscCloseDisplay(Display*, XExtCodes*);
+
+ static XExtensionHooks xigmisc_extension_hooks = {
+ NULL, /* create_gc */
+diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c
+index 4ff42ebf..57f64b9c 100644
+--- a/src/video/Xext/Xinerama/Xinerama.c
++++ b/src/video/Xext/Xinerama/Xinerama.c
+@@ -50,7 +50,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
+ #define PanoramiXSimpleCheckExtension(dpy,i) \
+ XextSimpleCheckExtension (dpy, i, panoramiX_extension_name)
+
+-static int close_display();
++static int close_display(Display*, XExtCodes*);
++
+ static /* const */ XExtensionHooks panoramiX_extension_hooks = {
+ NULL, /* create_gc */
+ NULL, /* copy_gc */
+diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c
+index 7147b9e8..c254a1dc 100644
+--- a/src/video/Xext/Xv/Xv.c
++++ b/src/video/Xext/Xv/Xv.c
+@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName;
+ #define XvCheckExtension(dpy, i, val) \
+ XextCheckExtension(dpy, i, xv_extension_name, val)
+
+-static char *xv_error_string();
+-static int xv_close_display();
+-static Bool xv_wire_to_event();
++static char *xv_error_string(Display*, int, XExtCodes*, char*, int);
++static int xv_close_display(Display*, XExtCodes*);
++static Bool xv_wire_to_event(Display*, XEvent*, xEvent*);
+
+ static XExtensionHooks xv_extension_hooks = {
+ NULL, /* create_gc */
+--
+2.50.1
+
--
2.50.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH 2/2] package/sdl: fix build with GCC 15.x with X.org support enabled
2025-08-23 17:05 ` [Buildroot] [PATCH 2/2] package/sdl: fix build with GCC 15.x with X.org support enabled Thomas Petazzoni via buildroot
@ 2025-08-23 18:51 ` Romain Naour via buildroot
2025-08-23 19:46 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 5+ messages in thread
From: Romain Naour via buildroot @ 2025-08-23 18:51 UTC (permalink / raw)
To: Thomas Petazzoni, buildroot
Hello Thomas, All,
Le 23/08/2025 à 19:05, Thomas Petazzoni via buildroot a écrit :
> When building:
>
> BR2_arm=y
> BR2_cortex_a9=y
> BR2_ARM_ENABLE_VFP=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
> BR2_INIT_NONE=y
> BR2_SYSTEM_BIN_SH_NONE=y
> # BR2_PACKAGE_BUSYBOX is not set
> BR2_PACKAGE_SDL=y
> BR2_PACKAGE_SDL_X11=y
> BR2_PACKAGE_XORG7=y
> # BR2_TARGET_ROOTFS_TAR is not set
>
> the build fails with:
>
> ./src/video/Xext/Xv/Xv.c:78:5: error: initialization of ‘int (*)(Display *, XEvent *, xEvent *)’ {aka ‘int (*)(Display *, XEvent *, struct _xEvent *)’} from incompatible pointer type ‘int (*)(void)’ [-Wincompatible-pointer-types]
>
> and a number of similar errors in the X.org code.
>
> We fix this by backporting an upstream commit.
I can't find any autobuilder result [1] for this one but I reproduced the issue
locally.
[1] https://autobuild.buildroot.org/?reason=sdl-1.2.15
Series applied to master, thanks.
Best regards,
Romain
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
> ...ion-declarations-without-a-prototype.patch | 66 +++++++++++++++++++
> 1 file changed, 66 insertions(+)
> create mode 100644 package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch
>
> diff --git a/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch b/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch
> new file mode 100644
> index 0000000000..cccc0464bb
> --- /dev/null
> +++ b/package/sdl/0003-Xext-Fix-function-declarations-without-a-prototype.patch
> @@ -0,0 +1,66 @@
> +From 6fb5aadafc9d99c25fb4f1a37d225d5b79bc92e9 Mon Sep 17 00:00:00 2001
> +From: orbea <orbea@riseup.net>
> +Date: Sat, 15 Oct 2022 15:10:48 -0700
> +Subject: [PATCH] Xext: Fix function declarations without a prototype
> +
> +This is not supported with the upcoming clang 16.
> +
> +error: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Werror,-Wdeprecated-non-prototype]
> +
> +reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
> +
> +Upstream: e738cfffced8a006094d55337d917386582ada47
> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> +---
> + src/video/Xext/XME/xme.c | 2 +-
> + src/video/Xext/Xinerama/Xinerama.c | 3 ++-
> + src/video/Xext/Xv/Xv.c | 6 +++---
> + 3 files changed, 6 insertions(+), 5 deletions(-)
> +
> +diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c
> +index 2cead35a..bb8d04d4 100644
> +--- a/src/video/Xext/XME/xme.c
> ++++ b/src/video/Xext/XME/xme.c
> +@@ -206,7 +206,7 @@ static char *xigmisc_extension_name = XIGMISC_PROTOCOL_NAME;
> + /*
> + * find_display - locate the display info block
> + */
> +-static int XiGMiscCloseDisplay();
> ++static int XiGMiscCloseDisplay(Display*, XExtCodes*);
> +
> + static XExtensionHooks xigmisc_extension_hooks = {
> + NULL, /* create_gc */
> +diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c
> +index 4ff42ebf..57f64b9c 100644
> +--- a/src/video/Xext/Xinerama/Xinerama.c
> ++++ b/src/video/Xext/Xinerama/Xinerama.c
> +@@ -50,7 +50,8 @@ static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
> + #define PanoramiXSimpleCheckExtension(dpy,i) \
> + XextSimpleCheckExtension (dpy, i, panoramiX_extension_name)
> +
> +-static int close_display();
> ++static int close_display(Display*, XExtCodes*);
> ++
> + static /* const */ XExtensionHooks panoramiX_extension_hooks = {
> + NULL, /* create_gc */
> + NULL, /* copy_gc */
> +diff --git a/src/video/Xext/Xv/Xv.c b/src/video/Xext/Xv/Xv.c
> +index 7147b9e8..c254a1dc 100644
> +--- a/src/video/Xext/Xv/Xv.c
> ++++ b/src/video/Xext/Xv/Xv.c
> +@@ -63,9 +63,9 @@ static char *xv_extension_name = XvName;
> + #define XvCheckExtension(dpy, i, val) \
> + XextCheckExtension(dpy, i, xv_extension_name, val)
> +
> +-static char *xv_error_string();
> +-static int xv_close_display();
> +-static Bool xv_wire_to_event();
> ++static char *xv_error_string(Display*, int, XExtCodes*, char*, int);
> ++static int xv_close_display(Display*, XExtCodes*);
> ++static Bool xv_wire_to_event(Display*, XEvent*, xEvent*);
> +
> + static XExtensionHooks xv_extension_hooks = {
> + NULL, /* create_gc */
> +--
> +2.50.1
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sdl: improve existing patches
2025-08-23 17:05 [Buildroot] [PATCH 1/2] package/sdl: improve existing patches Thomas Petazzoni via buildroot
2025-08-23 17:05 ` [Buildroot] [PATCH 2/2] package/sdl: fix build with GCC 15.x with X.org support enabled Thomas Petazzoni via buildroot
@ 2025-09-08 10:55 ` Thomas Perale via buildroot
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Perale via buildroot @ 2025-09-08 10:55 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Thomas Perale, buildroot
In reply of:
> - 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 <thomas.petazzoni@bootlin.com>
Applied to 2025.02.x & 2025.05.x. Thanks
> ---
> .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 ca7fec588a..7826734ecd 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1044,8 +1044,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 <Vincent.Riera@imgtec.com>
> -
> -# HG changeset patch
> -# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
> -# 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" <azamat.hackimov@gmail.com>
> +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 <Vincent.Riera@imgtec.com>
> +---
> + 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 <sezeroz@gmail.com>
> 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 <peter@korsgaard.com>
> ---
> src/video/x11/SDL_x11yuv.c | 2 +-
> @@ -24,5 +25,5 @@ index 62698dfd..0d5754e3 100644
> 0, width, height);
> }
> --
> -2.30.2
> +2.50.1
>
> --
> 2.50.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-09-08 10:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-23 17:05 [Buildroot] [PATCH 1/2] package/sdl: improve existing patches Thomas Petazzoni via buildroot
2025-08-23 17:05 ` [Buildroot] [PATCH 2/2] package/sdl: fix build with GCC 15.x with X.org support enabled Thomas Petazzoni via buildroot
2025-08-23 18:51 ` Romain Naour via buildroot
2025-08-23 19:46 ` Thomas Petazzoni via buildroot
2025-09-08 10:55 ` [Buildroot] [PATCH 1/2] package/sdl: improve existing patches Thomas Perale via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.