From 814174c25fe0868349cf721e06d689fe5c9dd2da Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 8 Aug 2013 01:36:48 +0200 Subject: [PATCH] xf86-video-intel: update to xf86-video-intel-2.21.14 Signed-off-by: Stephan Raue --- .../x11/driver/xf86-video-intel/package.mk | 2 +- .../xf86-video-intel-dri_configure.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-dri_configure.patch diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 78230fc6b7..86ef1aa24d 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.21.13" +PKG_VERSION="2.21.14" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" diff --git a/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-dri_configure.patch b/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-dri_configure.patch new file mode 100644 index 0000000000..0af6e60108 --- /dev/null +++ b/packages/x11/driver/xf86-video-intel/patches/xf86-video-intel-dri_configure.patch @@ -0,0 +1,36 @@ +From 6004870d53221caf05a330fcfc8a72e68b2b8898 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Tue, 06 Aug 2013 03:03:18 +0000 +Subject: configure.ac: fix dri enabled with kms only picked + +Otherwise we'd fail saying DRI1 wasn't possible, when that +is exactly what we asked for. + +[ickle: The breakage was introduced with + +commit bd6ffd1ad2f903215d2c631252e742a0f6893054 [2.21.14] +Author: Chris Wilson +Date: Sat Jul 27 15:33:19 2013 +0100 + + configure: Print a summary of compilation options + +which modified the search to only take place if UMS was enabled, but +missed mollifying the resulting error.] + +Signed-off-by: Dave Airlie +--- +diff --git a/configure.ac b/configure.ac +index 104113e..88f29cc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -433,7 +433,7 @@ else + DRI1_CFLAGS="" + DRI1_LIBS="" + +- if test "x$enable_dri" = "xyes"; then ++ if test "x$enable_dri" = "xyes" -a "x$KMS_ONLY" != "xyes"; then + AC_MSG_ERROR([DRI1 requested but prerequisites not found]) + fi + fi +-- +cgit v0.9.0.2-2-gbebe