summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Kuten <ivan.kuten@promwad.com>2007-11-16 12:37:23 +0000
committerIvan Kuten <ivan.kuten@promwad.com>2007-11-16 12:37:23 +0000
commit5d48d2cd129a4c3ab7b81d777a2925395c0b9808 (patch)
tree4e3e3d6bb4566e38060e7a7fd9121697f4f9ef1a
parentd94f4c86e5bff81bc67fa6ea5dde71bf6e538fc4 (diff)
downloadbuildroot-novena-5d48d2cd129a4c3ab7b81d777a2925395c0b9808.tar.gz
buildroot-novena-5d48d2cd129a4c3ab7b81d777a2925395c0b9808.zip
update SDL to 1.2.12, allow video driver selection
-rw-r--r--package/sdl/Config.in22
-rw-r--r--package/sdl/sdl.mk43
2 files changed, 59 insertions, 6 deletions
diff --git a/package/sdl/Config.in b/package/sdl/Config.in
index 4de900b19..277d3c1e0 100644
--- a/package/sdl/Config.in
+++ b/package/sdl/Config.in
@@ -1,7 +1,27 @@
config BR2_PACKAGE_SDL
bool "SDL"
default n
- select BR2_PACKAGE_DIRECTFB
help
http://www.libsdl.org/
+
+menu "SDL options selection"
+ depends BR2_PACKAGE_SDL
+
+config BR2_PACKAGE_SDL_FBCON
+ bool "SDL framebuffer console video driver"
+ default y
+
+config BR2_PACKAGE_SDL_DIRECTFB
+ bool "SDL DirectFB video driver"
+ default n
+
+config BR2_PACKAGE_SDL_QTOPIA
+ bool "SDL Qtopia video driver"
+ default n
+
+config BR2_PACKAGE_SDL_X11
+ bool "SDL X11 video driver"
+ default n
+
+endmenu
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index fb1eb8c75..3c79955c7 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -3,7 +3,7 @@
# SDL
#
#############################################################
-SDL_VERSION:=1.2.11
+SDL_VERSION:=1.2.12
# 1.2.12 is available, but depends on Pulse Audio 0.9
# which is not available in buildroot (yet)
SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
@@ -11,6 +11,32 @@ SDL_SITE:=http://www.libsdl.org/release
SDL_CAT:=$(ZCAT)
SDL_DIR:=$(BUILD_DIR)/SDL-$(SDL_VERSION)
+ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
+SDL_FBCON=--enable-video-fbcon=yes
+else
+SDL_FBCON=--enable-video-fbcon=no
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
+SDL_DIRECTFB=--enable-video-directfb=yes
+SDL_DIRECTFB_TARGET:=$(STAGING_DIR)/include/directfb
+SDL_DIRECTFB_INCLUDES:=-I$(STAGING_DIR)/usr/include/directfb
+else
+SDL_DIRECTFB=--enable-video-directfb=no
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
+SDL_QTOPIA=--enable-video-qtopia=yes
+else
+SDL_QTOPIA=--enable-video-qtopia=no
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_X11),y)
+SDL_X11=--enable-video-x11=yes
+else
+SDL_X11=--enable-video-x11=no
+endif
+
$(DL_DIR)/$(SDL_SOURCE):
$(WGET) -P $(DL_DIR) $(SDL_SITE)/$(SDL_SOURCE)
@@ -43,18 +69,25 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
--includedir=/include \
--mandir=/man \
--infodir=/info \
+ --enable-pulseaudio=no \
--disable-arts \
--disable-esd \
--disable-nasm \
- --disable-video-x11 )
+ $(SDL_FBCON) \
+ $(SDL_DIRECTFB) \
+ $(SDL_QTOPIA) \
+ $(SDL_X11) \
+ )
touch $@
-$(STAGING_DIR)/include/directfb:
+ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
+$(SDL_DIRECTFB_TARGET):
ln -s ../usr/include/directfb $(STAGING_DIR)/include/directfb
+endif
-$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(STAGING_DIR)/include/directfb
+$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
- INCLUDE="-I./include -I$(STAGING_DIR)/usr/include/directfb" \
+ INCLUDE="-I./include $(SDL_DIRECTFB_INCLUDES)" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR)
touch $@