summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch24
-rw-r--r--meta/recipes-graphics/wayland/mtdev_1.1.5.bb (renamed from meta/recipes-graphics/wayland/mtdev_1.1.4.bb)7
2 files changed, 3 insertions, 28 deletions
diff --git a/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch b/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
deleted file mode 100644
index 9895650274..0000000000
--- a/meta/recipes-graphics/wayland/mtdev/fixsepbuild.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Some tests do #include relative to the top-level, so add top_srcdir to the
2include path as otherwise out-of-tree builds can't find the files.
3
4Upstream-Status: Submitted
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6---
7 test/Makefile.am | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/test/Makefile.am b/test/Makefile.am
11index 2b504bd..6688b41 100644
12--- a/test/Makefile.am
13+++ b/test/Makefile.am
14@@ -1,7 +1,7 @@
15 noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel
16 bin_PROGRAMS = mtdev-test
17
18-AM_CPPFLAGS=-I$(top_srcdir)/include/
19+AM_CPPFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include/
20
21 mtdev_mapgen_SOURCES = mtdev-mapgen.c
22
23--
241.7.10.4
diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.4.bb b/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
index 6b38f589f4..ccd0ebbfce 100644
--- a/meta/recipes-graphics/wayland/mtdev_1.1.4.bb
+++ b/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
@@ -11,9 +11,8 @@ SECTION = "libs"
11LICENSE = "MIT" 11LICENSE = "MIT"
12LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" 12LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6"
13 13
14SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ 14SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2"
15 file://fixsepbuild.patch" 15SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1"
16SRC_URI[md5sum] = "73a915d6075b31db4f08ab8c6d314695" 16SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f"
17SRC_URI[sha256sum] = "6b59b055ff22f2b91d4284187c2515826c338b81f6f33bd90f6bedc7c1fb9a38"
18 17
19inherit autotools pkgconfig 18inherit autotools pkgconfig