x11-drivers/xf86-video-intel: Disable DRI3 support (see bug #513500)

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 109 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 388ad69f2c76..f4ffae15a050 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.161 2014/06/10 09:55:56 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.162 2014/06/18 07:08:18 remi Exp $
+
+*xf86-video-intel-2.99.912-r1 (18 Jun 2014)
+
+  18 Jun 2014; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-intel-2.99.912-r1.ebuild,
+  +files/xf86-video-intel-2.99.912-disable-dri3.patch:
+  Disable DRI3 support (see bug #513500)
 
 *xf86-video-intel-2.99.912 (10 Jun 2014)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 914777dd3ce3..9d3a0b87fe8a 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -3,6 +3,7 @@ AUX xf86-video-intel-2.99.905-fix-randr.patch 1528 SHA256 1d41609432b63f4cc0d461
 AUX xf86-video-intel-2.99.906-server-crash.patch 1373 SHA256 4999e15222ae1ed67708ec27ea43ad2bd9646a2d02e35dc68d68b89392aa56cb SHA512 945cdaf69102c81b775c1b84ca62afbecbac6ce86ba966f921a27d37b29fb0195dcda6f190cbf549efdbf615c9ded8be715f42aa10d549c5e330afb756421eae WHIRLPOOL f5e2df2b5103c4c3c6400a33a6b3f63df87ec2e7a1ea36e9b226a8f95d2668a78ef0fd12b7f1493228cef6ce0ccda07589ba023d04fdb9aeb106c1dca7c83dea
 AUX xf86-video-intel-2.99.907-invalidation.patch 1707 SHA256 feb57fb5acbf18dec6d72e3990db318adecf07e44f7c7e03bdfaa488f6d40b66 SHA512 7ecbeb4574ad089f58aeeb84280bfca9f48754312a6d4f68d7f32c71e29de7582556806d5f399c555751edc9b70be5780a26ed2d2187fcfeba3fef4ed1f71229 WHIRLPOOL 093ac0b591c8c781b72325fe3762de475f3e97aaa54dbaaa207bcc55c0e66dca9e5e1ccf064cef1a847c98621438e8d633187ea4480c7ef76d05de853fcc6752
 AUX xf86-video-intel-2.99.911-sna-pixmap-migration.patch 3801 SHA256 c0758266c9eceb7647316639b4408c02e6beac86eef8871c5ff756c188488276 SHA512 b5d7ca5cd93d3ed4bba150b312fc868e53867a04df94956b367caf315e32398ea8558ee0059debd7e7684794fb2e55361d0ae425ccc66187d22297003894e76b WHIRLPOOL bc273ef3add88f9ddee4cbc9f23434edf0a91e5a6157691496c907dff2391dd8ce38ed98ca382c8b1f05c09dfb21b2dc12756b56d59026450dee61452d2dea0f
+AUX xf86-video-intel-2.99.912-disable-dri3.patch 601 SHA256 03304d86ae442b1c7a0f2a1e80f0d48d2c6093fd9cc7067c8e8390e72efe61a5 SHA512 156fe8bbf6b381c9bed97241c249a3f4ce6e417776c618dbf711fd52d35088b8990eb59cc9ad881d5266a32e6b5e265833084f99281f73282f35fac775f4217e WHIRLPOOL a55c2cdc46a2b966ddf0853e033e2cc15145abc358accfed250c807d7bcc5a96196294c3de5f47d72af5e1db581615c0ea34fbd799d8173dc7c05071f6e2764e
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
 DIST xf86-video-intel-2.20.13.tar.bz2 1649369 SHA256 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3 SHA512 4f70ba1e794d26f8cbbb52c4936cfc8cdf4f43a353d9f921bf519a02a0c7f1b1eec6b3aa706ee6fc333a89b152416b9526f5d951ddea23ed70400e975c59febe WHIRLPOOL 101dff2402c75d0a48243ce1e3ac11e529f2d26a8d81321ae9ec528b6d35a3ed7647c342a2cf60389a69d677c29798c84e3252932b64f905966ef5af695cffbf
 DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed
@@ -26,6 +27,7 @@ EBUILD xf86-video-intel-2.99.907-r1.ebuild 1583 SHA256 2e6e229050441249d6cb161da
 EBUILD xf86-video-intel-2.99.909.ebuild 1563 SHA256 53127f0221102ee6da7f660480e2b1e2ea5b0bdc5d5bb0e2943d774d04e3207e SHA512 9074d7e88568d8fe988fedf79c12d7b1ab10e7bebaa5402fb6dae9b87f1b7eaa19a310721666378d571077455afb7703401fde1f015fbc97f626622c552a29c1 WHIRLPOOL a882db1c965a76d8aaa34da3204563e3eababb27b6a04b5845eacccc9299e7542a2c3320a1a7cf74ba19aeca20de90b4985e66af243110544c9a9b71d5748520
 EBUILD xf86-video-intel-2.99.910.ebuild 1563 SHA256 1a183e44b5272923c737c7bcec7fa43feb505e55a1293bf042f2c2d0e4239ded SHA512 c447d587fa1d77ffa192968c3c558a69b95a3702b5f18e53884996e0a247208587631d82dffcde37419d9f1ac704e9447c1306b7101243e736c37705bec2b7ed WHIRLPOOL 6963591213e49cc4edf49c7e24cbdd819cc1e4209e9317ddee575bc1d8adf8d7365a41244b7cb88df8eac6270d7e6a4610c820466c512b1fe902dce6fbcf85a0
 EBUILD xf86-video-intel-2.99.911-r1.ebuild 1625 SHA256 715a4baa97aaf9c8930b8c49aaa96d62e50230d37ea63f7a22c7f2ff391c9975 SHA512 db0e91f618204233c70ac5bda1512900e25e149a5c9868fdc1e08cd21e9f6aad855164da155e254d18796c572cf3ad80329f1ff8eecd39ac603165078b9c72ff WHIRLPOOL 7c5159d39f7d33d3b6cb0b5c3072ca3d7cc8a04442f5f6775f26605ea20641789446e7d798374ed2620cc33a2c55eda3db737fa89dcb781384eac57e84539a53
+EBUILD xf86-video-intel-2.99.912-r1.ebuild 1701 SHA256 7ba5e8fe4925aeb43bf03c4a17baea42a03b0d8be58e51b45ada4e30713957e5 SHA512 26ada35cae6d6291c9352e39fd474aa241969ec81728c500e2be6b03550a6d3a284c22e6e92287210979a401dd4d5b183ad8a0089c0ec6019a810c6b239b5e3d WHIRLPOOL 7155f519930e3eda20f14556a1fe2754e6f0b68449eab1520f92b2e6ff537366f74823ac12b0a956acd6576e71af378cdd8de65db83e45e6d104fb4325830213
 EBUILD xf86-video-intel-2.99.912.ebuild 1650 SHA256 21a295dabc54c83e4ff970476da15ed64105da6b504d996bf8610c4d4167213c SHA512 b859a5ba0bbecda68b5a9d942780335b816e6a1f2033a765a5771120190fea8295dfed8bd5e0c481e97033606983a2ef62bea768a7144684ee246d366e595808 WHIRLPOOL b4d35c5b4853757ead0cbaf712f10e9f6dd76a3e67936e1a070bf697eaf02c448df2139215a605eeb387662e6108eae5c9238f6c4a9b02c13b6fb2bb994212d7
-MISC ChangeLog 59589 SHA256 60ac541b9b7826527beb5383a09b51233da1c775c64ba062fd746f6614f3e591 SHA512 8d38f65cfc7a936709e3f9e2f1a1cc04a8b1c34182176814295ed9fbb102da93e86f5b5bbd61a3dbffd686d05ba1edb2c6f2fa00625e7ef150cd5c307bfb7153 WHIRLPOOL 8ca58f6607432fd8085500aaeeb7aca62347ad2f39ff608ea276cc0edddd5a4aa50a9088a4faded7685c591228f121f05a264cb24eb0974f55d896c0a92e63c6
+MISC ChangeLog 59814 SHA256 92da17410a474f18f793ad5f70b3f4f2fdf29652d647183e0e9110607bd5ca03 SHA512 7a437bd2b3371b0fff206856d03f399945d64a6210d75aa2ef72cb5d3c9aaf28475a2a00494f617752f1a146b6cdab205d68e986e3b438d1f1bbcaffdd342108 WHIRLPOOL 9ec1c27272ff6c863c55c9f0d9fdcda09ba253492e9467cec029884e873115ba57fefefd02702b98b7c099dc99d7b9d8eaeba22e6a27428fbda99d0bdb7db135
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.912-disable-dri3.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.912-disable-dri3.patch
new file mode 100644
index 000000000000..97780f8af8fa
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.912-disable-dri3.patch
@@ -0,0 +1,22 @@
+--- configure.old	2014-06-18 08:36:47.151142539 +0200
++++ configure	2014-06-18 09:05:13.568360179 +0200
+@@ -20769,7 +20769,7 @@
+ 	DRI3_LIBS=$pkg_cv_DRI3_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	DRI3=$DRI
++	DRI3=no
+ fi
+ 	fi
+ 	if test "x$DRI3" != "xno"; then
+@@ -20850,10 +20850,6 @@
+ $as_echo "#define HAVE_DRI3 1" >>confdefs.h
+ 
+ 	dri_msg="$dri_msg DRI3"
+-else
+-	if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then
+-		as_fn_error $? "DRI3 requested but prerequisites not found" "$LINENO" 5
+-	fi
+ fi
+ 
+ for ac_header in X11/extensions/dpmsconst.h
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.912-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.912-r1.ebuild
new file mode 100644
index 000000000000..b58674c0e81d
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.912-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.912-r1.ebuild,v 1.1 2014/06/18 07:08:18 remi Exp $
+
+EAPI=5
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="debug glamor +sna +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+	glamor? ( uxa )
+"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	glamor? ( || (
+		x11-base/xorg-server[glamor]
+		>=x11-libs/glamor-0.6.0
+	) )
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-disable-dri3.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable glamor)
+		$(use_enable sna)
+		$(use_enable uxa)
+		$(use_enable udev)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}