summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb9
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch18
3 files changed, 25 insertions, 4 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
index dfabbd56cc..47667d0eed 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
@@ -1,12 +1,15 @@
1require clutter-gtk.inc 1require clutter-gtk.inc
2 2
3PV = "0.90.0+git${SRCPV}" 3PV = "0.90.0+git${SRCPV}"
4PR = "r1" 4PR = "r2"
5 5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master" 6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \
7 file://disable_deprecated.patch"
8
9LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7 10
8S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
9 12
10DEPENDS += "clutter-1.0" 13DEPENDS += "gtk+ clutter-1.0"
11 14
12EXTRA_OECONF += "--disable-introspection" 15EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc
index 89ae3e53ca..25b5200ca2 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk.inc
@@ -1,6 +1,6 @@
1DESCRIPTION = "Clutter GTK+" 1DESCRIPTION = "Clutter GTK+"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPLv2"
4 4
5DEPENDS = "gtk+" 5DEPENDS = "gtk+"
6 6
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
new file mode 100644
index 0000000000..fbfaceeefd
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
@@ -0,0 +1,18 @@
1Enable GTK_WIDGET macros
2
3This patch enables the macros that clutter-gtk is still using
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: git/clutter-gtk/Makefile.am
8===================================================================
9--- git.orig/clutter-gtk/Makefile.am 2010-11-16 11:04:29.000000000 -0800
10+++ git/clutter-gtk/Makefile.am 2010-11-16 11:06:16.278993999 -0800
11@@ -16,7 +16,6 @@
12 -DG_DISABLE_DEPRECATED \
13 -DGDK_PIXBUF_DISABLE_DEPRECATED \
14 -DGDK_DISABLE_DEPRECATED \
15- -DGTK_DISABLE_DEPRECATED \
16 -DCLUTTER_DISABLE_DEPRECATED \
17 $(CLUTTER_GTK_DEBUG_CFLAGS) \
18 $(NULL)