summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/drm/libdrm
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-11-15 12:29:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-20 15:31:53 +0000
commitcb758f9d32aef5e990adc8f0178674e5fdb26565 (patch)
tree3900e4e097a59b1ecacd4ccda1d2ce53b0a60806 /meta/recipes-graphics/drm/libdrm
parent3491c88dfb487ed72c9e965cc29bdce78b8d327d (diff)
downloadpoky-cb758f9d32aef5e990adc8f0178674e5fdb26565.tar.gz
libdrm: upgrade to 2.4.40
Other changes: * removed a backported patch; * activated libdrm-omap helper layer which is needed by the latest xf86-video-omap xorg driver; * split libdrm-drivers package into libdrm-radeon, libdrm-nouveau and libdrm-omap, libdrm-intel and libdrm-exynos; (From OE-Core rev: 8b100befe8dcf7523148b6fc14fa2237d07fe556) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@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/disable-cairo.patch74
1 files changed, 0 insertions, 74 deletions
diff --git a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch b/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
deleted file mode 100644
index 90e79d4731..0000000000
--- a/meta/recipes-graphics/drm/libdrm/disable-cairo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1commit c81d1df4926072d24b4dad1b488e618e57eff1c6
2Author: Daniel Stone <daniel@fooishbar.org>
3Date: Thu Oct 4 10:26:37 2012 +1000
4
5 configure.ac: Allow forcible disabling of Cairo support
6
7 We don't want to build libdrm tests with Cairo support under Poky, since
8 they're never used and also cause a build loop from libdrm -> cairo ->
9 mesa-dri -> libdrm.
10
11 To avoid variance in build results, introduce a --disable-cairo-tests
12 switch.
13
14 Upstream-Status: Backport
15
16 Signed-off-by: Daniel Stone <daniel@fooishbar.org>
17
18diff --git a/configure.ac b/configure.ac
19index 290362c..8c28107 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then
23 AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
24 fi
25
26+AC_ARG_ENABLE([cairo-tests],
27+ [AS_HELP_STRING([--enable-cairo-tests],
28+ [Enable support for Cairo rendering in tests (default: auto)])],
29+ [CAIRO=$enableval], [CAIRO=auto])
30 PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
31-if test "x$HAVE_CAIRO" = xyes; then
32- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
33+AC_MSG_CHECKING([whether to enable Cairo tests])
34+if test "x$CAIRO" = xauto; then
35+ CAIRO="$HAVE_CAIRO"
36 fi
37-AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
38+if test "x$CAIRO" = xyes; then
39+ if ! test "x$HAVE_CAIRO" = xyes; then
40+ AC_MSG_ERROR([Cairo support required but not present])
41+ fi
42+ AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
43+fi
44+AC_MSG_RESULT([$CAIRO])
45+AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
46
47 # For enumerating devices in test case
48 PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
49diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
50index b5ec771..065ae13 100644
51--- a/tests/modetest/Makefile.am
52+++ b/tests/modetest/Makefile.am
53@@ -1,8 +1,7 @@
54 AM_CFLAGS = \
55 -I$(top_srcdir)/include/drm \
56 -I$(top_srcdir)/libkms/ \
57- -I$(top_srcdir) \
58- $(CAIRO_CFLAGS)
59+ -I$(top_srcdir)
60
61 noinst_PROGRAMS = \
62 modetest
63@@ -12,5 +11,9 @@ modetest_SOURCES = \
64
65 modetest_LDADD = \
66 $(top_builddir)/libdrm.la \
67- $(top_builddir)/libkms/libkms.la \
68- $(CAIRO_LIBS)
69+ $(top_builddir)/libkms/libkms.la
70+
71+if HAVE_CAIRO
72+AM_CFLAGS += $(CAIRO_CFLAGS)
73+modetest_LDADD += $(CAIRO_LIBS)
74+endif