diff options
author | Tomas Frydrych <tomas@sleepfive.com> | 2013-05-20 16:05:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-21 09:30:16 +0100 |
commit | e77a014df21f301a8a0b746a4a1f712595ebcbaf (patch) | |
tree | 29be867397e58436ccde337574c1a341b2f35163 /meta/recipes-graphics/clutter/clutter-gst | |
parent | bcb0616551abd1e05d6ee88a22d6c0dfbb6c5fda (diff) | |
download | poky-e77a014df21f301a8a0b746a4a1f712595ebcbaf.tar.gz |
clutter-gst: Replace with 1.6.0 version
(From OE-Core rev: 4476e789ac41f44ad74385d85a16e505d96bc100)
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-gst')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch (renamed from meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch) | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch | 18 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch | 17 |
3 files changed, 7 insertions, 37 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch index 6175a521d1..b3aec392e6 100644 --- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch +++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch | |||
@@ -4,6 +4,11 @@ Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | |||
4 | 4 | ||
5 | Upstream-Status: Inappropriate [configuration] | 5 | Upstream-Status: Inappropriate [configuration] |
6 | 6 | ||
7 | Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, | ||
8 | commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 | ||
9 | |||
10 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
11 | |||
7 | Index: git/examples/Makefile.am | 12 | Index: git/examples/Makefile.am |
8 | =================================================================== | 13 | =================================================================== |
9 | --- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 | 14 | --- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 |
@@ -11,8 +16,8 @@ Index: git/examples/Makefile.am | |||
11 | @@ -1,6 +1,6 @@ | 16 | @@ -1,6 +1,6 @@ |
12 | NULL = # | 17 | NULL = # |
13 | 18 | ||
14 | -noinst_PROGRAMS = video-player video-sink | 19 | -noinst_PROGRAMS = video-player video-sink video-sink-navigation |
15 | +bin_PROGRAMS = video-player video-sink | 20 | +bin_PROGRAMS = video-player video-sink video-sink-navigation |
16 | 21 | ||
17 | INCLUDES = -I$(top_srcdir) \ | 22 | INCLUDES = -I$(top_srcdir) \ |
18 | $(MAINTAINER_CFLAGS) \ | 23 | $(MAINTAINER_CFLAGS) \ |
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch deleted file mode 100644 index 3fc1378a7d..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Install example binary needed for core-image-clutter | ||
2 | |||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Index: git/examples/Makefile.am | ||
8 | =================================================================== | ||
9 | --- git.orig/examples/Makefile.am 2011-05-04 14:07:21.000000000 -0700 | ||
10 | +++ git/examples/Makefile.am 2011-05-04 14:24:38.625984314 -0700 | ||
11 | @@ -1,6 +1,6 @@ | ||
12 | NULL = # | ||
13 | |||
14 | -noinst_PROGRAMS = video-player video-sink audio-player | ||
15 | +bin_PROGRAMS = video-player video-sink audio-player | ||
16 | |||
17 | INCLUDES = -I$(top_srcdir) \ | ||
18 | $(MAINTAINER_CFLAGS) \ | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch deleted file mode 100644 index de1dcc2add..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Install example binary needed for poky-image-clutter | ||
4 | |||
5 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
6 | Index: clutter-gst-1.3.8/examples/Makefile.am | ||
7 | =================================================================== | ||
8 | --- clutter-gst-1.3.8.orig/examples/Makefile.am | ||
9 | +++ clutter-gst-1.3.8/examples/Makefile.am | ||
10 | @@ -1,6 +1,6 @@ | ||
11 | NULL = # | ||
12 | |||
13 | -noinst_PROGRAMS = video-player video-sink video-sink-navigation | ||
14 | +bin_PROGRAMS = video-player video-sink video-sink-navigation | ||
15 | |||
16 | INCLUDES = -I$(top_srcdir) \ | ||
17 | $(MAINTAINER_CFLAGS) \ | ||