summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/drm/libdrm/detect.patch59
-rw-r--r--meta/recipes-graphics/drm/libdrm_2.4.66.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/detect.patch b/meta/recipes-graphics/drm/libdrm/detect.patch
new file mode 100644
index 0000000000..6397a5954e
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm/detect.patch
@@ -0,0 +1,59 @@
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
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.66.bb b/meta/recipes-graphics/drm/libdrm_2.4.66.bb
index 028db4a4ee..3280920de1 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.66.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.66.bb
@@ -13,6 +13,7 @@ DEPENDS = "libpthread-stubs udev libpciaccess"
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 \ 15 file://0001-tests-kms-steal-crtc-Include-sys-select.h.patch \
16 file://detect.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "c6809c48538d6e5999588832045ff014" 19SRC_URI[md5sum] = "c6809c48538d6e5999588832045ff014"