diff options
| -rw-r--r-- | conf/distro/include/preferred-opie-cvs-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-versions.inc | 7 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-core.inc (renamed from packages/opie-mediaplayer1/opie-mediaplayer1.inc) | 4 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.2.bb | 6 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb (renamed from packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb) | 0 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1-ogg-mp3_0.1.0.bb | 7 | ||||
| -rw-r--r-- | packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb | 14 |
7 files changed, 22 insertions, 19 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}" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1-core.inc index 7c20be565b..de9ea19368 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1.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-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_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.bb index 16d71b2333..16d71b2333 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_cvs.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 index ca0beacb47..0ceaac41e4 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,6 +1,10 @@ -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" +DESCRIPTION = "The classic Opie media player (core+plugins)." +LICENSE = "GPL" +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" +PACKAGE_ARCH = "all" +RDEPENDS = "opie-mediaplayer1-core" +RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ +opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" +PR = "r2" |