From: Chris Larson <clarson@kergoth.com>
Date: Tue, 30 Mar 2004 16:57:59 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~19816
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09cad80ea333b45f0df46b82c78744d3be54c879;p=openembedded.git

Merge

2004/03/29 11:11:49-05:00 local!kergoth
Bug in scummvm build.. we werent being explicit about configure options, so it was poking around in native headers to determine if we had things like libvorbis and libogg.  Fixed.

2004/03/29 11:11:23-05:00 local!kergoth
Bugfixes in pango and appweb per the recent oe metadata handling change.

BKrev: 4069a7174MMf0zvSv3smX-syqMLJLA
---

diff --git a/appweb/appweb_1.0.0.oe b/appweb/appweb_1.0.0.oe
index 8bb065ea28..0b4374b813 100644
--- a/appweb/appweb_1.0.0.oe
+++ b/appweb/appweb_1.0.0.oe
@@ -62,7 +62,8 @@ EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \
 		--disable-ssl"
 EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'"
 
-export LD_LIBRARY_PATH = "${S}/lib:${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
 do_configure () {
 	./configure ${EXTRA_OECONF}
 }
diff --git a/appweb/appweb_1.0.1.oe b/appweb/appweb_1.0.1.oe
index 29ca677d58..c065e4ad7c 100644
--- a/appweb/appweb_1.0.1.oe
+++ b/appweb/appweb_1.0.1.oe
@@ -61,7 +61,8 @@ EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \
 		--disable-ssl"
 EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'"
 
-export LD_LIBRARY_PATH = "${S}/lib:${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
 do_configure () {
 	./configure ${EXTRA_OECONF}
 }
diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe
index c1b024f4c7..bd7ee7ad0f 100644
--- a/pango/pango_1.2.5.oe
+++ b/pango/pango_1.2.5.oe
@@ -14,7 +14,7 @@ inherit autotools libtool pkgconfig
 EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no"
 
-FILES_pango-doc = "${FILES_pango-doc} ${datadir}/gtk-doc"
+FILES_pango-doc_append = " ${datadir}/gtk-doc"
 
 SOV = "0.200.5"
 do_stage () {
@@ -26,4 +26,3 @@ do_stage () {
 	install -d ${STAGING_INCDIR}/pango
 	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
 }
-
diff --git a/scummvm/scummvm_0.5.1.oe b/scummvm/scummvm_0.5.1.oe
index ebdd6bb1f3..37bccd4667 100644
--- a/scummvm/scummvm_0.5.1.oe
+++ b/scummvm/scummvm_0.5.1.oe
@@ -1,14 +1,23 @@
 DESCRIPTION = "Virtual Machine for LucasArts Adventures"
 SECTION = "base"
 PRIORITY = "optional"
-RDEPENDS = "libc6 libsdl-qpe libmad"
-DEPENDS = "virtual/libc libsdl-qpe libmad"
+DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tgz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
 inherit autotools libtool
 
-EXTRA_OECONF = "--backend=sdl"
+EXTRA_OECONF = "--backend=sdl \
+		--with-sdl-prefix=${STAGING_BINDIR}/.. \
+		--disable-alsa \
+		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
+		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
+		--disable-mpeg2 \
+		--with-mad-prefix=${STAGING_BINDIR}/.."
+
+do_configure() {
+	./configure ${EXTRA_OECONF}
+}
 
 do_compile() {
 	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" DEFINES="-DUNIX -DQTOPIA"
diff --git a/scummvm/scummvm_0.6.0.oe b/scummvm/scummvm_0.6.0.oe
index b23fcfc2fe..37bccd4667 100644
--- a/scummvm/scummvm_0.6.0.oe
+++ b/scummvm/scummvm_0.6.0.oe
@@ -1,18 +1,22 @@
 DESCRIPTION = "Virtual Machine for LucasArts Adventures"
 SECTION = "base"
 PRIORITY = "optional"
-RDEPENDS = "libc6 libsdl-qpe libmad"
-DEPENDS = "virtual/libc libsdl-qpe libmad"
+DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
 inherit autotools libtool
 
-export CC = "${HOST_PREFIX}gcc"
-export CXX = "${HOST_PREFIX}g++"
+EXTRA_OECONF = "--backend=sdl \
+		--with-sdl-prefix=${STAGING_BINDIR}/.. \
+		--disable-alsa \
+		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
+		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
+		--disable-mpeg2 \
+		--with-mad-prefix=${STAGING_BINDIR}/.."
 
 do_configure() {
-	./configure --backend=sdl --with-sdl-prefix=${STAGING_BINDIR}/..
+	./configure ${EXTRA_OECONF}
 }
 
 do_compile() {