From 8a21ca4868f6fc425f4da7d0f51bfce13b1cd16d Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 20 Oct 2006 11:46:21 +0000
Subject: add libsdl-native 1.2.11 - this one compiles with gcc4

---
 packages/libsdl/libsdl-native_1.2.11.bb | 36 +++++++++++++++++
 packages/libsdl/libsdl-native_1.2.7.bb  | 69 ---------------------------------
 2 files changed, 36 insertions(+), 69 deletions(-)
 create mode 100644 packages/libsdl/libsdl-native_1.2.11.bb
 delete mode 100644 packages/libsdl/libsdl-native_1.2.7.bb

diff --git a/packages/libsdl/libsdl-native_1.2.11.bb b/packages/libsdl/libsdl-native_1.2.11.bb
new file mode 100644
index 0000000000..298426a04c
--- /dev/null
+++ b/packages/libsdl/libsdl-native_1.2.11.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Simple DirectMedia Layer - native Edition"
+HOMEPAGE = "http://www.libsdl.org"
+SECTION = "libs"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+	   file://acinclude.m4"
+S = "${WORKDIR}/SDL-${PV}"
+
+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 \
+                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
+                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
+                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --disable-video-xbios --disable-video-gem --disable-video-dummy \
+                --disable-video-opengl --enable-input-events --enable-pthreads \
+                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+
+do_configure() {
+	rm -f ${S}/acinclude.m4
+	cp ${WORKDIR}/acinclude.m4 ${S}/
+	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() {
+	autotools_stage_all
+	install -m 0644 build/libSDLmain.a ${STAGING_LIBDIR}
+}
diff --git a/packages/libsdl/libsdl-native_1.2.7.bb b/packages/libsdl/libsdl-native_1.2.7.bb
deleted file mode 100644
index 9cd0d82ffc..0000000000
--- a/packages/libsdl/libsdl-native_1.2.7.bb
+++ /dev/null
@@ -1,69 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer - native Edition"
-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
-
-EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-do_configure_prepend() {
-	rm -f ${S}/acinclude.m4
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-do_configure_append () {
-	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
-}
-- 
cgit v1.2.3