Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/26 14:07:33+01:00 dyndns.org!reenoo
libsdl-x11: bump PR

2004/12/26 14:06:50+01:00 dyndns.org!reenoo
libsdl-x11: work around libtool introducing a spurious dependency on libstdc++

2004/12/26 13:54:43+01:00 dyndns.org!reenoo
bitbake.conf: fix GPE_MIRROR

BKrev: 41cebf36-XLaHamDCbK_cI7ODgoevw

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 03da65f..b4f3dd2 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -273,7 +273,7 @@ export palmqtdir = "/opt/QtPalmtop"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://aleron.dl.sourceforge.net/sourceforge"
-GPE_MIRROR = "http://gpe.handhelds.org/pub/projects/gpe/source"
+GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://freedesktop.org/~xlibs/release"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs"

diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index e69de29..9595b73 100644 (file)
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -0,0 +1,55 @@
+PR = "r2"
+DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+DEPENDS = "x11 xext"
+PROVIDES = "virtual/libsdl"
+LICENSE = "LGPL"
+
+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
+
+EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
+                --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
+                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
+                --disable-mintaudio --disable-nasm --enable-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 arm-linux-libtool | sed -e 's/postdeps=".*"/postdeps=""/' > arm-linux-libtool.tmp
+       mv arm-linux-libtool.tmp arm-linux-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 sdl-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \
+                      | sed -e "s,libdirs ,mickey_is_cool ," \
+                       | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/sdl-config
+        chmod a+rx ${STAGING_BINDIR}/sdl-config
+}