diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-12-29 22:28:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 17:37:34 +0000 |
commit | d4c721ac06add78151fcea23a757b526cca22408 (patch) | |
tree | b633cd26edf036254baf630d299742a7d819f151 /meta/recipes-graphics/drm/libdrm | |
parent | b5508a85fa8c2f29d4816ca35cac0df2b83dfd1d (diff) | |
download | poky-d4c721ac06add78151fcea23a757b526cca22408.tar.gz |
libdrm: Upgrade 2.4.65 -> 2.4.66
Fix test build failures.
Ensure all binaries go into libdrm-tests [RB]
(From OE-Core rev: 018bc5121c70ff1f609d5b3406401902b7e7b2f7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/drm/libdrm')
-rw-r--r-- | meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch | 33 | ||||
-rw-r--r-- | meta/recipes-graphics/drm/libdrm/installtests.patch | 24 |
2 files changed, 40 insertions, 17 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch b/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch new file mode 100644 index 0000000000..c18228ee0f --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 46fb5516fb0ab17bcf46a0306a11e8966bb36e14 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 29 Dec 2015 22:17:21 +0000 | ||
4 | Subject: [PATCH] tests/kms-steal-crtc: Include sys/select.h | ||
5 | |||
6 | Fixes errors e.g. | ||
7 | |||
8 | error: implicit declaration of function 'select' | ||
9 | |||
10 | and missing definitions of FD_* defines | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | Upstream-Status: Submitted | ||
15 | |||
16 | tests/kms/kms-steal-crtc.c | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/tests/kms/kms-steal-crtc.c b/tests/kms/kms-steal-crtc.c | ||
20 | index 2f7f327..24d70ab 100644 | ||
21 | --- a/tests/kms/kms-steal-crtc.c | ||
22 | +++ b/tests/kms/kms-steal-crtc.c | ||
23 | @@ -31,6 +31,7 @@ | ||
24 | #include <stdio.h> | ||
25 | #include <string.h> | ||
26 | #include <unistd.h> | ||
27 | +#include <sys/select.h> | ||
28 | |||
29 | #include <drm_fourcc.h> | ||
30 | |||
31 | -- | ||
32 | 2.6.4 | ||
33 | |||
diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index f460ef5ce9..30e0a61fd9 100644 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch | |||
@@ -4,22 +4,12 @@ Upstream-Status: Inappropriate [configuration] | |||
4 | 4 | ||
5 | Signed-off-by: Yu Ke <ke.yu@intel.com> | 5 | Signed-off-by: Yu Ke <ke.yu@intel.com> |
6 | 6 | ||
7 | Index: libdrm-2.4.65/tests/Makefile.am | 7 | Index: libdrm-2.4.66/tests/Makefile.am |
8 | =================================================================== | 8 | =================================================================== |
9 | --- libdrm-2.4.65.orig/tests/Makefile.am | 9 | --- libdrm-2.4.66.orig/tests/Makefile.am |
10 | +++ libdrm-2.4.65/tests/Makefile.am | 10 | +++ libdrm-2.4.66/tests/Makefile.am |
11 | @@ -29,9 +29,11 @@ AM_CFLAGS = \ | 11 | @@ -73,3 +73,4 @@ TESTS += \ |
12 | 12 | endif | |
13 | LDADD = $(top_builddir)/libdrm.la | ||
14 | |||
15 | -check_PROGRAMS = \ | ||
16 | - dristat \ | ||
17 | - drmstat | ||
18 | +bin_PROGRAMS = \ | ||
19 | + dristat \ | ||
20 | + drmstat | ||
21 | + | ||
22 | +check_PROGRAMS = | ||
23 | |||
24 | dristat_LDADD = -lm | ||
25 | 13 | ||
14 | check_PROGRAMS += $(TESTS) | ||
15 | +bin_PROGRAMS = $(check_PROGRAMS) | ||