sdl: cleanup options

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 70 insertions, 325 deletions

diff --git a/rules/sdl.in b/rules/sdl.in
index ab7396f6b..f9c5e78e5 100644
--- a/rules/sdl.in
+++ b/rules/sdl.in
@@ -7,16 +7,13 @@ menuconfig SDL
 	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_XV
-	select XORG_LIB_XVMC		if SDL_XORG_XV
-	select XORG_LIB_XINERAMA	if SDL_XORG_XINERAMA
-
-	select ALSA_LIB			if SDL_ALSA
+	select XORG_LIB_XV		if SDL_XORG && SDL_VIDEO
+	select XORG_LIB_XVMC		if SDL_XORG && SDL_VIDEO
 	select DIRECTFB			if SDL_DIRECTFB
-	select CROSS_NASM		if SDL_NASM
 	select TSLIB			if SDL_TSLIB
 	help
 	  Simple DirectMedia Layer is a cross-platform multimedia
@@ -26,25 +23,6 @@ menuconfig SDL
 
 if SDL
 
-config SDL_NASM
-	bool
-	prompt "Use NASM"
-	help
-	  FIXME
-
-config SDL_SHARED
-	bool
-	prompt "Build Shared libraries"
-	default y
-	help
-	  FIXME
-
-config SDL_STATIC
-	bool
-	prompt "Build Static libraries"
-	help
-	  FIXME
-
 config SDL_TIMERS
 	bool
 	prompt "SDL Timers Support"
@@ -93,58 +71,6 @@ config SDL_ALSA
 	  provides audio and MIDI functionality to the
 	  Linux operating system.
 
-config SDL_ALSA_SHARED
-	bool
-	prompt "SDL ALSA Shared library"
-	depends on SDL_ALSA
-	default y
-	help
-	  FIXME
-
-config SDL_ESD
-	bool
-	prompt "SDL ESD Support"
-	depends on BROKEN
-	help
-	  ESound Audio Daemon
-
-config SDL_ESD_SHARED
-	bool
-	prompt "SDL ESD Shared library"
-	depends on SDL_ESD
-	help
-	  FIXME
-
-config SDL_ARTS
-	bool
-	prompt "SDL Arts Support"
-	depends on BROKEN
-	help
-	  SDL-arts is a plugin for the SDL library that allows
-	  it to output sound using the aRts sound daemon
-
-config SDL_ARTS_SHARED
-	bool
-	prompt "SDL Arts Shared library"
-	depends on SDL_ARTS
-	help
-	  FIXME
-
-config SDL_NAS
-	bool
-	prompt "SDL NAS Support"
-	depends on BROKEN
-	help
-	  The Network Audio System is a network transparent,
-	  client/server audio transport system. It can be
-	  described as the audio equivalent of an X server.
-
-config SDL_DISKAUDIO
-	bool
-	prompt "SDL Disk Audio Support"
-	help
-	  FIXME
-
 endif
 
 menuconfig SDL_VIDEO
@@ -156,15 +82,6 @@ menuconfig SDL_VIDEO
 
 if SDL_VIDEO
 
-config SDL_NANOX
-	bool
-	prompt "NanoX Support"
-	depends on BROKEN
-	help
-	  The Nano-X Window System is an Open Source project
-	  aimed at bringing the features of modern graphical
-	  windowing environments to smaller devices and platforms.
-
 menuconfig SDL_XORG
 	bool
 	prompt "Xorg Support                "
@@ -173,16 +90,6 @@ menuconfig SDL_XORG
 	  X.Org provides an open source implementation of the
 	  X Window System.
 
-config SDL_XORG_XV
-	bool
-	prompt "XVideo Support"
-	depends on SDL_XORG
-
-config SDL_XORG_XINERAMA
-	bool
-	prompt "Xinerama Support"
-	depends on SDL_XORG
-
 config SDL_FBCON
 	bool
 	prompt "SDL fbcon support"
@@ -201,13 +108,6 @@ config SDL_DIRECTFB
 	  for translucent windows and multiple display layers,
 	  not only on top of the Linux Framebuffer Device.
 
-config SDL_AALIB
-	bool
-	prompt "AALib Support"
-	depends on BROKEN
-	help
-	  AAlib is an portable ascii art GFX library.
-
 config SDL_OPENGL
 	bool
 	prompt "OpenGL Support"
@@ -238,7 +138,6 @@ config SDL_CDROM
 	help
 	  FIXME
 
-
 menuconfig SDL_THREADS
 	bool
 	prompt "SDL Thread Support            "
