From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 20 Oct 2006 11:46:21 +0000 (+0000)
Subject: add libsdl-native 1.2.11 - this one compiles with gcc4
X-Git-Tag: Release-2010-05/1~9453^2~567^2~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a21ca4868f6fc425f4da7d0f51bfce13b1cd16d;p=openembedded.git

add libsdl-native 1.2.11 - this one compiles with gcc4
---

diff --git a/packages/libsdl/libsdl-native_1.2.7.bb b/packages/libsdl/libsdl-native_1.2.11.bb
similarity index 58%
rename from packages/libsdl/libsdl-native_1.2.7.bb
rename to packages/libsdl/libsdl-native_1.2.11.bb
index 9cd0d82ffc..298426a04c 100644
--- a/packages/libsdl/libsdl-native_1.2.7.bb
+++ b/packages/libsdl/libsdl-native_1.2.11.bb
@@ -1,15 +1,14 @@
 DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+HOMEPAGE = "http://www.libsdl.org"
 SECTION = "libs"
-PRIORITY = "optional"
 LICENSE = "LGPL"
 PR = "r0"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-	   file://extra-keys.patch;patch=1 \
 	   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools native
+inherit autotools pkgconfig native
 
 EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
@@ -20,50 +19,18 @@ EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers
                 --disable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"
 
-do_configure_prepend() {
+do_configure() {
 	rm -f ${S}/acinclude.m4
 	cp ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-do_configure_append () {
+	gnu-configize
+	oe_runconf
 	cd ${S}
-
 	# prevent libtool from linking libs against libstdc++, libgcc, ...
 	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
 	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
 }
 
 do_stage() {
-	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-	#oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/SDL
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/SDL/
-	done
-
-	cat >${STAGING_BINDIR}/sdl-config-native <<EOF
-#!/bin/sh
-  case "\$1" in
-    --prefix)
-      echo /usr
-      ;;
-    --exec-prefix)
-      echo /usr 
-      ;;
-    --version)
-      echo ${PV}
-      ;;
-    --cflags)
-      echo -I${STAGING_INCDIR}/SDL -D_REENTRANT
-      ;;
-    --libs)
-      echo -lSDLmain -lSDL-1.2 -lpthread -L${STAGING_LIBDIR}
-      ;;
-  esac
-EOF
-	chmod a+rx ${STAGING_BINDIR}/sdl-config-native
+	autotools_stage_all
+	install -m 0644 build/libSDLmain.a ${STAGING_LIBDIR}
 }