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

into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/14 11:46:57+01:00 (none)!cwiiis
Fix libxine 1.0 to use recent tremor

BKrev: 425e4a42DQuQcPdShq8mrn7PcviqGg

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

diff --git a/packages/libxine/libxine_1.0.0-beta12.bb b/packages/libxine/libxine_1.0.0-beta12.bb
index d74cc26..e9a93b6 100644 (file)
--- a/packages/libxine/libxine_1.0.0-beta12.bb
+++ b/packages/libxine/libxine_1.0.0-beta12.bb
@@ -10,6 +10,8 @@ PRIORITY = "optional"
 DEPENDS = "zlib libogg tremor libmad"
 PR = "r4"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit autotools pkgconfig binconfig gettext
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-1-beta12.tar.gz \

diff --git a/packages/libxine/libxine_1.0.bb b/packages/libxine/libxine_1.0.bb
index c8fa4ae..9b1328c 100644 (file)
--- a/packages/libxine/libxine_1.0.bb
+++ b/packages/libxine/libxine_1.0.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
 DEPENDS = "zlib libogg tremor libmad esound-gpe"
 PROVIDES = "virtual/libxine"
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gettext
 
@@ -20,7 +20,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.
        file://libxine-ffmpeg-enable-arm.patch;patch=1 \
        file://no-caca-no-aalib.patch;patch=1 \
        file://dont-have-xv.patch;patch=1 \
-       file://restore-esd.patch;patch=1"
+       file://restore-esd.patch;patch=1 \
+       file://fix-syntax-xine-vorbis-decoder.patch;patch=1"
 
 SOV = "1.0.7"
 

diff --git a/packages/tremor/tremor_20041119.bb b/packages/tremor/tremor_20041119.bb
index bc257e5..0014512 100644 (file)
--- a/packages/tremor/tremor_20041119.bb
+++ b/packages/tremor/tremor_20041119.bb
@@ -7,8 +7,6 @@ LICENSE = "BSD"
 CVSDATE = "${PV}"
 PR = "r1"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http"
 
 S = "${WORKDIR}/Tremor"