diff options
| author | Chris Lord <chris@openedhand.com> | 2004-08-17 16:58:00 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2004-08-17 16:58:00 +0000 |
| commit | a618e039b4d893fadeb4970a19b71c9594d15bce (patch) | |
| tree | 5d425758781ee9a052d88a5857298d5b1691bb1d /libxine | |
| parent | 1aa6f10a9dbe6445288f6adb584fd293b8ba94f4 (diff) | |
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
Diffstat (limited to 'libxine')
4 files changed, 5 insertions, 2 deletions
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 index 0000000000..e69de29bb2 --- /dev/null +++ b/libxine/libxine-1.0.0-beta12/fftscope-static-inlining.patch 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/libxine/libxine-1.0.0-beta12/fix-syntax-xine-vorbis-decoder.patch 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/libxine/libxine-1.0.0-beta12/mpegvideo-static-inlining.patch diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe index 36ce2ff539..1bdba68975 100644 --- 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 |