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>
This commit is contained in:
Laurentiu Palcu
Richard Purdie
parent
3491c88dfb
commit
cb758f9d32
|
|
@ -11,17 +11,27 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
|
|||
PROVIDES = "drm"
|
||||
DEPENDS = "libpthread-stubs udev"
|
||||
|
||||
INC_PR = "r3"
|
||||
INC_PR = "r4"
|
||||
|
||||
#libpciaccess is required starting from libdrm 2.4.26
|
||||
DEPENDS += " libpciaccess"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF += "--disable-cairo-tests"
|
||||
EXTRA_OECONF += "--disable-cairo-tests \
|
||||
--enable-omap-experimental-api \
|
||||
"
|
||||
ALLOW_EMPTY_${PN}-drivers = "1"
|
||||
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
|
||||
${PN}-intel ${PN}-exynos ${PN}-kms"
|
||||
|
||||
RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
|
||||
${PN}-exynos"
|
||||
|
||||
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
|
||||
FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
|
||||
FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
|
||||
FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
|
||||
FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
|
||||
FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
|
||||
FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
|
||||
FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
|
||||
FILES_${PN}-kms = "${libdir}/libkms*.so.*"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
commit c81d1df4926072d24b4dad1b488e618e57eff1c6
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Thu Oct 4 10:26:37 2012 +1000
|
||||
|
||||
configure.ac: Allow forcible disabling of Cairo support
|
||||
|
||||
We don't want to build libdrm tests with Cairo support under Poky, since
|
||||
they're never used and also cause a build loop from libdrm -> cairo ->
|
||||
mesa-dri -> libdrm.
|
||||
|
||||
To avoid variance in build results, introduce a --disable-cairo-tests
|
||||
switch.
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 290362c..8c28107 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -222,11 +222,23 @@ if test "x$EXYNOS" = xyes; then
|
||||
AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
|
||||
fi
|
||||
|
||||
+AC_ARG_ENABLE([cairo-tests],
|
||||
+ [AS_HELP_STRING([--enable-cairo-tests],
|
||||
+ [Enable support for Cairo rendering in tests (default: auto)])],
|
||||
+ [CAIRO=$enableval], [CAIRO=auto])
|
||||
PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
|
||||
-if test "x$HAVE_CAIRO" = xyes; then
|
||||
- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
|
||||
+AC_MSG_CHECKING([whether to enable Cairo tests])
|
||||
+if test "x$CAIRO" = xauto; then
|
||||
+ CAIRO="$HAVE_CAIRO"
|
||||
fi
|
||||
-AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
|
||||
+if test "x$CAIRO" = xyes; then
|
||||
+ if ! test "x$HAVE_CAIRO" = xyes; then
|
||||
+ AC_MSG_ERROR([Cairo support required but not present])
|
||||
+ fi
|
||||
+ AC_DEFINE(HAVE_CAIRO, 1, [Have Cairo support])
|
||||
+fi
|
||||
+AC_MSG_RESULT([$CAIRO])
|
||||
+AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
|
||||
|
||||
# For enumerating devices in test case
|
||||
PKG_CHECK_MODULES(LIBUDEV, libudev, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
|
||||
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
|
||||
index b5ec771..065ae13 100644
|
||||
--- a/tests/modetest/Makefile.am
|
||||
+++ b/tests/modetest/Makefile.am
|
||||
@@ -1,8 +1,7 @@
|
||||
AM_CFLAGS = \
|
||||
-I$(top_srcdir)/include/drm \
|
||||
-I$(top_srcdir)/libkms/ \
|
||||
- -I$(top_srcdir) \
|
||||
- $(CAIRO_CFLAGS)
|
||||
+ -I$(top_srcdir)
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
modetest
|
||||
@@ -12,5 +11,9 @@ modetest_SOURCES = \
|
||||
|
||||
modetest_LDADD = \
|
||||
$(top_builddir)/libdrm.la \
|
||||
- $(top_builddir)/libkms/libkms.la \
|
||||
- $(CAIRO_LIBS)
|
||||
+ $(top_builddir)/libkms/libkms.la
|
||||
+
|
||||
+if HAVE_CAIRO
|
||||
+AM_CFLAGS += $(CAIRO_CFLAGS)
|
||||
+modetest_LDADD += $(CAIRO_LIBS)
|
||||
+endif
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
require libdrm.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://installtests.patch \
|
||||
file://GNU_SOURCE_definition.patch \
|
||||
file://disable-cairo.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"
|
||||
SRC_URI[sha256sum] = "386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d"
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
require libdrm.inc
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://installtests.patch \
|
||||
file://GNU_SOURCE_definition.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "626a3dc44a40ef37565b61732b688567"
|
||||
SRC_URI[sha256sum] = "48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f"
|
||||
|
|
@ -6,7 +6,7 @@ S = "${WORKDIR}/git"
|
|||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
SRCREV = "14db948127e549ea9234e02d8e112de3871f8f9f"
|
||||
PV = "2.4.39+git${SRCPV}"
|
||||
SRCREV = "e01d68f9f3acfc35fe164283904b5d058c2ab378"
|
||||
PV = "2.4.40+git${SRCPV}"
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue