From 9fab7bb79dddaeff17dd084160b0dbd4754a5fc0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 29 Dec 2024 15:55:30 +0100 Subject: [PATCH] package/sdl: drop directfb support As we're about to remove the DirectFB package, let's drop DirectFB support in sdl. Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- .checkpackageignore | 5 ++-- Config.in.legacy | 7 ++++++ ...=> 0001-fix-compilation-with-libx11.patch} | 0 .../0001-use-correct-directfb-config.patch | 25 ------------------- ...11yuv.c-fix-possible-use-after-free.patch} | 0 package/sdl/Config.in | 4 --- package/sdl/sdl.mk | 12 +++------ 7 files changed, 12 insertions(+), 41 deletions(-) rename package/sdl/{0002-fix-compilation-with-libx11.patch => 0001-fix-compilation-with-libx11.patch} (100%) delete mode 100644 package/sdl/0001-use-correct-directfb-config.patch rename package/sdl/{0003-SDL_x11yuv.c-fix-possible-use-after-free.patch => 0002-SDL_x11yuv.c-fix-possible-use-after-free.patch} (100%) diff --git a/.checkpackageignore b/.checkpackageignore index b17ed1b7fb..d2d96c66ba 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1112,9 +1112,8 @@ 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-use-correct-directfb-config.patch lib_patch.Upstream -package/sdl/0002-fix-compilation-with-libx11.patch lib_patch.Upstream -package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.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/Config.in.legacy b/Config.in.legacy index 76d656846e..1a1ee21424 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.02" +config BR2_PACKAGE_SDL_DIRECTFB + bool "sdl directfb support removed" + select BR2_LEGACY + help + The directfb support from SDL is no longer available, as + directfb is no longer packaged in Buildroot. + config BR2_PACKAGE_QT5BASE_DIRECTFB bool "qt5base directfb support removed" select BR2_LEGACY diff --git a/package/sdl/0002-fix-compilation-with-libx11.patch b/package/sdl/0001-fix-compilation-with-libx11.patch similarity index 100% rename from package/sdl/0002-fix-compilation-with-libx11.patch rename to package/sdl/0001-fix-compilation-with-libx11.patch diff --git a/package/sdl/0001-use-correct-directfb-config.patch b/package/sdl/0001-use-correct-directfb-config.patch deleted file mode 100644 index ef671a1ddd..0000000000 --- a/package/sdl/0001-use-correct-directfb-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] configure.in: use correct directfb-config in version check - -The configure script has just checked for the correct directfb-config -script, so also use it for the version check instead of whatever -might be in the path. - -Signed-off-by: Peter Korsgaard ---- - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: SDL-1.2.15/configure.in -=================================================================== ---- SDL-1.2.15.orig/configure.in -+++ SDL-1.2.15/configure.in -@@ -1276,7 +1276,7 @@ - else - set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'` - NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` -- set -- `directfb-config --version | sed 's/\./ /g'` -+ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'` - HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` - if test $HAVE_VERSION -ge $NEED_VERSION; then - DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags` - diff --git a/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch similarity index 100% rename from package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch rename to package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch diff --git a/package/sdl/Config.in b/package/sdl/Config.in index 9f1e34de5c..1d9887f324 100644 --- a/package/sdl/Config.in +++ b/package/sdl/Config.in @@ -13,10 +13,6 @@ config BR2_PACKAGE_SDL_FBCON bool "SDL framebuffer console video driver" default y -config BR2_PACKAGE_SDL_DIRECTFB - bool "SDL DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_SDL_X11 bool "SDL X11 video driver" depends on BR2_PACKAGE_XORG7 diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 462600debb..439c30b2a5 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -28,7 +28,9 @@ HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN SDL_DEPENDENCIES += host-automake host-autoconf host-libtool HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool -SDL_CONF_OPTS += --enable-video-qtopia=no +SDL_CONF_OPTS += \ + --enable-video-qtopia=no \ + --enable-video-directfb=no ifeq ($(BR2_PACKAGE_SDL_FBCON),y) SDL_CONF_OPTS += --enable-video-fbcon=yes @@ -36,14 +38,6 @@ else SDL_CONF_OPTS += --enable-video-fbcon=no endif -ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y) -SDL_DEPENDENCIES += directfb -SDL_CONF_OPTS += --enable-video-directfb=yes -SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL_CONF_OPTS += --enable-video-directfb=no -endif - ifeq ($(BR2_PACKAGE_SDL_X11),y) SDL_CONF_OPTS += --enable-video-x11=yes SDL_DEPENDENCIES += \