summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorTomas Frydrych <tomas@sleepfive.com>2013-05-20 16:05:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-21 09:30:16 +0100
commit59cea9cdf511f49931d6fd8fa213525cf8d675cf (patch)
tree08fe2e14ed9ea9d4087a1fa6f8603394114bbf91 /meta/recipes-graphics
parente77a014df21f301a8a0b746a4a1f712595ebcbaf (diff)
downloadpoky-59cea9cdf511f49931d6fd8fa213525cf8d675cf.tar.gz
clutter-gtk: Replace with 1.4.2 version
(From OE-Core rev: 095581d3b888ba702ba0b1b7e9e3ef8fe69dc164) Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0.inc12
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb6
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb11
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk.inc14
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch21
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch18
6 files changed, 18 insertions, 64 deletions
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 @@
1DESCRIPTION = "ClutterGtk"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+"
4
5inherit clutter
6
7DEPENDS = "clutter-1.0 gtk+3"
8PACKAGES =+ "${PN}-examples"
9AUTOTOOLS_AUXDIR = "${S}/build"
10
11EXTRA_OECONF += "--disable-introspection"
12
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 @@
1require clutter-gtk-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
4
5SRC_URI[archive.md5sum] = "842601b584daf4447a46799a4ba88df6"
6SRC_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 @@
1require recipes-graphics/clutter/clutter-gtk.inc
2
3SRC_URI = "http://source.clutter-project.org/sources/clutter-gtk/0.11/clutter-gtk-${PV}.tar.bz2"
4SRC_URI[md5sum] = "8b88cfcb0358ecfe3e9228efd55f7ebc"
5SRC_URI[sha256sum] = "58d5b027c4589ff442d820f624d7991e25cbeaab795b05f2df2e4c7bc1af2cf6"
6
7DEPENDS += "clutter-1.8"
8
9inherit gettext
10
11S = "${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 @@
1DESCRIPTION = "Clutter GTK+"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
5
6DEPENDS = "gtk+"
7
8FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
9
10PACKAGES =+ "${PN}-examples"
11FILES_${PN}-examples = "${bindir}/*"
12
13inherit autotools pkgconfig gtk-doc
14
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 @@
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
7Upstream-Status: Inappropriate [configuration]
8
9Index: git/clutter-gtk/Makefile.am
10===================================================================
11--- git.orig/clutter-gtk/Makefile.am 2011-05-04 14:07:20.000000000 -0700
12+++ git/clutter-gtk/Makefile.am 2011-05-04 14:25:34.013984328 -0700
13@@ -8,8 +8,6 @@
14 -DCLUTTER_GTK_COMPILATION \
15 -DG_DISABLE_DEPRECATED \
16 -DGDK_PIXBUF_DISABLE_DEPRECATED \
17- -DGDK_DISABLE_DEPRECATED \
18- -DGTK_DISABLE_DEPRECATED \
19 -DCLUTTER_DISABLE_DEPRECATED
20
21 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 @@
1Install the test binary needed for core-image-clutter
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Upstream-Status: Inappropriate [configuration]
6
7Index: git/examples/Makefile.am
8===================================================================
9--- git.orig/examples/Makefile.am 2011-05-04 14:07:20.000000000 -0700
10+++ git/examples/Makefile.am 2011-05-04 14:38:29.785984519 -0700
11@@ -1,6 +1,6 @@
12 NULL =
13
14-noinst_PROGRAMS = \
15+bin_PROGRAMS = \
16 gtk-clutter-events \
17 gtk-clutter-multistage \
18 gtk-clutter-test \