summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-22 15:16:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:58:45 +0100
commit860dfafeed8bc387defba9ec7fa0622b3a82ec31 (patch)
tree697c78ab8176a6471c89bc4d960cac4d8a63a5b3 /meta
parentc4ee663afbac01df29a655ed58ebfdb3add23129 (diff)
downloadpoky-860dfafeed8bc387defba9ec7fa0622b3a82ec31.tar.gz
mx: move to autotools instead of autotools-brokensep
Now that MX inherits gtk-doc we can also remove fix-build-dir.patch. (From OE-Core rev: e8d4e80e5cc98e2e0470c85f3c08574d30d466c1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch46
-rw-r--r--meta/recipes-graphics/mx/mx-1.0_1.4.7.bb1
-rw-r--r--meta/recipes-graphics/mx/mx.inc2
3 files changed, 1 insertions, 48 deletions
diff --git a/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch
deleted file mode 100644
index 3c8a832021..0000000000
--- a/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Fix build for S != B
2
3This patch is specific to version 1.4.x
4Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81
5Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
6--
7Index: git/docs/reference/libmx-gtk/Makefile.am
8===================================================================
9--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100
10+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100
11@@ -1,3 +1,6 @@
12+EXTRA_DIST=
13+CLEANFILES=
14+
15 ## Process this file with automake to produce Makefile.in
16
17 # We require automake 1.6 at least.
18@@ -77,7 +80,7 @@
19 GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la
20
21 # This includes the standard gtk-doc make rules, copied by gtkdocize.
22-include $(top_srcdir)/gtk-doc.make
23+include $(top_builddir)/gtk-doc.make
24
25 # Other files to distribute
26 EXTRA_DIST += version.xml.in
27Index: git/docs/reference/libmx/Makefile.am
28===================================================================
29--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100
30+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100
31@@ -1,3 +1,6 @@
32+EXTRA_DIST=
33+CLEANFILES=
34+
35 ## Process this file with automake to produce Makefile.in
36
37 # We require automake 1.6 at least.
38@@ -106,7 +109,7 @@
39 GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la
40
41 # This includes the standard gtk-doc make rules, copied by gtkdocize.
42-include $(top_srcdir)/gtk-doc.make
43+include $(top_builddir)/gtk-doc.make
44
45 # Other files to distribute
46 EXTRA_DIST += version.xml.in
diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
index 5545c1e819..58a6997ffe 100644
--- a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
+++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
@@ -8,7 +8,6 @@ PV = "1.4.7+git${SRCPV}"
8UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)" 8UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)"
9 9
10SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ 10SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
11 file://fix-build-dir.patch \
12 file://fix-test-includes.patch \ 11 file://fix-test-includes.patch \
13 " 12 "
14S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc
index 2429f189c2..d304837484 100644
--- a/meta/recipes-graphics/mx/mx.inc
+++ b/meta/recipes-graphics/mx/mx.inc
@@ -1,7 +1,7 @@
1SUMMARY = "Clutter based UI widget library" 1SUMMARY = "Clutter based UI widget library"
2LICENSE = "LGPLv2.1" 2LICENSE = "LGPLv2.1"
3 3
4inherit clutter autotools-brokensep distro_features_check gobject-introspection gtk-doc 4inherit clutter autotools distro_features_check gobject-introspection gtk-doc
5# depends on clutter-1.0 which depends on cogl-1.0 5# depends on clutter-1.0 which depends on cogl-1.0
6REQUIRED_DISTRO_FEATURES = "opengl" 6REQUIRED_DISTRO_FEATURES = "opengl"
7 7