diff options
Diffstat (limited to 'meta-moblin')
15 files changed, 114 insertions, 56 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc index fd6aa5e56..dae4226b5 100644 --- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc +++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc @@ -1,9 +1,5 @@ -#SRCREV_pn-clutter ?= "d1232509a21a7ce05aa8c85b2c14872ffc4df5cb" -#SRCREV_pn-mesa-dri ?= "f7cbaae13d67c55abe81ac230de37f564365099f" SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" -#SRCREV_pn-xf86-video-intel ?= "74227141923a2f5049592219ab80e8733062a5d9" -#SRCREV_pn-nbtk ?= "7618a55265974904c33e5c20ffb2ae4cc366c950" -#SRCREV_pn-mojito ?= "74482d5759c2a5c0b316f1e2d2029b3f03d3323c" +SRCREV_pn-mojito ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" SRCREV_pn-ashford ?= "${AUTOREV}" SRCREV_pn-anerley ?= "${AUTOREV}" @@ -12,6 +8,7 @@ SRCREV_pn-bisho ?= "${AUTOREV}" SRCREV_pn-bognor-regis ?= "${AUTOREV}" SRCREV_pn-carrick ?= "${AUTOREV}" SRCREV_pn-clutter ?= "${AUTOREV}" +SRCREV_pn-clutter-1.0 ?= "${AUTOREV}" SRCREV_pn-clutter-gtk ?= "${AUTOREV}" SRCREV_pn-clutter-gst ?= "${AUTOREV}" SRCREV_pn-clutter-imcontext ?= "${AUTOREV}" @@ -31,6 +28,12 @@ SRCREV_pn-moblin-menus ?= "${AUTOREV}" SRCREV_pn-moblin-web-browser ?= "${AUTOREV}" SRCREV_pn-moblin-icon-theme ?= "${AUTOREV}" SRCREV_pn-moblin-user-skel ?= "${AUTOREV}" +SRCREV_pn-moblin-panel-applications ?= "${AUTOREV}" +SRCREV_pn-moblin-panel-media ?= "${AUTOREV}" +SRCREV_pn-moblin-panel-myzone ?= "${AUTOREV}" +SRCREV_pn-moblin-panel-pasteboard ?= "${AUTOREV}" +SRCREV_pn-moblin-panel-people ?= "${AUTOREV}" +SRCREV_pn-moblin-panel-status ?= "${AUTOREV}" SRCREV_pn-mojito ?= "${AUTOREV}" SRCREV_pn-mozilla-headless ?= "${AUTOREV}" SRCREV_pn-mozilla-headless-services ?= "${AUTOREV}" diff --git a/meta-moblin/packages/clutter-imcontext/clutter-imcontext/clutter10.patch b/meta-moblin/packages/clutter-imcontext/clutter-imcontext/clutter10.patch deleted file mode 100644 index ec642c44a..000000000 --- a/meta-moblin/packages/clutter-imcontext/clutter-imcontext/clutter10.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-07-31 10:09:38.000000000 +0100 -+++ git/configure.ac 2009-07-31 10:09:56.000000000 +0100 -@@ -33,7 +33,7 @@ - AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) - - PKG_CHECK_MODULES(CLUTTER, glib-2.0 -- clutter-0.9 >= 0.9.3) -+ clutter-1.0 >= 1.0.0) - - AC_SUBST(CLUTTER_CFLAGS) - AC_SUBST(CLUTTER_LIBS) -Index: git/clutter-imcontext/clutter-imcontext.pc.in -=================================================================== ---- git.orig/clutter-imcontext/clutter-imcontext.pc.in 2009-07-31 11:25:27.000000000 +0100 -+++ git/clutter-imcontext/clutter-imcontext.pc.in 2009-07-31 11:25:32.000000000 +0100 -@@ -11,7 +11,7 @@ - - Name: Clutter Input Method Context - Description: IMContext For Clutter --Requires: clutter-0.9 -+Requires: clutter-1.0 - Version: @VERSION@ - Libs: -L${libdir} -lclutter-imcontext-${apiversion} - Cflags: -I${includedir}/clutter-imcontext-${apiversion} diff --git a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb index 6779198fe..74f548b92 100644 --- a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb +++ b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb @@ -1,10 +1,9 @@ -SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ - file://clutter10.patch;patch=1;notrev=69cae7b2b9f863fe1e0d392825508e63b8a107a4" +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" LICENSE = "GPLv2" PV = "0.0+git${SRCPV}" PR = "r3" -DEPENDS = "clutter glib-2.0" +DEPENDS = "clutter-1.0 glib-2.0" S = "${WORKDIR}/git" diff --git a/meta-moblin/packages/hornsey/hornsey_git.bb b/meta-moblin/packages/hornsey/hornsey_git.bb index a43904bfc..0bab9e76b 100644 --- a/meta-moblin/packages/hornsey/hornsey_git.bb +++ b/meta-moblin/packages/hornsey/hornsey_git.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" PV = "0.0+git${SRCPV}" PR = "r1" -DEPENDS = "clutter clutter-gst bickley bognor-regis nbtk startup-notification libunique" +DEPENDS = "clutter-1.0 clutter-gst bickley bognor-regis nbtk startup-notification libunique" S = "${WORKDIR}/git" diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/clutter10.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/clutter10.patch deleted file mode 100644 index 307f3c42d..000000000 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/clutter10.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-07-31 11:35:36.000000000 +0100 -+++ git/configure.ac 2009-07-31 11:36:48.000000000 +0100 -@@ -32,7 +32,7 @@ - [cat "$srcdir/po/Rules-mwbpages" >> po/Makefile]) - ]) - --PKG_CHECK_MODULES(MWB, clutter-0.9 clutter-gtk-0.9 cluttermozembed nbtk-1.0 unique-1.0 >= 1.0.6 gtk+-2.0 libstartup-notification-1.0 >= 0.9) -+PKG_CHECK_MODULES(MWB, clutter-1.0 clutter-gtk-0.10 cluttermozembed nbtk-1.0 unique-1.0 >= 1.0.6 gtk+-2.0 libstartup-notification-1.0 >= 0.9) - - PKG_CHECK_MODULES(MHS, mhs-1.0) - diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb index c2fc9f686..5e42fc5a5 100644 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb @@ -1,13 +1,12 @@ DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ file://xpidl-b55d523da7681febfabf9fc40dcd6fcee982b079.patch;patch=1;rev=b55d523da7681febfabf9fc40dcd6fcee982b079 \ - file://xpidl.patch;patch=1;notrev=b55d523da7681febfabf9fc40dcd6fcee982b079 \ - file://clutter10.patch;patch=1;notrev=5560cb14d6b83d0cd6750e33cad48b3b50f93207" + file://xpidl.patch;patch=1;notrev=b55d523da7681febfabf9fc40dcd6fcee982b079" LICENSE = "LGPLv2.1" PV = "0.0+git${SRCPV}" PR = "r5" -DEPENDS = "clutter clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless" +DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless" S = "${WORKDIR}/git" diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb new file mode 100644 index 000000000..41761688e --- /dev/null +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Moblin Applications Panel Plugin" +SECTION = "x11/wm" +LICENSE = "GPLv2" +DEPENDS = "nbtk mutter-moblin gnome-menus mojito libjana anerley clutter-mozembed bickley" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +S = "${WORKDIR}/git" + +inherit autotools_stage + diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb new file mode 100644 index 000000000..41761688e --- /dev/null +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Moblin Applications Panel Plugin" +SECTION = "x11/wm" +LICENSE = "GPLv2" +DEPENDS = "nbtk mutter-moblin gnome-menus mojito libjana anerley clutter-mozembed bickley" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +S = "${WORKDIR}/git" + +inherit autotools_stage + diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb new file mode 100644 index 000000000..41761688e --- /dev/null +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Moblin Applications Panel Plugin" +SECTION = "x11/wm" +LICENSE = "GPLv2" +DEPENDS = "nbtk mutter-moblin gnome-menus mojito libjana anerley clutter-mozembed bickley" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +S = "${WORKDIR}/git" + +inherit autotools_stage + diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb new file mode 100644 index 000000000..41761688e --- /dev/null +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Moblin Applications Panel Plugin" +SECTION = "x11/wm" +LICENSE = "GPLv2" +DEPENDS = "nbtk mutter-moblin gnome-menus mojito libjana anerley clutter-mozembed bickley" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +S = "${WORKDIR}/git" + +inherit autotools_stage + diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb new file mode 100644 index 000000000..41761688e --- /dev/null +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Moblin Applications Panel Plugin" +SECTION = "x11/wm" +LICENSE = "GPLv2" +DEPENDS = "nbtk mutter-moblin gnome-menus mojito libjana anerley clutter-mozembed bickley" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +S = "${WORKDIR}/git" + +inherit autotools_stage + diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb new file mode 100644 index 000000000..41761688e --- /dev/null +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Moblin Applications Panel Plugin" +SECTION = "x11/wm" +LICENSE = "GPLv2" +DEPENDS = "nbtk mutter-moblin gnome-menus mojito libjana anerley clutter-mozembed bickley" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git" + +FILES_${PN} += "${datadir}/dbus-1/services" + +S = "${WORKDIR}/git" + +inherit autotools_stage + diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb index 394117c86..78f0ce3ab 100644 --- a/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb +++ b/meta-moblin/packages/mutter-moblin/mutter-moblin_git.bb @@ -1,9 +1,9 @@ DESCRIPTION = "A Moblin specific plugin for the Mutter composite window manager" SECTION = "x11/wm" -LICENSE = "GPLv3" -DEPENDS = "nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley" +LICENSE = "GPLv2" +DEPENDS = "clutter-1.0 nbtk mutter gnome-menus mojito libjana anerley clutter-mozembed bickley" PV = "2.25.2+git${SRCPV}" -PR = "r8" +PR = "r9" SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ file://startup-notify.patch;patch=1 \ diff --git a/meta-moblin/packages/nbtk/nbtk_git.bb b/meta-moblin/packages/nbtk/nbtk_git.bb index 7d8095a67..aede00c07 100644 --- a/meta-moblin/packages/nbtk/nbtk_git.bb +++ b/meta-moblin/packages/nbtk/nbtk_git.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" PV = "0.0+git${SRCPV}" PR = "r0" -DEPENDS = "clutter libccss clutter-imcontext" +DEPENDS = "clutter-1.0 libccss clutter-imcontext" S = "${WORKDIR}/git" diff --git a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb index 0795ddbb0..e650bf919 100644 --- a/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb +++ b/meta-moblin/packages/tasks/task-moblin-x11-netbook.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "Netbook GUI Tasks for Moblin" -PR = "r9" +PR = "r10" PACKAGES = "\ task-moblin-x11-netbook \ @@ -26,6 +26,12 @@ RDEPENDS_task-moblin-x11-netbook = "\ librest \ nbtk \ mutter-moblin \ + moblin-panel-applications \ + moblin-panel-media \ + moblin-panel-myzone \ + moblin-panel-pasteboard \ + moblin-panel-people \ + moblin-panel-status \ moblin-gtk-engine \ moblin-menus \ moblin-user-skel \ |