Merge bk://openembedded@openembedded.bkbits.net/packages

into chrislaptop.(none):/home/chris/oe/oe/packages

2004/08/17 17:57:35+01:00 (none)!cwiiis
Fixed libxine (untested, but builds ok)

BKrev: 41223918AWiiAJmCN9_Y39lMwg33Yg

diff --git a/libxine/libxine-1.0.0-beta12/fftscope-static-inlining.patch b/libxine/libxine-1.0.0-beta12/fftscope-static-inlining.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libxine/libxine-1.0.0-beta12/fix-syntax-xine-vorbis-decoder.patch b/libxine/libxine-1.0.0-beta12/fix-syntax-xine-vorbis-decoder.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libxine/libxine-1.0.0-beta12/mpegvideo-static-inlining.patch b/libxine/libxine-1.0.0-beta12/mpegvideo-static-inlining.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe
index 36ce2ff..1bdba68 100644 (file)
--- a/libxine/libxine_1.0.0-beta12.oe
+++ b/libxine/libxine_1.0.0-beta12.oe
@@ -13,7 +13,10 @@ SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine
           file://libvorbis.patch;patch=0 \
           file://demux_ogg.patch;patch=0 \
           file://configure.ac.patch;patch=0 \
-          file://vo_scale.patch;patch=0"
+          file://vo_scale.patch;patch=0 \
+          file://mpegvideo-static-inlining.patch;patch=1 \
+          file://fix-syntax-xine-vorbis-decoder.patch;patch=1 \
+          file://fftscope-static-inlining.patch;patch=1"
 
 SOV = "1.0.6"
 
@@ -27,7 +30,7 @@ do_configure() {
 }
 
 do_compile() {
-       oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool
+       oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool OGG_LIBS=$(STAGING_LIBDIR)/libogg.so
 }
 
 # ug - we don't do elegant/purdy today