diff options
13 files changed, 37 insertions, 21 deletions
diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index b478ca2604..4e6446f96a 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -1,24 +1,36 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications" SECTION = "openmoko/libs" LICENSE = "LGPL" -DEPENDS += "gtk+ eds-dbus" +DEPENDS += "gtk+ eds-dbus libgsmd" PV = "0.0.1+svn${SRCDATE}" -PR = "r2" +PR = "r5" inherit openmoko -do_configure_prepend() { - touch libmokocore/Makefile.in - touch libmokopim/Makefile.in - touch libmokonet/Makefile.in -} - do_stage() { autotools_stage_all } -PACKAGES =+ "libmokojournal libmokojournal-dev libmokojournal-dbg" +PACKAGES =+ " \ + libmokojournal libmokojournal-dev libmokojournal-dbg \ + libmokogsmd libmokogsmd-dev libmokogsmd-dbg \ + libmokocore libmokocore-dev libmokocore-dbg \ + libmokoui libmokoui-dev libmokoui-dbg \ + " FILES_libmokojournal = "${libdir}/libmokojournal.so.*" FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal" FILES_libmokojournal-dbg = "${libdir}/.debug/libmokojournal.so.*" + +FILES_libmokogsmd = "${libdir}/libmokogsmd.so.*" +FILES_libmokogsmd-dev = "${libdir}/libmokogsmd.so ${libdir}/libmokogsmd.*a ${includedir}/${PN}/libmokogsmd" +FILES_libmokogsmd-dbg = "${libdir}/.debug/libmokogsmd.so.*" + +FILES_libmokocore = "${libdir}/libmokocore.so.*" +FILES_libmokocore-dev = "${libdir}/libmokocore.so ${libdir}/libmokocore.*a ${includedir}/${PN}/libmokocore" +FILES_libmokocore-dbg = "${libdir}/.debug/libmokocore.so.*" + +FILES_libmokoui = "${libdir}/libmokoui.so.*" +FILES_libmokoui-dev = "${libdir}/libmokoui.so ${libdir}/libmokoui.*a ${includedir}/${PN}/libmokoui" +FILES_libmokoui-dbg = "${libdir}/.debug/libmokoui.so.*" + diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc index 14aec8d351..4066f63737 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "MP3 file plugin for opie-mediaplayer11 using libmad" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1 libmad" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core libmad" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "madplugin" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb index 8c8ea5f9fb..19b507a2bc 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb index c30822ab46..9edc355d68 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc index a3631755e7..16cc11e4e9 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "MOD/XM/S3M/IT plugin using libmodplug" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "modplugin" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb index d5702318c9..5c49fb824f 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb index 4cf1ac926d..427793481e 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc index b5949be74d..f55d0eb3fd 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Ogg file plugin using tremor" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1 tremor" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core tremor" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "tremorplugin" diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb index e49bc44f41..0407a8ab16 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb index f1a3d8a92e..459f59debe 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc index c8d81c1ef4..858f8b3040 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "WAV file plugin" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "wavplugin" diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb index d5702318c9..5c49fb824f 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb index 4cf1ac926d..427793481e 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " |