summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
-rw-r--r--meta/packages/clutter/clutter-gst-0.10_git.bb14
-rw-r--r--meta/packages/clutter/clutter-gst-1.0_git.bb14
-rw-r--r--meta/packages/clutter/clutter-gst_git.bb15
-rw-r--r--meta/packages/clutter/clutter-gtk-0.10_git.bb12
-rw-r--r--meta/packages/clutter/clutter-gtk-1.0_git.bb (renamed from meta/packages/clutter/clutter-gtk_git.bb)4
6 files changed, 46 insertions, 19 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index a58637ef1d..584102fd81 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -28,11 +28,13 @@ SRCREV_pn-clutter-cairo-0.8 ?= "e27e507dedddec3f279a2902ecee0da1011c78eb"
28SRCREV_pn-clutter-cairo ?= "7b45e0de2d4b9f1cd47486e5de71a1a26e8fdf27" 28SRCREV_pn-clutter-cairo ?= "7b45e0de2d4b9f1cd47486e5de71a1a26e8fdf27"
29SRCREV_pn-clutter-gst-0.6 ?= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd" 29SRCREV_pn-clutter-gst-0.6 ?= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd"
30SRCREV_pn-clutter-gst-0.8 ?= "7a60a435fb0930d911e26158928ab53bda090f3e" 30SRCREV_pn-clutter-gst-0.8 ?= "7a60a435fb0930d911e26158928ab53bda090f3e"
31SRCREV_pn-clutter-gst ?= "db9bcf9d6f3a7d0f34747bed0f3ab28d7eb8f6ab" 31SRCREV_pn-clutter-gst-0.10 ?= "78e853ac3269c13b8d798ebca1c4748d066a966e"
32SRCREV_pn-clutter-gst-1.0 ?= "d48c6fc67b48304f90e51b520631c1ecc10410af"
32SRCREV_pn-clutter-helix ?= "b4514a7bae2a059f4e63de64245238a246ed10bd" 33SRCREV_pn-clutter-helix ?= "b4514a7bae2a059f4e63de64245238a246ed10bd"
33SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a" 34SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
34SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" 35SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
35SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36" 36SRCREV_pn-clutter-gtk-0.10 ?= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
37SRCREV_pn-clutter-gtk-1.0 ?= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8"
36SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751" 38SRCREV_pn-clutter-mozembed ?= "738d017beb5579b2ff6e4d992d4889b61c974751"
37SRCREV_pn-connman ?= "36e877dece72577a3ae6197eafd505d0e6e0c1d2" 39SRCREV_pn-connman ?= "36e877dece72577a3ae6197eafd505d0e6e0c1d2"
38SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4" 40SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
diff --git a/meta/packages/clutter/clutter-gst-0.10_git.bb b/meta/packages/clutter/clutter-gst-0.10_git.bb
new file mode 100644
index 0000000000..a0f874db25
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.10_git.bb
@@ -0,0 +1,14 @@
1require clutter-gst.inc
2
3PV = "0.10.0+git${SRCPV}"
4
5DEPENDS += "clutter-1.0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10"
8
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 # Disable DOLT
13 sed -i -e 's/^DOLT//' ${S}/configure.ac
14}
diff --git a/meta/packages/clutter/clutter-gst-1.0_git.bb b/meta/packages/clutter/clutter-gst-1.0_git.bb
new file mode 100644
index 0000000000..5580596f09
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-1.0_git.bb
@@ -0,0 +1,14 @@
1require clutter-gst.inc
2
3PV = "0.11.0+git${SRCPV}"
4
5DEPENDS += "clutter-1.0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
8
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 # Disable DOLT
13 sed -i -e 's/^DOLT//' ${S}/configure.ac
14}
diff --git a/meta/packages/clutter/clutter-gst_git.bb b/meta/packages/clutter/clutter-gst_git.bb
deleted file mode 100644
index 4a72333595..0000000000
--- a/meta/packages/clutter/clutter-gst_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.9.0+git${SRCPV}"
4PR = "r3"
5
6SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \
7 file://autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch;patch=1;rev=9db4a61a25677764bb927369c5c68ada958fb65c \
8 file://autofoo.patch;patch=1;notrev=9db4a61a25677764bb927369c5c68ada958fb65c"
9
10S = "${WORKDIR}/git"
11
12do_configure_prepend () {
13 # Disable DOLT
14 sed -i -e 's/^DOLT//' ${S}/configure.ac
15}
diff --git a/meta/packages/clutter/clutter-gtk-0.10_git.bb b/meta/packages/clutter/clutter-gtk-0.10_git.bb
new file mode 100644
index 0000000000..d0613277a7
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.10_git.bb
@@ -0,0 +1,12 @@
1require clutter-gtk.inc
2
3PV = "0.10.3+git${SRCPV}"
4PR = "r1"
5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10"
7
8S = "${WORKDIR}/git"
9
10DEPENDS += "clutter-1.0"
11
12EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk_git.bb b/meta/packages/clutter/clutter-gtk-1.0_git.bb
index 9ea4e96f0a..dfabbd56cc 100644
--- a/meta/packages/clutter/clutter-gtk_git.bb
+++ b/meta/packages/clutter/clutter-gtk-1.0_git.bb
@@ -1,9 +1,9 @@
1require clutter-gtk.inc 1require clutter-gtk.inc
2 2
3PV = "0.9.0+git${SRCPV}" 3PV = "0.90.0+git${SRCPV}"
4PR = "r1" 4PR = "r1"
5 5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" 6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master"
7 7
8S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
9 9