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

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


From f1eaa36f456d092a4878f164e9e78ebc7ddb476d Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 12 Feb 2007 16:33:22 +0000
Subject: opie-mediaplayer1: Continue cycle-breaking. *
 opie-mediaplayer1-ogg-mp3 is what becomes opie-mediaplayer1. For now we don't
 want adhoc packaging variants.

---
 packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb | 7 -------
 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb         | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
 create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb

diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
deleted file mode 100644
index 5f1f6b041f..0000000000
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package."
-LICENSE = "GPL"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
-RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin"
-PR = "r1"
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
new file mode 100644
index 0000000000..5f1f6b041f
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package."
+LICENSE = "GPL"
+ALLOW_EMPTY = "1"
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "all"
+RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin"
+PR = "r1"
-- 
cgit v1.2.3


From d0107ec781988e1001c805eee487b3acefa7f2c7 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 12 Feb 2007 16:38:54 +0000
Subject: opie-mediaplayer1: Finish refactor to get rid of circular
 dependencies.

---
 packages/opie-mediaplayer1/opie-mediaplayer1-core.inc | 4 +---
 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
index 7c20be565b..de9ea19368 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc
@@ -1,11 +1,9 @@
-DESCRIPTION = "The classic Opie media player"
+DESCRIPTION = "The classic Opie media player (core)"
 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"
 
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
index 5f1f6b041f..0ceaac41e4 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb
@@ -1,7 +1,10 @@
-DESCRIPTION = "OPIE Mediaplayer1 OGG+MP3 pseudo package."
+DESCRIPTION = "The classic Opie media player (core+plugins)."
 LICENSE = "GPL"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
-RDEPENDS = "opie-mediaplayer1 opie-mediaplayer1-libtremorplugin opie-mediaplayer1-libmadplugin"
-PR = "r1"
+RDEPENDS = "opie-mediaplayer1-core"
+RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
+opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+
+PR = "r2"
-- 
cgit v1.2.3


From 4f2ab4a21f451bace3a029be94419489b17cf15d Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 12 Feb 2007 16:44:16 +0000
Subject: preferred-opie-versions.inc, preferred-opie-cvs-versions.inc: Add
 opie-mediaplayer1-core. * + allow to override few package versions.

---
 conf/distro/include/preferred-opie-cvs-versions.inc | 3 ++-
 conf/distro/include/preferred-opie-versions.inc     | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index 93b068ee65..d27f56fb04 100644
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -106,7 +106,8 @@ SRCDATE_opie-mediaplayer1-libmadplugin ?= "${OPIE_VERSION}"
 SRCDATE_opie-mediaplayer1-libmodplugin ?= "${OPIE_VERSION}"
 SRCDATE_opie-mediaplayer1-libtremorplugin ?= "${OPIE_VERSION}"
 SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}"
-SRCDATE_opie-mediaplayer1 ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-libwavplugin ?= "${OPIE_VERSION}"
+SRCDATE_opie-mediaplayer1-core ?= "${OPIE_VERSION}"
 SRCDATE_opie-mediaplayer2 ?= "${OPIE_VERSION}"
 SRCDATE_opie-mediaplayer2-skin-default ?= "${OPIE_VERSION}"
 SRCDATE_opie-mediaplayer2-skin-default-landscape ?= "${OPIE_VERSION}"
diff --git a/conf/distro/include/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc
index d7c5b94f7a..84c0b212ed 100644
--- a/conf/distro/include/preferred-opie-versions.inc
+++ b/conf/distro/include/preferred-opie-versions.inc
@@ -32,9 +32,9 @@ PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet ?= "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager ?= "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
@@ -106,6 +106,7 @@ PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-core = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-mediaplayer2-skin-default = "${OPIE_VERSION}"
-- 
cgit v1.2.3