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>
 
 Upstream-Status: Inappropriate [configuration]
 
+Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded,
+commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6
+
+Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
+
 Index: git/examples/Makefile.am
 ===================================================================
 --- git.orig/examples/Makefile.am       2011-01-31 10:14:23.000000000 +0800
@@ -11,8 +16,8 @@ Index: git/examples/Makefile.am
 @@ -1,6 +1,6 @@
  NULL = #
  
--noinst_PROGRAMS = video-player video-sink
-+bin_PROGRAMS = video-player video-sink
+-noinst_PROGRAMS = video-player video-sink video-sink-navigation
++bin_PROGRAMS = video-player video-sink video-sink-navigation
  
  INCLUDES = -I$(top_srcdir) \
            $(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 @@
-Install example binary needed for core-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/examples/Makefile.am
-===================================================================
---- git.orig/examples/Makefile.am       2011-05-04 14:07:21.000000000 -0700
-+++ git/examples/Makefile.am    2011-05-04 14:24:38.625984314 -0700
-@@ -1,6 +1,6 @@
- NULL = #
- 
--noinst_PROGRAMS = video-player video-sink audio-player
-+bin_PROGRAMS = video-player video-sink audio-player
- 
- INCLUDES = -I$(top_srcdir) \
-           $(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 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Install example binary needed for poky-image-clutter
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-Index: clutter-gst-1.3.8/examples/Makefile.am
-===================================================================
---- clutter-gst-1.3.8.orig/examples/Makefile.am
-+++ clutter-gst-1.3.8/examples/Makefile.am
-@@ -1,6 +1,6 @@
- NULL = #
- 
--noinst_PROGRAMS = video-player video-sink video-sink-navigation
-+bin_PROGRAMS = video-player video-sink video-sink-navigation
- 
- INCLUDES = -I$(top_srcdir) \
-           $(MAINTAINER_CFLAGS) \