Re: [ptxdist] [APPLIED] sdl: Remove after one year in staging

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 8c2cf0e9d15acfd4a0873e95e064b5435b6f3393.

Michael

[sent from post-receive hook]

On Mon, 18 May 2026 09:54:06 +0200, Thorsten Scherer <t.scherer@eckelmann.de> wrote:
> Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
> Message-Id: <20260504125315.64574-1-t.scherer@eckelmann.de>
> [mol: remove patches as well]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch b/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
> deleted file mode 100644
> index 7233f65c0645..000000000000
> --- a/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Sat, 29 Oct 2011 18:49:04 +0200
> -Subject: [PATCH] SDL-1.2.10-sdl-config.in.diff
> -
> -Subject teach sdl-config about sysroot
> -
> -Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - sdl-config.in | 14 +++++++-------
> - 1 file changed, 7 insertions(+), 7 deletions(-)
> -
> -diff --git a/sdl-config.in b/sdl-config.in
> -index e0fcc0ced54a..0159c474dfcb 100644
> ---- a/sdl-config.in
> -+++ b/sdl-config.in
> -@@ -23,10 +23,10 @@ while test $# -gt 0; do
> - 
> -   case $1 in
> -     --prefix=*)
> --      prefix=$optarg
> --      if test $exec_prefix_set = no ; then
> --        exec_prefix=$optarg
> --      fi
> -+#      prefix=$optarg
> -+#      if test $exec_prefix_set = no ; then
> -+#        exec_prefix=$optarg
> -+#      fi
> -       ;;
> -     --prefix)
> -       echo $prefix
> -@@ -42,14 +42,14 @@ while test $# -gt 0; do
> -       echo @SDL_VERSION@
> -       ;;
> -     --cflags)
> --      echo -I@includedir@/SDL @SDL_CFLAGS@
> -+      echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@
> -       ;;
> - @ENABLE_SHARED_TRUE@    --libs)
> --@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
> -+@ENABLE_SHARED_TRUE@      echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
> - @ENABLE_SHARED_TRUE@      ;;
> - @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
> - @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
> --@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
> -+@ENABLE_STATIC_TRUE@      echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
> - @ENABLE_STATIC_TRUE@      ;;
> -     *)
> -       echo "${usage}" 1>&2
> diff --git a/patches/SDL-1.2.15/0002-fix-parallel-build.patch b/patches/SDL-1.2.15/0002-fix-parallel-build.patch
> deleted file mode 100644
> index a5199e8441c7..000000000000
> --- a/patches/SDL-1.2.15/0002-fix-parallel-build.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Sat, 29 Oct 2011 18:49:04 +0200
> -Subject: [PATCH] fix parallel build
> -
> -We have to create the objects dir before saving gcc's output into it.
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - Makefile.in | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index ab51035e0b01..6e2467275138 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -71,7 +71,7 @@ depend:
> - 
> - include $(depend)
> - 
> --$(objects)/$(TARGET): $(OBJECTS)
> -+$(objects)/$(TARGET): $(OBJECTS) $(objects)
> - 	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> - 
> - $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
> diff --git a/patches/SDL-1.2.15/0003-Fix-compilation-with-libX11-1.5.99.902.patch b/patches/SDL-1.2.15/0003-Fix-compilation-with-libX11-1.5.99.902.patch
> deleted file mode 100644
> index 07d12dbe3dc9..000000000000
> --- a/patches/SDL-1.2.15/0003-Fix-compilation-with-libX11-1.5.99.902.patch
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -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).
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - 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 08c8e1e97c67..89c526d42455 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
> -+            AC_MSG_CHECKING(for const parameter to _XData32)
> -+            have_const_param_xdata32=no
> -+            AC_TRY_COMPILE([
> -+              #include <X11/Xlibint.h>
> -+              extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
> -+            ],[
> -+            ],[
> -+            have_const_param_xdata32=yes
> -+            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
> -+            ])
> -+            AC_MSG_RESULT($have_const_param_xdata32)
> -         fi
> -     fi
> - }
> -diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
> -index 8bb1773c0eb7..78ca747bc041 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
> -+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
> - #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
> - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
> - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
> -diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
> -index 4875b989c9b9..bd83f7f5c10e 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)
> -+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
> -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
> -+#else
> - SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
> -+#endif
> - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
> - #endif
> - 
> diff --git a/patches/SDL-1.2.15/autogen.sh b/patches/SDL-1.2.15/autogen.sh
> deleted file mode 100755
> index 1e5af6e71bd4..000000000000
> --- a/patches/SDL-1.2.15/autogen.sh
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -#!/bin/sh
> -
> -./autogen.sh
> -
> diff --git a/patches/SDL-1.2.15/series b/patches/SDL-1.2.15/series
> deleted file mode 100644
> index 9cd219921222..000000000000
> --- a/patches/SDL-1.2.15/series
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-SDL-1.2.10-sdl-config.in.diff.patch
> -0002-fix-parallel-build.patch
> -0003-Fix-compilation-with-libX11-1.5.99.902.patch
> -# 5d22a85525900a69ee40da5d0e82fcf8  - git-ptx-patches magic
> diff --git a/rules/sdl.in b/rules/sdl.in
> deleted file mode 100644
> index b672106e2e57..000000000000
> --- a/rules/sdl.in
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=multimedia_sdl
> -
> -menuconfig SDL
> -	tristate
> -	prompt "SDL                           "
> -	select LIBC_M
> -	select LIBC_DL
> -	select LIBC_PTHREAD
> -	select GCCLIBS_GCC_S
> -	select CROSS_NASM		if SDL_VIDEO
> -	select ALSA_LIB			if SDL_ALSA
> -	select XORG_LIB_X11		if SDL_XORG
> -	select XORG_LIB_XT		if SDL_XORG
> -	select XORG_LIB_XV		if SDL_XORG && SDL_VIDEO
> -	select XORG_LIB_XVMC		if SDL_XORG && SDL_VIDEO
> -	select TSLIB			if SDL_TSLIB
> -	help
> -	  Simple DirectMedia Layer is a cross-platform multimedia
> -	  library designed to provide low level access to audio,
> -	  keyboard, mouse, joystick, 3D hardware via OpenGL, and
> -	  2D video framebuffer.
> -
> -	  STAGING: remove in PTXdist 2026.03.0
> -	  Obsolete and replaced by SDL2.
> -
> -if SDL
> -
> -config SDL_TIMERS
> -	bool
> -	prompt "SDL Timers Support"
> -	default y
> -	help
> -	  FIXME
> -
> -config SDL_FILE
> -	bool
> -	prompt "SDL File Support"
> -	default y
> -	help
> -	  FIXME
> -
> -config SDL_CPUINFO
> -	bool
> -	prompt "SDL CPU Info Support"
> -	default y
> -	help
> -	  FIXME
> -
> -menuconfig SDL_AUDIO
> -	bool
> -	prompt "SDL Audio Support             "
> -	default y
> -	help
> -	  FIXME
> -
> -if SDL_AUDIO
> -
> -config SDL_OSS
> -	bool
> -	prompt "SDL OSS Support"
> -	help
> -	  Open Sound System (OSS) is the first attempt in
> -	  unifying the digital audio architecture for UNIX.
> -	  OSS is a set of device drivers that provide a
> -	  uniform API across all the major UNIX architectures.
> -
> -config SDL_ALSA
> -	bool
> -	prompt "SDL ALSA Support"
> -	default y
> -	help
> -	  The Advanced Linux Sound Architecture (ALSA)
> -	  provides audio and MIDI functionality to the
> -	  Linux operating system.
> -
> -endif
> -
> -menuconfig SDL_VIDEO
> -	bool
> -	prompt "SDL Video Support             "
> -	default y
> -	help
> -	  FIXME
> -
> -if SDL_VIDEO
> -
> -menuconfig SDL_XORG
> -	bool
> -	prompt "Xorg Support                "
> -	help
> -	  X.Org provides an open source implementation of the
> -	  X Window System.
> -
> -config SDL_FBCON
> -	bool
> -	prompt "SDL fbcon support"
> -	help
> -	  Framebuffer console
> -
> -config SDL_OPENGL
> -	bool
> -	prompt "OpenGL Support"
> -	depends on BROKEN
> -	help
> -	  OpenGL is a multi-platform software interface to
> -	  graphics hardware, supporting rendering and imaging
> -	  operations.
> -
> -endif
> -
> -config SDL_EVENT
> -	bool
> -	prompt "SDL Event Support"
> -	default y
> -	help
> -	  FIXME
> -
> -config SDL_JOYSTICK
> -	bool
> -	prompt "SDL Joystick Support"
> -	help
> -	  FIXME
> -
> -config SDL_CDROM
> -	bool
> -	prompt "SDL CDROM Support"
> -	help
> -	  FIXME
> -
> -menuconfig SDL_THREADS
> -	bool
> -	prompt "SDL Thread Support            "
> -	default y
> -	help
> -	  Turn on multithreading support
> -
> -config SDL_TSLIB
> -	bool
> -	prompt "tslib Support"
> -	help
> -	  Turn on support for the touchscreen library 'tslib'
> -
> -endif
> diff --git a/rules/sdl.make b/rules/sdl.make
> deleted file mode 100644
> index 5cbef70370f7..000000000000
> --- a/rules/sdl.make
> +++ /dev/null
> @@ -1,137 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2006 by Erwin Rol
> -#               2010 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_SDL) += sdl
> -
> -#
> -# Paths and names
> -#
> -SDL_VERSION	:= 1.2.15
> -SDL_MD5		:= 9d96df8417572a2afb781a7c4c811a85
> -SDL		:= SDL-$(SDL_VERSION)
> -SDL_SUFFIX	:= tar.gz
> -SDL_URL		:= https://www.libsdl.org/release/$(SDL).$(SDL_SUFFIX)
> -SDL_SOURCE	:= $(SRCDIR)/$(SDL).$(SDL_SUFFIX)
> -SDL_DIR		:= $(BUILDDIR)/$(SDL)
> -SDL_LICENSE	:= LGPL-2.1-only
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -#
> -# autoconf
> -#
> -SDL_CONF_TOOL	:= autoconf
> -SDL_CONF_OPT	:= \
> -	$(CROSS_AUTOCONF_USR) \
> -	--enable-shared \
> -	--disable-static \
> -	--enable-libc \
> -	--$(call ptx/endis,PTXCONF_SDL_AUDIO)-audio \
> -	--$(call ptx/endis,PTXCONF_SDL_VIDEO)-video \
> -	--$(call ptx/endis,PTXCONF_SDL_EVENT)-events \
> -	--$(call ptx/endis,PTXCONF_SDL_JOYSTICK)-joystick \
> -	--$(call ptx/endis,PTXCONF_SDL_CDROM)-cdrom \
> -	--$(call ptx/endis,PTXCONF_SDL_THREADS)-threads \
> -	--$(call ptx/endis,PTXCONF_SDL_TIMERS)-timers \
> -	--$(call ptx/endis,PTXCONF_SDL_FILE)-file \
> -	--enable-loadso \
> -	--$(call ptx/endis,PTXCONF_SDL_CPUINFO)-cpuinfo \
> -	--enable-assembly \
> -	--$(call ptx/endis,PTXCONF_SDL_OSS)-oss \
> -	--$(call ptx/endis,PTXCONF_SDL_ALSA)-alsa \
> -	--disable-alsatest \
> -	--disable-alsa-shared \
> -	--disable-esd \
> -	--disable-esdtest \
> -	--disable-esd-shared \
> -	--disable-pulseaudio \
> -	--disable-pulseaudio-shared \
> -	--disable-arts \
> -	--disable-arts-shared \
> -	--disable-nas \
> -	--disable-nas-shared \
> -	--disable-diskaudio \
> -	--disable-dummyaudio \
> -	--disable-mintaudio \
> -	--enable-nasm \
> -	--disable-altivec \
> -	--disable-ipod \
> -	--disable-video-nanox \
> -	--disable-nanox-debug \
> -	--disable-nanox-share-memory \
> -	--disable-nanox-direct-fb \
> -	--$(call ptx/endis,PTXCONF_SDL_XORG)-video-x11 \
> -	--disable-x11-shared \
> -	--$(call ptx/endis,PTXCONF_SDL_XORG)-dga \
> -	--$(call ptx/endis,PTXCONF_SDL_XORG)-video-dga \
> -	--$(call ptx/endis,PTXCONF_SDL_XORG)-video-x11-dgamouse \
> -	--$(call ptx/endis,PTXCONF_SDL_XORG)-video-x11-vm \
> -	--$(call ptx/endis,PTXCONF_SDL_VIDEO)-video-x11-xv \
> -	--disable-video-x11-xinerama \
> -	--$(call ptx/endis,PTXCONF_SDL_XORG)-video-x11-xme \
> -	--disable-video-x11-xrandr \
> -	--disable-video-photon \
> -	--disable-video-carbon \
> -	--disable-video-cocoa \
> -	--$(call ptx/endis,PTXCONF_SDL_FBCON)-video-fbcon \
> -	--disable-video-directfb \
> -	--disable-video-ps2gs \
> -	--disable-video-ps3 \
> -	--disable-video-ggi \
> -	--disable-video-svga \
> -	--disable-video-vgl \
> -	--disable-video-wscons \
> -	--disable-video-aalib \
> -	--disable-video-caca \
> -	--disable-video-qtopia \
> -	--disable-video-picogui \
> -	--disable-xbios \
> -	--disable-gem \
> -	--enable-video-dummy \
> -	--$(call ptx/endis,PTXCONF_SDL_OPENGL)-video-opengl \
> -	--disable-osmesa-shared \
> -	--enable-screensaver \
> -	--enable-input-events \
> -	--$(call ptx/endis,PTXCONF_SDL_TSLIB)-input-tslib \
> -	--disable-pth \
> -	--enable-pthreads \
> -	--enable-pthread-sem \
> -	--disable-stdio-redirect \
> -	--disable-directx \
> -	--enable-sdl-dlopen \
> -	--disable-atari-ldg \
> -	--enable-clock_gettime \
> -	--disable-rpath \
> -	--$(call ptx/wwo,PTXCONF_SDL_XORG)-x
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/sdl.targetinstall:
> -	@$(call targetinfo)
> -
> -	@$(call install_init, sdl)
> -	@$(call install_fixup, sdl,PRIORITY,optional)
> -	@$(call install_fixup, sdl,SECTION,base)
> -	@$(call install_fixup, sdl,AUTHOR,"Erwin Rol <ero@pengutronix.de>")
> -	@$(call install_fixup, sdl,DESCRIPTION,missing)
> -
> -	@$(call install_lib, sdl, 0, 0, 0644, libSDL-1.2)
> -
> -	@$(call install_finish, sdl)
> -
> -	@$(call touch)
> -
> -# vim: syntax=make