mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-18 21:33:39 -09:00
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 <thomas.petazzoni@bootlin.com> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
5d6f3baf0e
commit
9fab7bb79d
@@ -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/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/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/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/0001-fix-compilation-with-libx11.patch lib_patch.Upstream
|
||||||
package/sdl/0002-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/0003-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/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/0002-configure__set_macro_directory.patch lib_patch.Upstream
|
||||||
package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch lib_patch.Upstream
|
package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch lib_patch.Upstream
|
||||||
|
|||||||
@@ -146,6 +146,13 @@ endif
|
|||||||
|
|
||||||
comment "Legacy options removed in 2025.02"
|
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
|
config BR2_PACKAGE_QT5BASE_DIRECTFB
|
||||||
bool "qt5base directfb support removed"
|
bool "qt5base directfb support removed"
|
||||||
select BR2_LEGACY
|
select BR2_LEGACY
|
||||||
|
|||||||
@@ -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 <jacmet@sunsite.dk>
|
|
||||||
---
|
|
||||||
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`
|
|
||||||
|
|
||||||
@@ -13,10 +13,6 @@ config BR2_PACKAGE_SDL_FBCON
|
|||||||
bool "SDL framebuffer console video driver"
|
bool "SDL framebuffer console video driver"
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config BR2_PACKAGE_SDL_DIRECTFB
|
|
||||||
bool "SDL DirectFB video driver"
|
|
||||||
depends on BR2_PACKAGE_DIRECTFB
|
|
||||||
|
|
||||||
config BR2_PACKAGE_SDL_X11
|
config BR2_PACKAGE_SDL_X11
|
||||||
bool "SDL X11 video driver"
|
bool "SDL X11 video driver"
|
||||||
depends on BR2_PACKAGE_XORG7
|
depends on BR2_PACKAGE_XORG7
|
||||||
|
|||||||
@@ -28,7 +28,9 @@ HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
|
|||||||
SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
|
SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
|
||||||
HOST_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)
|
ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
|
||||||
SDL_CONF_OPTS += --enable-video-fbcon=yes
|
SDL_CONF_OPTS += --enable-video-fbcon=yes
|
||||||
@@ -36,14 +38,6 @@ else
|
|||||||
SDL_CONF_OPTS += --enable-video-fbcon=no
|
SDL_CONF_OPTS += --enable-video-fbcon=no
|
||||||
endif
|
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)
|
ifeq ($(BR2_PACKAGE_SDL_X11),y)
|
||||||
SDL_CONF_OPTS += --enable-video-x11=yes
|
SDL_CONF_OPTS += --enable-video-x11=yes
|
||||||
SDL_DEPENDENCIES += \
|
SDL_DEPENDENCIES += \
|
||||||
|
|||||||
Reference in New Issue
Block a user