]> git.openpandora.org Git - openembedded.git/commitdiff
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
authorChris Lord <chris@openedhand.com>
Thu, 14 Apr 2005 10:47:30 +0000 (10:47 +0000)
committerChris Lord <chris@openedhand.com>
Thu, 14 Apr 2005 10:47:30 +0000 (10:47 +0000)
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

packages/libxine/libxine-1.0/fix-syntax-xine-vorbis-decoder.patch [new file with mode: 0644]
packages/libxine/libxine_1.0.0-beta12.bb
packages/libxine/libxine_1.0.bb
packages/tremor/tremor_20041119.bb

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
index d74cc26ba117d1fac8409bf100dd7e939c2a2991..e9a93b68beba8930eddd3af0f65660ffecfe1510 100644 (file)
@@ -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 \
index c8fa4aedbe52674b752d23667a3bc3677747c375..9b1328ceffab4007db0f39f51f8351367616a688 100644 (file)
@@ -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"
 
index bc257e5a6109efcb1245e5becd7595d5d5644da3..00145120e0f3f01d8b6799010d609e8c7010dc6f 100644 (file)
@@ -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"