[oe-commits] woglinde : xine: update to new xine recipe
GIT User account
git at amethyst.openembedded.net
Wed Apr 1 23:59:15 UTC 2009
Module: openembedded.git
Branch: kergoth/autotools
Commit: 02f4e5ae5dd49c2ab0c23866e0882041c43959a7
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=02f4e5ae5dd49c2ab0c23866e0882041c43959a7
Author: woglinde <heinold at inf.fu-berlin.de>
Date: Wed Apr 1 22:55:35 2009 +0200
xine: update to new xine recipe
* as a side node only opie-mediaplayer2 compiles out of the box
---
conf/distro/angstrom-2008.1.conf | 1 -
conf/distro/include/angstrom-2007-for-openmoko.inc | 1 -
conf/distro/include/preferred-om-2008-versions.inc | 3 ---
conf/distro/kaeilos.conf | 1 -
conf/distro/oplinux.conf | 1 -
recipes/gxine/gxine_0.4.1.bb | 2 +-
recipes/gxine/gxine_0.4.1enhanced.bb | 2 +-
recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb | 2 +-
recipes/opie-mediaplayer2/opie-mediaplayer2.inc | 2 +-
recipes/totem/totem_0.99.15.bb | 2 +-
recipes/totem/totem_1.0.4.bb | 2 +-
11 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 6c2c1bd..0fb8332 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -147,7 +147,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index daf4dd0..b931d34 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -156,7 +156,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 55d5136..5cb2010 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1084,10 +1084,7 @@ PREFERRED_VERSION_libxfontcache ?= "1.0.4"
PREFERRED_VERSION_libxfont-native ?= "1.3.0"
PREFERRED_VERSION_libxft ?= "2.1.12"
PREFERRED_VERSION_libxi ?= "1.1.3"
-PREFERRED_VERSION_libxine ?= "1.1.0"
-PREFERRED_VERSION_libxine-fb ?= "1.0"
PREFERRED_VERSION_libxinerama ?= "1.0.2"
-PREFERRED_VERSION_libxine-x11 ?= "1.0"
PREFERRED_VERSION_libxkbfile ?= "1.0.4"
PREFERRED_VERSION_libxkbui ?= "1.0.2"
PREFERRED_VERSION_libxml2 ?= "2.7.2"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index a65bbff..1cc165b 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -123,7 +123,6 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
# Others:
diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf
index d4986bd..bab726f 100644
--- a/conf/distro/oplinux.conf
+++ b/conf/distro/oplinux.conf
@@ -42,7 +42,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_esound ?= "pulseaudio"
diff --git a/recipes/gxine/gxine_0.4.1.bb b/recipes/gxine/gxine_0.4.1.bb
index 9648e9e..4b63030 100644
--- a/recipes/gxine/gxine_0.4.1.bb
+++ b/recipes/gxine/gxine_0.4.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "gxine is a front-end for libxine."
SECTION = "x11/multimedia"
LICENSE = "GPL"
-DEPENDS = "gtk+ libxine-x11"
+DEPENDS = "gtk+ libxine"
PR = "r2"
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gxine/gxine_0.4.1enhanced.bb b/recipes/gxine/gxine_0.4.1enhanced.bb
index 9677664..46880ce 100644
--- a/recipes/gxine/gxine_0.4.1enhanced.bb
+++ b/recipes/gxine/gxine_0.4.1enhanced.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "gxine is a front-end for libxine."
SECTION = "x11/multimedia"
LICENSE = "GPL"
-DEPENDS = "gtk+ libxine-x11"
+DEPENDS = "gtk+ libxine"
PR = "r1"
# Long list of RDEPENDS required to playback mp3/ogg audio and mpeg/mpeg4 video
diff --git a/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb b/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb
index e7a933e..a718b0a 100644
--- a/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb
+++ b/recipes/mb-desktop-xine/mb-desktop-xine_0.4.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "foo"
HOMEPAGE = "http://projects.o-hand.com/matchbox/"
LICENSE = "GPL"
-DEPENDS = "matchbox-desktop libxine-x11"
+DEPENDS = "matchbox-desktop libxine"
RDEPENDS = "libxine-plugin-vo-out-xshm \
libxine-plugin-vo-out-none \
libxine-plugin-ao-out-esd \
diff --git a/recipes/opie-mediaplayer2/opie-mediaplayer2.inc b/recipes/opie-mediaplayer2/opie-mediaplayer2.inc
index b4fb39b..248704d 100644
--- a/recipes/opie-mediaplayer2/opie-mediaplayer2.inc
+++ b/recipes/opie-mediaplayer2/opie-mediaplayer2.inc
@@ -3,7 +3,7 @@ It plays mp3, mpeg, wav, ogg, quicktime, divx, etc. and is capable of streaming.
SECTION = "opie/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default"
+DEPENDS = "libxine libqtaux2 opie-mediaplayer2-skin-default"
RDEPENDS = "opie-mediaplayer2-skin-default"
RRECOMMENDS = "libxine-plugin-ao-out-oss libxine-plugin-inp-file \
libxine-plugin-decode-ff libxine-plugin-decode-mad \
diff --git a/recipes/totem/totem_0.99.15.bb b/recipes/totem/totem_0.99.15.bb
index 3defdae..ed182b7 100644
--- a/recipes/totem/totem_0.99.15.bb
+++ b/recipes/totem/totem_0.99.15.bb
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.acc.umu.se/pub/GNOME/sources/totem/0.99/totem-${PV}.tar.gz \
file://include.patch;patch=1 \
file://omf.patch;patch=1"
-DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libgnomeui"
+DEPENDS="gtk+ libglade gnome-vfs gconf libxine libgnomeui"
RDEPENDS += " libgnomeui"
inherit autotools
diff --git a/recipes/totem/totem_1.0.4.bb b/recipes/totem/totem_1.0.4.bb
index a12f307..8694bcb 100644
--- a/recipes/totem/totem_1.0.4.bb
+++ b/recipes/totem/totem_1.0.4.bb
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/totem/1.0/totem-${PV}.tar.gz \
file://cflags.patch;patch=1 \
file://gtkonly.patch;patch=1"
-DEPENDS="gtk+ libglade gnome-vfs gconf libxine-x11 libxml2"
+DEPENDS="gtk+ libglade gnome-vfs gconf libxine libxml2"
inherit autotools
More information about the Openembedded-commits
mailing list