diff options
author | Ross Burton <ross.burton@intel.com> | 2014-09-29 15:36:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-30 21:36:14 +0100 |
commit | 41b420e0eb4e6339cbabbcff543584621086f286 (patch) | |
tree | 9b6f4a193f7dc56e7430286e7175bc8a44e7d88b /meta/recipes-graphics/mx/mx-1.0 | |
parent | 58d9c4e4babbefecc187be2d7f1b812b76d6efc9 (diff) | |
download | poky-41b420e0eb4e6339cbabbcff543584621086f286.tar.gz |
mx: remove version from patch directory
(From OE-Core rev: 11bc6489d534ecf904b04ab9e9b6415d4415492a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mx/mx-1.0')
-rw-r--r-- | meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch | 46 | ||||
-rw-r--r-- | meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch | 20 |
2 files changed, 66 insertions, 0 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 new file mode 100644 index 0000000000..3c8a832021 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | Fix build for S != B | ||
2 | |||
3 | This patch is specific to version 1.4.x | ||
4 | Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 | ||
5 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
6 | -- | ||
7 | Index: 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 | ||
27 | Index: 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/fix-test-includes.patch b/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch new file mode 100644 index 0000000000..82c93dd604 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Fix missing include directory when building tests | ||
2 | |||
3 | This patch is currently required for all versions of mx | ||
4 | Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/82 | ||
5 | Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> | ||
6 | -- | ||
7 | Index: git/tests/Makefile.am | ||
8 | =================================================================== | ||
9 | --- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 | ||
10 | +++ git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 | ||
11 | @@ -10,7 +10,8 @@ | ||
12 | |||
13 | INCLUDES = \ | ||
14 | -I$(top_srcdir) \ | ||
15 | - -I$(top_builddir) | ||
16 | + -I$(top_builddir)\ | ||
17 | + -I$(top_builddir)/mx | ||
18 | |||
19 | noinst_PROGRAMS = \ | ||
20 | test-deform-texture \ | ||