From f7d3f245af4cf4560eb4b294c74c24d06f46522e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 12 Feb 2007 16:29:03 +0000
Subject: opie-mediaplayer1: Start measures to get rid of circular package
 dependencies. * The idea is simple and standard: introduce a node in graph
 "above" current ones, and make it depend on existing nodes, instead of them
 depend on each other. Thus, we'll have opie-mediaplayer1-core &
 opie-mediaplayer1-plugins*, and opie-mediaplayer1 virtual package above them.
 * Step 1: rename existing opie-mediaplayer1 recipe to opie-mediaplayer1-core
 (to be edited later).

---
 .../opie-mediaplayer1/opie-mediaplayer1-core.inc   | 22 ++++++++++++++++++++++
 .../opie-mediaplayer1-core_1.2.2.bb                |  6 ++++++
 .../opie-mediaplayer1-core_cvs.bb                  |  7 +++++++
 packages/opie-mediaplayer1/opie-mediaplayer1.inc   | 22 ----------------------
 .../opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb   |  6 ------
 .../opie-mediaplayer1/opie-mediaplayer1_cvs.bb     |  7 -------
 6 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
 create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb
 create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb
 delete mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1.inc
 delete mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
 delete mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb

(limited to 'packages')

diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
new file mode 100644
index 0000000000..7c20be565b
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "The classic Opie media player"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libqtaux2"
+RDEPENDS = "opie-mediaplayer2-skin-default"
+RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
+opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+APPNAME = "opieplayer"
+APPTYPE = "binary"
+
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb
new file mode 100644
index 0000000000..ca0beacb47
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb
new file mode 100644
index 0000000000..16d71b2333
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PV = "${OPIE_CVS_PV}"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1.inc
deleted file mode 100644
index 7c20be565b..0000000000
--- a/packages/opie-mediaplayer1/opie-mediaplayer1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "The classic Opie media player"
-SECTION = "opie/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "libqtaux2"
-RDEPENDS = "opie-mediaplayer2-skin-default"
-RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
-opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
-APPNAME = "opieplayer"
-APPTYPE = "binary"
-
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
deleted file mode 100644
index ca0beacb47..0000000000
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
deleted file mode 100644
index 16d71b2333..0000000000
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require ${PN}.inc
-
-PV = "${OPIE_CVS_PV}"
-
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
-           ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps"
-- 
cgit v1.2.3