diff options
| author | Saul Wold <sgw@linux.intel.com> | 2010-11-16 10:07:34 -0800 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-11-18 13:30:25 -0800 |
| commit | 0c02e2db99a99aac1137a7976c3bc47bb8557afa (patch) | |
| tree | 7884e159b30abed0d250e98d0614c70f23341b9f | |
| parent | 32f05375659ab6522b9242d0204e26560f7321da (diff) | |
| download | poky-0c02e2db99a99aac1137a7976c3bc47bb8557afa.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb | 9 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch | 18 |
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 @@ | |||
| 1 | require clutter-gtk.inc | 1 | require clutter-gtk.inc |
| 2 | 2 | ||
| 3 | PV = "0.90.0+git${SRCPV}" | 3 | PV = "0.90.0+git${SRCPV}" |
| 4 | PR = "r1" | 4 | PR = "r2" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master" | 6 | SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \ |
| 7 | file://disable_deprecated.patch" | ||
| 8 | |||
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
| 7 | 10 | ||
| 8 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 9 | 12 | ||
| 10 | DEPENDS += "clutter-1.0" | 13 | DEPENDS += "gtk+ clutter-1.0" |
| 11 | 14 | ||
| 12 | EXTRA_OECONF += "--disable-introspection" | 15 | EXTRA_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 @@ | |||
| 1 | DESCRIPTION = "Clutter GTK+" | 1 | DESCRIPTION = "Clutter GTK+" |
| 2 | HOMEPAGE = "http://www.clutter-project.org/" | 2 | HOMEPAGE = "http://www.clutter-project.org/" |
| 3 | LICENSE = "LGPL" | 3 | LICENSE = "LGPLv2" |
| 4 | 4 | ||
| 5 | DEPENDS = "gtk+" | 5 | DEPENDS = "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 @@ | |||
| 1 | Enable GTK_WIDGET macros | ||
| 2 | |||
| 3 | This patch enables the macros that clutter-gtk is still using | ||
| 4 | |||
| 5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 6 | |||
| 7 | Index: 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) | ||
