summaryrefslogtreecommitdiff
path: root/packages/libxine
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2005-04-14 10:47:30 +0000
committerChris Lord <chris@openedhand.com>2005-04-14 10:47:30 +0000
commit7997e9575b3c3f5fd6721302a89f2c998d9e9f61 (patch)
treeaef474cda485aa7180f66692ab07566585ce4324 /packages/libxine
parent8b47bcea42c3344099a7536c966c6d0818c684c6 (diff)
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
Diffstat (limited to 'packages/libxine')
-rw-r--r--packages/libxine/libxine-1.0/fix-syntax-xine-vorbis-decoder.patch0
-rw-r--r--packages/libxine/libxine_1.0.0-beta12.bb2
-rw-r--r--packages/libxine/libxine_1.0.bb5
3 files changed, 5 insertions, 2 deletions
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
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxine/libxine-1.0/fix-syntax-xine-vorbis-decoder.patch
diff --git a/packages/libxine/libxine_1.0.0-beta12.bb b/packages/libxine/libxine_1.0.0-beta12.bb
index d74cc26ba1..e9a93b68be 100644
--- 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 c8fa4aedbe..9b1328ceff 100644
--- 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"