summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/drm/libdrm
diff options
context:
space:
mode:
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.patch96
-rw-r--r--meta/recipes-graphics/drm/libdrm/detect.patch59
2 files changed, 0 insertions, 155 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
deleted file mode 100644
index e4ecbac16c..0000000000
--- a/meta/recipes-graphics/drm/libdrm/0001-tests-kms-steal-crtc-Include-sys-select.h.patch
+++ /dev/null
@@ -1,96 +0,0 @@
1From fb53d7a1be116a172b56625f290fcf88b6d158ca Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 20 Jan 2016 05:23:00 +0000
4Subject: [PATCH] tests: Include sys/select.h
5
6Used in compliance with POSIX 2001/2008
7
8Fixes errors e.g.
9error: implicit declaration of function 'select'
10
11and helps with missing definitions of FD_* defines
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
15---
16Upstream-Status: Submitted
17
18 configure.ac | 2 +-
19 tests/kms/kms-steal-crtc.c | 3 +++
20 tests/kms/kms-universal-planes.c | 3 +++
21 tests/modetest/modetest.c | 3 +++
22 tests/vbltest/vbltest.c | 3 +++
23 5 files changed, 13 insertions(+), 1 deletion(-)
24
25diff --git a/configure.ac b/configure.ac
26index 057a846..258e2f6 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -53,7 +53,7 @@ AC_USE_SYSTEM_EXTENSIONS
30 AC_SYS_LARGEFILE
31 AC_FUNC_ALLOCA
32
33-AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h])
34+AC_CHECK_HEADERS([sys/mkdev.h sys/sysctl.h sys/select.h])
35
36 # Initialize libtool
37 LT_PREREQ([2.2])
38diff --git a/tests/kms/kms-steal-crtc.c b/tests/kms/kms-steal-crtc.c
39index 2f7f327..497772e 100644
40--- a/tests/kms/kms-steal-crtc.c
41+++ b/tests/kms/kms-steal-crtc.c
42@@ -31,6 +31,9 @@
43 #include <stdio.h>
44 #include <string.h>
45 #include <unistd.h>
46+#ifdef HAVE_SYS_SELECT_H
47+#include <sys/select.h>
48+#endif
49
50 #include <drm_fourcc.h>
51
52diff --git a/tests/kms/kms-universal-planes.c b/tests/kms/kms-universal-planes.c
53index 9151231..d8e5fc4 100644
54--- a/tests/kms/kms-universal-planes.c
55+++ b/tests/kms/kms-universal-planes.c
56@@ -32,6 +32,9 @@
57 #include <stdio.h>
58 #include <string.h>
59 #include <unistd.h>
60+#ifdef HAVE_SYS_SELECT_H
61+#include <sys/select.h>
62+#endif
63
64 #include <drm_fourcc.h>
65 #include "xf86drm.h"
66diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
67index 22e3e81..d5a4062 100644
68--- a/tests/modetest/modetest.c
69+++ b/tests/modetest/modetest.c
70@@ -55,6 +55,9 @@
71 #include <errno.h>
72 #include <sys/poll.h>
73 #include <sys/time.h>
74+#ifdef HAVE_SYS_SELECT_H
75+#include <sys/select.h>
76+#endif
77
78 #include "xf86drm.h"
79 #include "xf86drmMode.h"
80diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c
81index 1833321..086407e 100644
82--- a/tests/vbltest/vbltest.c
83+++ b/tests/vbltest/vbltest.c
84@@ -37,6 +37,9 @@
85 #include <errno.h>
86 #include <sys/poll.h>
87 #include <sys/time.h>
88+#ifdef HAVE_SYS_SELECT_H
89+#include <sys/select.h>
90+#endif
91
92 #include "xf86drm.h"
93 #include "xf86drmMode.h"
94--
952.7.0
96
diff --git a/meta/recipes-graphics/drm/libdrm/detect.patch b/meta/recipes-graphics/drm/libdrm/detect.patch
deleted file mode 100644
index 6397a5954e..0000000000
--- a/meta/recipes-graphics/drm/libdrm/detect.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4commit 798022b61c58d945f9027c823a188dcedecd3d06
5Author: Marcin Ślusarz <marcin.slusarz@gmail.com>
6Date: Sun Jan 24 13:17:34 2016 +0100
7
8 configure.ac: don't detect disabled options dependencies
9
10 Currently with --disable-amdgpu --disable-valgrind --disable-cairo-tests
11 cunit, valgrind and cairo are still detected.
12
13 Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
14 Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
15
16diff --git a/configure.ac b/configure.ac
17index 057a846..a09be61 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -363,12 +363,14 @@ fi
21-# Detect cunit library
22-PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
23-# If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
24-# do this because Debian (Ubuntu) lacks pkg-config file for cunit.
25-# fixed in 2.1-2.dfsg-3: http://anonscm.debian.org/cgit/collab-maint/cunit.git/commit/?h=debian
26-if test "x${have_cunit}" = "xno"; then
27- AC_CHECK_LIB([cunit], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
28- if test "x${have_cunit}" = "xyes"; then
29- CUNIT_LIBS="-lcunit"
30- CUNIT_CFLAGS=""
31- AC_SUBST([CUNIT_LIBS])
32- AC_SUBST([CUNIT_CFLAGS])
33+if test "x$AMDGPU" != xno; then
34+ # Detect cunit library
35+ PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
36+ # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
37+ # do this because Debian (Ubuntu) lacks pkg-config file for cunit.
38+ # fixed in 2.1-2.dfsg-3: http://anonscm.debian.org/cgit/collab-maint/cunit.git/commit/?h=debian
39+ if test "x${have_cunit}" = "xno"; then
40+ AC_CHECK_LIB([cunit], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
41+ if test "x${have_cunit}" = "xyes"; then
42+ CUNIT_LIBS="-lcunit"
43+ CUNIT_CFLAGS=""
44+ AC_SUBST([CUNIT_LIBS])
45+ AC_SUBST([CUNIT_CFLAGS])
46+ fi
47@@ -375,0 +378,2 @@ if test "x${have_cunit}" = "xno"; then
48+else
49+ have_cunit=no
50@@ -404 +408,3 @@ AC_ARG_ENABLE([cairo-tests],
51-PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
52+if test "x$CAIRO" != xno; then
53+ PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
54+fi
55@@ -449 +455,3 @@ AC_ARG_ENABLE(valgrind,
56-PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
57+if test "x$VALGRIND" != xno; then
58+ PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
59+fi