From 823299e5a7a30377d3e5f6b60883c4eedb656965 Mon Sep 17 00:00:00 2001 From: Petter Mabäcker Date: Thu, 17 Oct 2013 16:58:49 +0200 Subject: clutter: remove usage of FILESPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. However in clutter the default paths solves the problem if we put all patches in ${BP} directory instead. (From OE-Core rev: cc41cb61707da1b4ae029de70c922802067166c2) Signed-off-by: Petter Mabäcker Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/clutter.bbclass | 1 - .../clutter/clutter-1.0-1.14.4/enable_tests.patch | 36 ++++++++++++++ .../clutter-1.0-1.14.4/fix-wayland-deps.patch | 57 ++++++++++++++++++++++ .../clutter/clutter-1.14/enable_tests.patch | 36 -------------- .../clutter/clutter-1.14/fix-wayland-deps.patch | 57 ---------------------- .../clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch | 48 ++++++++++++++++++ .../clutter-gst-1.0-1.6.0/enable-tests.patch | 23 +++++++++ .../clutter/clutter-gst-1.6/cogl-1.14.patch | 48 ------------------ .../clutter/clutter-gst/enable-tests.patch | 23 --------- .../fix-build-dir.patch | 46 +++++++++++++++++ .../fix-test-includes.patch | 20 ++++++++ .../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 46 ----------------- .../recipes-graphics/mx/mx/fix-test-includes.patch | 20 -------- 13 files changed, 230 insertions(+), 231 deletions(-) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch create mode 100644 meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch create mode 100644 meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch create mode 100644 meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch delete mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch delete mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch (limited to 'meta') diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass index 66a49bc175..167407dfdc 100644 --- a/meta/classes/clutter.bbclass +++ b/meta/classes/clutter.bbclass @@ -11,7 +11,6 @@ def get_real_name(n): VERMINOR = "${@get_minor_dir("${PV}")}" REALNAME = "${@get_real_name("${BPN}")}" -FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}" CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive" diff --git a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch new file mode 100644 index 0000000000..f97d598090 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch @@ -0,0 +1,36 @@ +Make tests installable + +The test applications are useful for image testing. + +Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Tomas Frydrych + +Index: git/tests/interactive/Makefile.am +=================================================================== +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000 ++++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000 +@@ -88,7 +88,7 @@ + + common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la + +-noinst_PROGRAMS = test-interactive ++bin_PROGRAMS = test-interactive + + test_interactive_SOURCES = test-main.c $(UNIT_TESTS) + test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) +Index: git/tests/interactive/test-actors.c +=================================================================== +--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000 ++++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000 +@@ -178,7 +178,7 @@ + oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); + oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); + +- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); ++ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL); + real_hand = clutter_texture_new_from_file (file, &error); + if (real_hand == NULL) + g_error ("image load failed: %s", error->message); diff --git a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch new file mode 100644 index 0000000000..f5af73c9fc --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch @@ -0,0 +1,57 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Thu, 27 Jun 2013 16:42:40 +0100 +Subject: [PATCH] build: Enable Cogl support with Wayland + +The Wayland backend is based on Cogl, so we need to turn on the +SUPPORT_COGL flag to avoid breaking the build; this always went +unnoticed because we usually build the Wayland client backend +with the X11 backend. + +Reported-by: Ross Burton +(cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27) + +Signed-off-by: Emmanuele Bassi +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f5afe12..355c95b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -310,6 +310,7 @@ AS_IF([test "x$enable_wayland" = "xyes"], + experimental_backend="yes" + + SUPPORT_WAYLAND=1 ++ SUPPORT_COGL=1 + + PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0], + [ +@@ -337,7 +338,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"], + [ + PKG_CHECK_EXISTS([wayland-server], + [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], []) ++ + SUPPORT_WAYLAND_COMPOSITOR=1 ++ SUPPORT_COGL=1 ++ + CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES + #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1" + AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support]) +@@ -359,8 +363,8 @@ AS_IF([test "x$enable_cex100" = "xyes"], + + experimental_backend="yes" + +- SUPPORT_COGL=1 + SUPPORT_CEX100=1 ++ SUPPORT_COGL=1 + + have_gdl=no + AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes]) +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch deleted file mode 100644 index f97d598090..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -Make tests installable - -The test applications are useful for image testing. - -Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, -commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Tomas Frydrych - -Index: git/tests/interactive/Makefile.am -=================================================================== ---- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000 -+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000 -@@ -88,7 +88,7 @@ - - common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la - --noinst_PROGRAMS = test-interactive -+bin_PROGRAMS = test-interactive - - test_interactive_SOURCES = test-main.c $(UNIT_TESTS) - test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) -Index: git/tests/interactive/test-actors.c -=================================================================== ---- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000 -+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000 -@@ -178,7 +178,7 @@ - oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0); - oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5); - -- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); -+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL); - real_hand = clutter_texture_new_from_file (file, &error); - if (real_hand == NULL) - g_error ("image load failed: %s", error->message); diff --git a/meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch b/meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch deleted file mode 100644 index f5af73c9fc..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Thu, 27 Jun 2013 16:42:40 +0100 -Subject: [PATCH] build: Enable Cogl support with Wayland - -The Wayland backend is based on Cogl, so we need to turn on the -SUPPORT_COGL flag to avoid breaking the build; this always went -unnoticed because we usually build the Wayland client backend -with the X11 backend. - -Reported-by: Ross Burton -(cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27) - -Signed-off-by: Emmanuele Bassi ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f5afe12..355c95b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -310,6 +310,7 @@ AS_IF([test "x$enable_wayland" = "xyes"], - experimental_backend="yes" - - SUPPORT_WAYLAND=1 -+ SUPPORT_COGL=1 - - PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0], - [ -@@ -337,7 +338,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"], - [ - PKG_CHECK_EXISTS([wayland-server], - [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], []) -+ - SUPPORT_WAYLAND_COMPOSITOR=1 -+ SUPPORT_COGL=1 -+ - CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES - #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1" - AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support]) -@@ -359,8 +363,8 @@ AS_IF([test "x$enable_cex100" = "xyes"], - - experimental_backend="yes" - -- SUPPORT_COGL=1 - SUPPORT_CEX100=1 -+ SUPPORT_COGL=1 - - have_gdl=no - AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes]) --- -1.7.10.4 - diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch new file mode 100644 index 0000000000..d009e44c34 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch @@ -0,0 +1,48 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. + +Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 +Signed-off-by: Tomas Frydrych +--- + clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c ++++ b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include "config.h" + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include ++ ++#ifdef COGL_HAS_GLES1 ++#include ++#include ++#elif COGL_HAS_GLES2 ++#include ++#include ++#elif COGL_HAS_GL ++#include ++#else ++#error Unknown cogl configuration ++#endif ++ + #include "clutter-gst-video-sink.h" + #include "clutter-gst-util.h" + #include "clutter-gst-private.h" +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch new file mode 100644 index 0000000000..b3aec392e6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch @@ -0,0 +1,23 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin + +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 + +Index: git/examples/Makefile.am +=================================================================== +--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 ++++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800 +@@ -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) \ diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch deleted file mode 100644 index d009e44c34..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 -From: Tomas Frydrych -Date: Thu, 11 Oct 2012 08:53:03 +0100 -Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against - cogl-1.14 - -Cogl 1.14 exposes various GL types through the public API but it does not -pull in the GL type definitions through its public headers; specifically -compilation will fail due to undefined GL_TEXTURE_2D. So include the headers -the hard way. - -Upstream-Status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 -Signed-off-by: Tomas Frydrych ---- - clutter-gst/clutter-gst-video-sink.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c -index 9b4b53c..f092581 100644 ---- a/clutter-gst/clutter-gst-video-sink.c -+++ b/clutter-gst/clutter-gst-video-sink.c -@@ -42,6 +42,23 @@ - #include "config.h" - #endif - -+/* -+ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. -+ */ -+#include -+ -+#ifdef COGL_HAS_GLES1 -+#include -+#include -+#elif COGL_HAS_GLES2 -+#include -+#include -+#elif COGL_HAS_GL -+#include -+#else -+#error Unknown cogl configuration -+#endif -+ - #include "clutter-gst-video-sink.h" - #include "clutter-gst-util.h" - #include "clutter-gst-private.h" --- -1.7.10.4 - diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch deleted file mode 100644 index b3aec392e6..0000000000 --- a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -Install example binary needed for core-image-clutter - -Signed-off-by: Zhai Edwin - -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 - -Index: git/examples/Makefile.am -=================================================================== ---- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 -+++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800 -@@ -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) \ diff --git a/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch new file mode 100644 index 0000000000..3c8a832021 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch @@ -0,0 +1,46 @@ +Fix build for S != B + +This patch is specific to version 1.4.x +Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 +Signed-off-by: Tomas Frydrych +-- +Index: git/docs/reference/libmx-gtk/Makefile.am +=================================================================== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 ++++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=================================================================== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 ++++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch new file mode 100644 index 0000000000..82c93dd604 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch @@ -0,0 +1,20 @@ +Fix missing include directory when building tests + +This patch is currently required for all versions of mx +Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 +Signed-off-by: Tomas Frydrych +-- +Index: git/tests/Makefile.am +=================================================================== +--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 ++++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 +@@ -10,7 +10,8 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_builddir) ++ -I$(top_builddir)\ ++ -I$(top_builddir)/mx + + noinst_PROGRAMS = \ + test-deform-texture \ diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch deleted file mode 100644 index 3c8a832021..0000000000 --- a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix build for S != B - -This patch is specific to version 1.4.x -Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 -Signed-off-by: Tomas Frydrych --- -Index: git/docs/reference/libmx-gtk/Makefile.am -=================================================================== ---- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 -+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 -@@ -1,3 +1,6 @@ -+EXTRA_DIST= -+CLEANFILES= -+ - ## Process this file with automake to produce Makefile.in - - # We require automake 1.6 at least. -@@ -77,7 +80,7 @@ - GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/gtk-doc.make -+include $(top_builddir)/gtk-doc.make - - # Other files to distribute - EXTRA_DIST += version.xml.in -Index: git/docs/reference/libmx/Makefile.am -=================================================================== ---- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 -+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 -@@ -1,3 +1,6 @@ -+EXTRA_DIST= -+CLEANFILES= -+ - ## Process this file with automake to produce Makefile.in - - # We require automake 1.6 at least. -@@ -106,7 +109,7 @@ - GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/gtk-doc.make -+include $(top_builddir)/gtk-doc.make - - # Other files to distribute - EXTRA_DIST += version.xml.in diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch deleted file mode 100644 index 82c93dd604..0000000000 --- a/meta/recipes-graphics/mx/mx/fix-test-includes.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix missing include directory when building tests - -This patch is currently required for all versions of mx -Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 -Signed-off-by: Tomas Frydrych --- -Index: git/tests/Makefile.am -=================================================================== ---- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 -+++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 -@@ -10,7 +10,8 @@ - - INCLUDES = \ - -I$(top_srcdir) \ -- -I$(top_builddir) -+ -I$(top_builddir)\ -+ -I$(top_builddir)/mx - - noinst_PROGRAMS = \ - test-deform-texture \ -- cgit v1.2.3-54-g00ecf