clutter-gtk-1.0: Fix build issues for world build

Added a patch to enable GTK_WIDGET macros properly
Added LIC_FILES_CHKSUM
Fixed up LICENSE Metadata

Signed-off-by: Saul Wold <sgw@linux.intel.com>

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 dfabbd5..47667d0 100644 (file)
--- 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 @@
 require clutter-gtk.inc
 
 PV = "0.90.0+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master"
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \
+           file://disable_deprecated.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += "clutter-1.0"
+DEPENDS += "gtk+ clutter-1.0"
 
 EXTRA_OECONF += "--disable-introspection"

diff --git a/meta/recipes-graphics/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc
index 89ae3e5..25b5200 100644 (file)
--- a/meta/recipes-graphics/clutter/clutter-gtk.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Clutter GTK+"
 HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
+LICENSE = "LGPLv2"
 
 DEPENDS = "gtk+"
 

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 (file)
index 0000000..fbfacee
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
@@ -0,0 +1,18 @@
+Enable GTK_WIDGET macros
+
+This patch enables the macros that clutter-gtk is still using
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: git/clutter-gtk/Makefile.am
+===================================================================
+--- git.orig/clutter-gtk/Makefile.am   2010-11-16 11:04:29.000000000 -0800
++++ git/clutter-gtk/Makefile.am        2010-11-16 11:06:16.278993999 -0800
+@@ -16,7 +16,6 @@
+       -DG_DISABLE_DEPRECATED          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       -DGDK_DISABLE_DEPRECATED        \
+-      -DGTK_DISABLE_DEPRECATED        \
+       -DCLUTTER_DISABLE_DEPRECATED    \
+       $(CLUTTER_GTK_DEBUG_CFLAGS)     \
+       $(NULL)