Cleanup libSDL package Makefile

SVN-Revision: 19551

diff --git a/libs/libsdl/Makefile b/libs/libsdl/Makefile
index 43c30259eaec9f8d518f5c32bdea3b529888bcb0..8c8188f6301e371ae9cbab5ce5bd3ae67eb96f7a 100644 (file)
--- a/libs/libsdl/Makefile
+++ b/libs/libsdl/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2009 OpenWrt.org
+#
+# Copyright (C) 2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,14 +7,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libsdl
+PKG_NAME:=SDL
 PKG_VERSION:=1.2.14
 PKG_RELEASE:=1
 
-PKG_SOURCE:=SDL-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.libsdl.org/release/
 PKG_MD5SUM:=e52086d1b508fa0b76c52ee30b55bec4
-PKG_BUILD_DIR:=$(BUILD_DIR)/SDL-$(PKG_VERSION)
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +25,7 @@ define Package/libsdl
   CATEGORY:=Libraries
   TITLE:=Simple DirectMedia Layer
   URL:=http://www.libsdl.org
-  DEPENDS:=+DirectFB
+  DEPENDS:=+DirectFB +zlib +libpthread
 endef
 
 define Package/libsdl/description
@@ -31,25 +33,113 @@ define Package/libsdl/description
  framebuffer, audio output, mouse, and keyboard.
 endef
 
-CONFIGURE_ARGS += \
-       --without-x \
-       --disable-audio
-
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-libc \
+               --disable-audio \
+               --enable-video \
+               --disable-events \
+               --disable-joystick \
+               --disable-cdrom \
+               --enable-threads \
+               --enable-timers \
+               --enable-file \
+               --enable-loadso \
+               --enable-cpuinfo \
+               --enable-assembly \
+               --disable-oss \
+               --disable-alsa \
+               --disable-alsatest \
+               --enable-alsa-shared \
+               --disable-esd \
+               --disable-esdtest \
+               --enable-esd-shared \
+               --disable-pulseaudio \
+               --enable-pulseaudio-shared \
+               --disable-arts \
+               --enable-arts-shared \
+               --disable-nas \
+               --enable-nas-shared \
+               --disable-diskaudio \
+               --disable-dummyaudio \
+               --disable-mintaudio \
+               --disable-nasm \
+               --disable-altivec \
+               --disable-ipod \
+               --disable-nanox \
+               --disable-video-x11 \
+               --enable-x11-shared \
+               --enable-dga \
+               --enable-video-dga \
+               --enable-video-x11-dgamouse \
+               --enable-video-x11-vm \
+               --enable-video-x11-xv \
+               --disable-video-x11-xinerama \
+               --disable-video-x11-xme \
+               --disable-video-x11-xrandr \
+               --disable-video-photon \
+               --disable-video-carbon \
+               --disable-video-cocoa \
+               --disable-video-fbcon \
+               --enable-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-video-xbios \
+               --disable-video-gem \
+               --disable-video-dummy \
+               --disable-video-opengl \
+               --disable-osmesa-shared \
+               --disable-screensaver \
+               --enable-input-events \
+               --disable-input-tslib \
+               --enable-pth \
+               --enable-pthreads \
+               --enable-pthread-sem \
+               --disable-stdio-redirect \
+               --disable-directx \
+               --enable-sdl-dlopen \
+               --disable-atari-ldg \
+               --disable-clock_gettime \
+               --without-x \
+               --enable-rpath \
+               , \
+               ac_cv_path_DIRECTFBCONFIG=no \
+       )
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/include/SDL* \
                $(1)/usr/include/
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/lib/libSDL*.{a,so*} \
                $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig
+
+
+       $(INSTALL_DIR) $(1)/usr/share/aclocal
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/share/aclocal/* \
+               $(1)/usr/share/aclocal/
+
+       $(INSTALL_DIR) $(1)/host/bin
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/sdl-config \
+               $(1)/host/bin
+
+       $(SED) 's,^\(exec_prefix\|prefix\)=.*,\1=\"$(STAGING_DIR)/usr/\",g' \
+               $(1)/host/bin/sdl-config
 endef
 
 define Package/libsdl/install