From 095581d3b888ba702ba0b1b7e9e3ef8fe69dc164 Mon Sep 17 00:00:00 2001 From: Tomas Frydrych Date: Mon, 20 May 2013 16:05:23 +0100 Subject: clutter-gtk: Replace with 1.4.2 version Signed-off-by: Tomas Frydrych Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 ++++++++++++ .../clutter/clutter-gtk-1.0_1.4.2.bb | 6 ++++++ .../clutter/clutter-gtk-1.8_0.11.4.bb | 11 ----------- meta/recipes-graphics/clutter/clutter-gtk.inc | 14 -------------- .../clutter/clutter-gtk/disable_deprecated.patch | 21 --------------------- .../clutter/clutter-gtk/enable_tests.patch | 18 ------------------ 6 files changed, 18 insertions(+), 64 deletions(-) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch (limited to 'meta/recipes-graphics/clutter') diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 0000000000..3717f48cba --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "ClutterGtk" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2+" + +inherit clutter + +DEPENDS = "clutter-1.0 gtk+3" +PACKAGES =+ "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build" + +EXTRA_OECONF += "--disable-introspection" + diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb new file mode 100644 index 0000000000..64eb70c8ca --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6" +SRC_URI[archive.sha256sum] = "dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb deleted file mode 100644 index 0885ce15c8..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require recipes-graphics/clutter/clutter-gtk.inc - -SRC_URI = "http://source.clutter-project.org/sources/clutter-gtk/0.11/clutter-gtk-${PV}.tar.bz2" -SRC_URI[md5sum] = "8b88cfcb0358ecfe3e9228efd55f7ebc" -SRC_URI[sha256sum] = "58d5b027c4589ff442d820f624d7991e25cbeaab795b05f2df2e4c7bc1af2cf6" - -DEPENDS += "clutter-1.8" - -inherit gettext - -S = "${WORKDIR}/clutter-gtk-${PV}" \ No newline at end of file diff --git a/meta/recipes-graphics/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc deleted file mode 100644 index e8d9e10349..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk.inc +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Clutter GTK+" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -DEPENDS = "gtk+" - -FILESPATH = "${FILE_DIRNAME}/clutter-gtk" - -PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${bindir}/*" - -inherit autotools pkgconfig gtk-doc - diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch deleted file mode 100644 index f44755b3a6..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable GTK_WIDGET macros - -This patch enables the macros that clutter-gtk is still using - -Signed-off-by: Saul Wold - -Upstream-Status: Inappropriate [configuration] - -Index: git/clutter-gtk/Makefile.am -=================================================================== ---- git.orig/clutter-gtk/Makefile.am 2011-05-04 14:07:20.000000000 -0700 -+++ git/clutter-gtk/Makefile.am 2011-05-04 14:25:34.013984328 -0700 -@@ -8,8 +8,6 @@ - -DCLUTTER_GTK_COMPILATION \ - -DG_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ - -DCLUTTER_DISABLE_DEPRECATED - - AM_CPPFLAGS = \ diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch deleted file mode 100644 index bedf80e196..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -Install the test binary needed for core-image-clutter - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [configuration] - -Index: git/examples/Makefile.am -=================================================================== ---- git.orig/examples/Makefile.am 2011-05-04 14:07:20.000000000 -0700 -+++ git/examples/Makefile.am 2011-05-04 14:38:29.785984519 -0700 -@@ -1,6 +1,6 @@ - NULL = - --noinst_PROGRAMS = \ -+bin_PROGRAMS = \ - gtk-clutter-events \ - gtk-clutter-multistage \ - gtk-clutter-test \ -- cgit 1.2.3-korg