@@ -246,14 +145,6 @@ menuconfig SDL_THREADS
 	help
 	  Turn on multithreading support
 
-config SDL_PTH
-	bool
-	prompt "PTH Support"
-	depends on SDL_THREADS
-	default y
-	help
-	  Turn on support for GNU Portable Threads
-
 config SDL_TSLIB
 	bool
 	prompt "tslib Support"
diff --git a/rules/sdl.make b/rules/sdl.make
index bc97edb73..f1ae2e7b4 100644
--- a/rules/sdl.make
+++ b/rules/sdl.make
@@ -30,237 +30,92 @@ SDL_LICENSE	:= LGPL-2.1-only
 # Prepare
 # ----------------------------------------------------------------------------
 
-SDL_PATH	:= PATH=$(CROSS_PATH)
-SDL_ENV 	:= $(CROSS_ENV)
-
 #
 # autoconf
 #
-SDL_AUTOCONF := \
+SDL_CONF_TOOL	:= autoconf
+SDL_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--$(call ptx/endis,PTXCONF_SDL_TSLIB)-input-tslib \
-
-ifdef PTXCONF_SDL_SHARED
-SDL_AUTOCONF += --enable-shared
-else
-SDL_AUTOCONF += --disable-shared
-endif
-
-ifdef PTXCONF_SDL_STATIC
-SDL_AUTOCONF += --enable-static
-else
-SDL_AUTOCONF += --disable-static
-endif
-
-ifdef PTXCONF_SDL_AUDIO
-SDL_AUTOCONF += --enable-audio
-
- ifdef PTXCONF_SDL_OSS
- SDL_AUTOCONF += --enable-oss
- else
- SDL_AUTOCONF += --disable-oss
- endif
-
- ifdef PTXCONF_SDL_ALSA
- SDL_AUTOCONF += \
-	--enable-alsa \
+	--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 \
-	--with-alsa-prefix=$(SYSROOT)/usr/lib \
-	--with-alsa-inc-prefix=$(SYSROOT)/usr/include
-  ifdef PTXCONF_SDL_ALSA_SHARED
-  SDL_AUTOCONF += --enable-alsa-shared
-  else
-  SDL_AUTOCONF += --disable-alsa-shared
-  endif
- else
- SDL_AUTOCONF += --disable-alsa
- endif
-
- ifdef PTXCONF_SDL_ESD
- SDL_AUTOCONF += --enable-esd
- SDL_AUTOCONF += --disable-esdtest
- #SDL_AUTOCONF += --with-esd-prefix=PFX
- #SDL_AUTOCONF += --with-esd-exec-prefix=PFX
-  ifdef PTXCONF_SDL_ESD_SHARED
-  SDL_AUTOCONF += --enable-esd-shared
-  else
-  SDL_AUTOCONF += --disable-esd-shared
-  endif
- else
- SDL_AUTOCONF += --disable-esd
- endif
-
- ifdef PTXCONF_SDL_ARTS
- SDL_AUTOCONF += --enable-arts
-  ifdef PTXCONF_SDL_ARTS_SHARED
-  SDL_AUTOCONF += --enable-arts-shared
-  else
-  SDL_AUTOCONF += --disable-arts-shared
-  endif
- else
- SDL_AUTOCONF += --disable-arts
- endif
-
- ifdef PTXCONF_SDL_NAS
- SDL_AUTOCONF += --enable-nas
- else
- SDL_AUTOCONF += --disable-nas
- endif
-
- ifdef PTXCONF_SDL_DISKAUDIO
- SDL_AUTOCONF += --enable-diskaudio
- else
- SDL_AUTOCONF += --disable-diskaudio
- endif
-
-else
-SDL_AUTOCONF += --disable-audio
-endif
-
-ifdef PTXCONF_SDL_VIDEO
-SDL_AUTOCONF += --enable-video
-
- ifdef PTXCONF_SDL_NANOX
- SDL_AUTOCONF += \
-	--enable-video-nanox \
-	--enable-nanox-debug \
-	--enable-nanox-share-memory \
-	--enable-nanox-direct-fb
- else
- SDL_AUTOCONF += --disable-video-nanox
- endif
-
- ifdef PTXCONF_SDL_XORG
- SDL_AUTOCONF += \
-	--with-x \
-	--enable-video-x11 \
-	--enable-video-x11-vm \
-	--enable-dga \
-	--enable-video-x11-dgamouse \
-	--enable-video-x11-xme \
-	--enable-video-dga \
-	--x-includes=$(SYSROOT)/usr/include \
-	--x-libraries=$(SYSROOT)/usr/lib
-  ifdef PTXCONF_SDL_XORG_XV
-  SDL_AUTOCONF += --enable-video-x11-xv
-  else
-  SDL_AUTOCONF += --disable-video-x11-xv
-  endif
-  ifdef PTXCONF_SDL_XORG_XINERAMA
-  SDL_AUTOCONF += --enable-video-x11-xinerama
-  else
-  SDL_AUTOCONF += --disable-video-x11-xinerama
-  endif
- else
- SDL_AUTOCONF += --without-x
- endif
-
- ifdef PTXCONF_SDL_FBCON
- SDL_AUTOCONF += --enable-video-fbcon
- else
- SDL_AUTOCONF += --disable-video-fbcon
- endif
-
- ifdef PTXCONF_SDL_DIRECTFB
- SDL_AUTOCONF += --enable-video-directfb
- else
- SDL_AUTOCONF += --disable-video-directfb
- endif
-
- ifdef PTXCONF_SDL_AALIB
- SDL_AUTOCONF += --enable-video-aalib
- else
- SDL_AUTOCONF += --disable-video-aalib
- endif
-
- ifdef PTXCONF_SDL_OPENGL
- SDL_AUTOCONF += \
-	--enable-video-opengl \
-	--enable-osmesa-shared
- else
- SDL_AUTOCONF += --disable-video-opengl
- endif
-
- SDL_AUTOCONF += --disable-video-qtopia
-
-else
-SDL_AUTOCONF += --disable-video
-endif
-
-ifdef PTXCONF_SDL_EVENT
-SDL_AUTOCONF += --enable-events
-else
-SDL_AUTOCONF += --disable-events
-endif
-
-ifdef PTXCONF_SDL_JOYSTICK
-SDL_AUTOCONF += --enable-joystick
-else
-SDL_AUTOCONF += --disable-joystick
-endif
-
-ifdef PTXCONF_SDL_CDROM
-SDL_AUTOCONF += --enable-cdrom
-else
-SDL_AUTOCONF += --disable-cdrom
-endif
-
-ifdef PTXCONF_SDL_THREADS
-SDL_AUTOCONF += --enable-threads
- ifdef PTXCONF_SDL_PTH
- SDL_AUTOCONF += --enable-pth
- else
- SDL_AUTOCONF += --disable-pth
- endif
-else
-SDL_AUTOCONF += --disable-threads
-endif
-
-ifdef PTXCONF_SDL_TIMERS
-SDL_AUTOCONF += --enable-timers
-else
-SDL_AUTOCONF += --disable-timers
-endif
-
-ifdef PTXCONF_SDL_FILE
-SDL_AUTOCONF += --enable-file
-else
-SDL_AUTOCONF += --disable-file
-endif
-
-ifdef PTXCONF_SDL_CPUINFO
-SDL_AUTOCONF += --enable-cpuinfo
-else
-SDL_AUTOCONF += --disable-cpuinfo
-endif
-
-ifdef PTXCONF_SDL_NASM
-SDL_AUTOCONF += --enable-nasm
-else
-SDL_AUTOCONF += --disable-nasm
-endif
-
-SDL_AUTOCONF += \
+	--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 \
+	--$(call ptx/endis,PTXCONF_SDL_DIRECTFB)-video-directfb \
 	--disable-video-ps2gs \
+	--disable-video-ps3 \
 	--disable-video-ggi \
 	--disable-video-svga \
 	--disable-video-vgl \
+	--disable-video-wscons \
+	--disable-video-aalib \
+	--enable-video-caca \
+	--disable-video-qtopia \
+	--disable-video-picogui \
 	--disable-xbios \
 	--disable-gem \
-	--enable-assembly \
 	--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 \
-	--disable-video-picogui \
 	--enable-sdl-dlopen \
 	--disable-atari-ldg \
+	--enable-clock_gettime \
 	--disable-rpath \
-	--disable-mintaudio \
-	--disable-video-photon \
-	--enable-input-events
+	--$(call ptx/wwo,PTXCONF_SDL_XORG)-x
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -275,9 +130,8 @@ $(STATEDIR)/sdl.targetinstall:
 	@$(call install_fixup, sdl,AUTHOR,"Erwin Rol <ero@pengutronix.de>")
 	@$(call install_fixup, sdl,DESCRIPTION,missing)
 
-ifdef PTXCONF_SDL_SHARED
 	@$(call install_lib, sdl, 0, 0, 0644, libSDL-1.2)
-endif
+
 	@$(call install_finish, sdl)
 
 	@$(call touch)