diff options
| author |   Johannes Pointner <h4nn35.work@gmail.com> | 2016-03-07 23:51:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:47 +0000 |
| commit | 1a3516610757b1c7c500a169591be2c069f2a792 (patch) | |
| tree | f2ebfdf0c028e9b5948e234a30e858a00f49c8fc | |
| parent | 36bf66654a557c570011db0b06f2084ee2ccf9cc (diff) | |
| download | openembedded-core-contrib-1a3516610757b1c7c500a169591be2c069f2a792.tar.gz | |
xserver: require sufficiently new libdrm
This fixes the check of the libdrm version in the configure script.
(From OE-Core rev: 2312eb1b6da67c2c7e8c968db55d99472ac29b49)
Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch new file mode 100644 index 0000000000..5f186cb843 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch @@ -0,0 +1,30 @@ +From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 27 Jan 2016 11:50:13 -0500 +Subject: modesetting: Require sufficiently new libdrm + +Bugzilla: https://bugs.freedesktop.org/93883 +Signed-off-by: Adam Jackson <ajax@redhat.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> + +Upstream-Status: Backport +Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com> + +diff --git a/configure.ac b/configure.ac +index ac3bb64..312fc69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then + + if test "x$DRM" = xyes; then + dnl 2.4.46 is required for cursor hotspot support. +- PKG_CHECK_EXISTS(libdrm >= 2.4.46) +- XORG_DRIVER_MODESETTING=yes ++ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no) + fi + + AC_SUBST([XORG_LIBS]) +-- +cgit v0.10.2 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb index e606dac5f9..eb79b40465 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb @@ -2,6 +2,7 @@ require xserver-xorg.inc SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ file://musl-arm-inb-outb.patch \ + file://modesetting_libdrm_requirements.patch \ " SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" |