summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-08-14 22:38:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-14 22:38:30 +0000
commit1bf58af17a17ffeb3fa555501d625509e67290aa (patch)
tree7a632ffa38ed19d395c2c454625a2c3fcb0ca005
parentf3eb2fd587d41e922fa051c983eff8c3f75814bb (diff)
rrecommend all xine plugins in opie-mediaplayer2, remove opie-mediaplayer2-divx package
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb23
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2.inc6
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb2
4 files changed, 6 insertions, 27 deletions
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
deleted file mode 100644
index 405d384cf8..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "OPIE Mediaplayer DIVX pseudo package."
-MAINTAINER = "Werner Schulte <w1@schulte-ac.de>"
-LICENSE = "GPL"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
-PR = "r1"
-
-DEPENDS = "opie-mediaplayer2 \
- opie-mediaplayer2-skin-default \
- libxine-fb "
-
-RDEPENDS = "opie-mediaplayer2 \
- opie-mediaplayer2-skin-default \
- libxine-plugin-ao-out-oss \
- libxine-plugin-decode-ff \
- libxine-plugin-decode-mad \
- libxine-plugin-dmx-audio \
- libxine-plugin-dmx-avi \
- libxine-plugin-dmx-mpeg \
- libxine-plugin-inp-file \
- libxine1"
-
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
index 3372edddfd..00247fe6ad 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
@@ -6,8 +6,10 @@ LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default"
RDEPENDS = "opie-mediaplayer2-skin"
-RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \
-libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file "
+RRECOMMENDS = "opie-mediaplayer2-skin-default \
+libxine-plugin-ao-out-oss libxine-plugin-inp-file \
+libxine-plugin-decode-ff libxine-plugin-decode-mad \
+libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg"
APPNAME = "opieplayer2"
S = "${WORKDIR}/${APPNAME}"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
index b0fe5563e9..c94efb35ec 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
@@ -1,6 +1,6 @@
include ${PN}.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 631f545873..cc6d9b43c1 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,7 @@
include ${PN}.inc
PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
${HANDHELDS_CVS};module=opie/pics \