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>
This commit is contained in:
parent
b5508a85fa
commit
d4c721ac06
|
@ -0,0 +1,33 @@
|
|||
From 46fb5516fb0ab17bcf46a0306a11e8966bb36e14 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 29 Dec 2015 22:17:21 +0000
|
||||
Subject: [PATCH] tests/kms-steal-crtc: Include sys/select.h
|
||||
|
||||
Fixes errors e.g.
|
||||
|
||||
error: implicit declaration of function 'select'
|
||||
|
||||
and missing definitions of FD_* defines
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Submitted
|
||||
|
||||
tests/kms/kms-steal-crtc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/kms/kms-steal-crtc.c b/tests/kms/kms-steal-crtc.c
|
||||
index 2f7f327..24d70ab 100644
|
||||
--- a/tests/kms/kms-steal-crtc.c
|
||||
+++ b/tests/kms/kms-steal-crtc.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
+#include <sys/select.h>
|
||||
|
||||
#include <drm_fourcc.h>
|
||||
|
||||
--
|
||||
2.6.4
|
||||
|
|
@ -4,22 +4,12 @@ Upstream-Status: Inappropriate [configuration]
|
|||
|
||||
Signed-off-by: Yu Ke <ke.yu@intel.com>
|
||||
|
||||
Index: libdrm-2.4.65/tests/Makefile.am
|
||||
Index: libdrm-2.4.66/tests/Makefile.am
|
||||
===================================================================
|
||||
--- libdrm-2.4.65.orig/tests/Makefile.am
|
||||
+++ libdrm-2.4.65/tests/Makefile.am
|
||||
@@ -29,9 +29,11 @@ AM_CFLAGS = \
|
||||
|
||||
LDADD = $(top_builddir)/libdrm.la
|
||||
|
||||
-check_PROGRAMS = \
|
||||
- dristat \
|
||||
- drmstat
|
||||
+bin_PROGRAMS = \
|
||||
+ dristat \
|
||||
+ drmstat
|
||||
+
|
||||
+check_PROGRAMS =
|
||||
|
||||
dristat_LDADD = -lm
|
||||
--- libdrm-2.4.66.orig/tests/Makefile.am
|
||||
+++ libdrm-2.4.66/tests/Makefile.am
|
||||
@@ -73,3 +73,4 @@ TESTS += \
|
||||
endif
|
||||
|
||||
check_PROGRAMS += $(TESTS)
|
||||
+bin_PROGRAMS = $(check_PROGRAMS)
|
||||
|
|
|
@ -11,10 +11,12 @@ PROVIDES = "drm"
|
|||
DEPENDS = "libpthread-stubs udev libpciaccess"
|
||||
|
||||
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
|
||||
file://installtests.patch "
|
||||
file://installtests.patch \
|
||||
file://0001-tests-kms-steal-crtc-Include-sys-select.h.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05"
|
||||
SRC_URI[sha256sum] = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4"
|
||||
SRC_URI[md5sum] = "c6809c48538d6e5999588832045ff014"
|
||||
SRC_URI[sha256sum] = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
|
@ -32,7 +34,7 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
|
|||
RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
|
||||
${PN}-exynos ${PN}-freedreno ${PN}-amdgpu"
|
||||
|
||||
FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test"
|
||||
FILES_${PN}-tests = "${bindir}/*"
|
||||
FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
|
||||
FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
|
||||
FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
|
Loading…
Reference in New Issue