summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-29 22:28:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:37:34 +0000
commitd4c721ac06add78151fcea23a757b526cca22408 (patch)
treeb633cd26edf036254baf630d299742a7d819f151
parentb5508a85fa8c2f29d4816ca35cac0df2b83dfd1d (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch33
-rw-r--r--meta/recipes-graphics/drm/libdrm/installtests.patch24
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.66.bb (renamed from meta/recipes-graphics/drm/libdrm_2.4.65.bb)10
3 files changed, 46 insertions, 21 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 @@
1From 46fb5516fb0ab17bcf46a0306a11e8966bb36e14 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Dec 2015 22:17:21 +0000
4Subject: [PATCH] tests/kms-steal-crtc: Include sys/select.h
5
6Fixes errors e.g.
7
8error: implicit declaration of function 'select'
9
10and missing definitions of FD_* defines
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Submitted
15
16 tests/kms/kms-steal-crtc.c | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/tests/kms/kms-steal-crtc.c b/tests/kms/kms-steal-crtc.c
20index 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--
322.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
5Signed-off-by: Yu Ke <ke.yu@intel.com> 5Signed-off-by: Yu Ke <ke.yu@intel.com>
6 6
7Index: libdrm-2.4.65/tests/Makefile.am 7Index: 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)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.65.bb b/meta/recipes-graphics/drm/libdrm_2.4.66.bb
index e5ed260254..028db4a4ee 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.65.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.66.bb
@@ -11,10 +11,12 @@ PROVIDES = "drm"
11DEPENDS = "libpthread-stubs udev libpciaccess" 11DEPENDS = "libpthread-stubs udev libpciaccess"
12 12
13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ 13SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
14 file://installtests.patch " 14 file://installtests.patch \
15 file://0001-tests-kms-steal-crtc-Include-sys-select.h.patch \
16 "
15 17
16SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05" 18SRC_URI[md5sum] = "c6809c48538d6e5999588832045ff014"
17SRC_URI[sha256sum] = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4" 19SRC_URI[sha256sum] = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76"
18 20
19inherit autotools pkgconfig 21inherit autotools pkgconfig
20 22
@@ -32,7 +34,7 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
32RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ 34RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
33 ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu" 35 ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu"
34 36
35FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" 37FILES_${PN}-tests = "${bindir}/*"
36FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" 38FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
37FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" 39FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
38FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" 40FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"