rrecommend all xine plugins in opie-mediaplayer2, remove opie-mediaplayer2-divx package

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 (file)
index 405d384..0000000
--- 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 3372edd..00247fe 100644 (file)
--- 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 b0fe556..c94efb3 100644 (file)
--- 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 631f545..cc6d9b4 100644 (file)
--- 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 \