Add patch to fix dga failure, bug #425322.

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

4 files changed, 92 insertions, 17 deletions

diff --git a/x11-drivers/xf86-video-dummy/ChangeLog b/x11-drivers/xf86-video-dummy/ChangeLog
index de2f51a1c6d6..ddadc4f7e0a6 100644
--- a/x11-drivers/xf86-video-dummy/ChangeLog
+++ b/x11-drivers/xf86-video-dummy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-dummy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.76 2012/06/29 04:20:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.77 2012/07/08 15:13:58 chithanh Exp $
+
+*xf86-video-dummy-0.3.5-r1 (08 Jul 2012)
+
+  08 Jul 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-dummy-0.3.5-dga-support.patch,
+  +xf86-video-dummy-0.3.5-r1.ebuild:
+  Add patch to fix dga failure, bug #425322.
 
   29 Jun 2012; Markus Meier <maekke@gentoo.org> xf86-video-dummy-0.3.5.ebuild:
   arm stable, bug #419473
@@ -320,4 +327,3 @@
   08 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
   +xf86-video-dummy-0.1.0.ebuild:
   Initial commit for modular X.
-
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index 48d53d62f1c5..e4a4b0f5b961 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xf86-video-dummy-0.3.5-dga-support.patch 1486 SHA256 5e435d4044eabafee0e05fcffaace6cfffcc24e8de3c567440c1d103ca6ffac3 SHA512 b1de322387d1f305765f78deece5fa100d89b95f751e57c903e45221f6872f73187db492966c4540e02b526e37c8db90d84ab69c5aa81baf3126f3d18cbbc216 WHIRLPOOL 44372293f9687fdad9b29a35cb9f94ff7189f28c5f58efa4384dc17ccc1c0f2c669291906a242bec19cb3e728f39d42e1bcf17fc0d794e476aae47a3b895a250
 DIST xf86-video-dummy-0.3.4.tar.bz2 255658 RMD160 aac23243d85dc9b17447de96b7aaf5e7e5d4d504 SHA1 876ed7165ea2821bbddd73232a1ce0b79c1f14ff SHA256 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
-DIST xf86-video-dummy-0.3.5.tar.bz2 274761 RMD160 e94053e75a2e314c4cc29cdbf244cd0a3d70ba84 SHA1 41cfcaec986ab13e931d260953c5a3f626fd1d2b SHA256 d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
-EBUILD xf86-video-dummy-0.3.4.ebuild 589 RMD160 71bdf6187d3b79896f73b222b0f99b47d0d4043c SHA1 c75fa4e07e46e86eb6f2a1348bb994cc31194db4 SHA256 48e3d492fac1047772d5144d7adbc61529c8b5cf9efcd36104d24283536c17ed
-EBUILD xf86-video-dummy-0.3.5.ebuild 594 RMD160 cbd82919968e21581365a34e0cb26938e014bfda SHA1 fe65381a5f457473fe671b6d2a6379d98b5ff0e8 SHA256 32ed3a4e5ee0fba5be8b87b772b2f30b102d98347ee80ac0f317b1fa1d816a46
-MISC ChangeLog 9567 RMD160 ef783800f2811a2962c1be9cd029fd3d2a6835cb SHA1 baafdf55dfd96dc434dfb390f1324b2179212fa5 SHA256 188487fa5d661d18989019b1b1cc2d3b2501bfc800c24c4b278e00b1fbc7c98b
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk/tLbwACgkQkKaRLQcq0GLWcwCgsy+2BKrzmcWiUpxpb8Snq9jj
-WS0AoLJLF6Jflf1078KjQUiGA05Oa4Pi
-=spXS
------END PGP SIGNATURE-----
+DIST xf86-video-dummy-0.3.5.tar.bz2 274761 SHA256 d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f SHA512 99637074e7ef19d0b72298c5f0c8e571e1ec1fcf832f89d5c6f7ea23cd96dbed0590a42fe9e7d7f85bc4a700980df8091bb0b4e0a38992e2cabb90028c433f9b WHIRLPOOL 2aa3acda827f514135ad6802a0c0ac6e3a0b8db5a240c13cff6155ae03a1072207dbd1e88eb524065e8c03c3dc8633053904126c2615b1a174fc496a7ae28818
+EBUILD xf86-video-dummy-0.3.4.ebuild 589 SHA256 48e3d492fac1047772d5144d7adbc61529c8b5cf9efcd36104d24283536c17ed SHA512 442b2bb9e22a8a7f9b4d75408ed4ebe724121145ae839bc331c16ac2229d170e178d495e8ba77cd852ac581c5dd03a071a905bfd215778c72868f742b85a2eab WHIRLPOOL 076a95d0e323ec32cea1442fb2e2202da6e9ab36c68f2f82f9db28496599107e2678a7f66daee0a4a8e0e836d7e0ce9d138c68f53c7b2320e81d832482076577
+EBUILD xf86-video-dummy-0.3.5-r1.ebuild 654 SHA256 24df524219a238ae7035892d2465ef8fd26c5d9b55eec23e4a126eb084f32290 SHA512 9135ace99384299169bcfacb372aeb5829ae74bcae83817c5ffc70522a0ab3c69f65641c7d224a3f303d416383aee2396d1d2754abe4c9ed6f7271dadfad36de WHIRLPOOL a2d03cd81d4fc99823d4b7a48dd3f79d2bc73616a5eff9669c20e95eb29fa5565751a42efebfb4b4da77f7ea1bdb15b7b13beea90716ab2bfefb4c0e3e37015f
+EBUILD xf86-video-dummy-0.3.5.ebuild 594 SHA256 32ed3a4e5ee0fba5be8b87b772b2f30b102d98347ee80ac0f317b1fa1d816a46 SHA512 a4d42ce73f45dd529466bb8874aebd4cf65026df3b31184e1cf9fe063fde32a3391728b94018d27ee530b1d6b3040d4767abba43677a23397e3dede729a39a79 WHIRLPOOL 953a4b7dd10d3e121117329405906cb19418e00b803bedc20728d6b723db99bfa5bf198b5debdb297605fb763280aa85bdb25077899d47914be347b7275fef83
+MISC ChangeLog 9813 SHA256 9f066cee891695645e4de953cd07baa3d652ee1407222a6f333e4ab30aac9ac0 SHA512 715edae61831c07e31ea85d2d461776ff2cd7019ae1b1780ae583923b503017e722fddc1c5e9c034a59aafcfd95ec1fba4398633a3ed65c639edcadaca5a9590 WHIRLPOOL 4cab7318a88965e7208cb738b1a73d03700c32cfccfceab49cf949d4e50699e5fd6a6260d00d99913f9a45f63f357098058a7e3eafdab00f699bc4148375d9ac
+MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
new file mode 100644
index 000000000000..e4a848e69a95
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
@@ -0,0 +1,49 @@
+From 02918fd53434a23a72fe878a90f4ec48ef0e0416 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon, 09 Jan 2012 09:00:40 +0000
+Subject: Don't use XFreeXDGA to determine DGA support
+
+If our server supports DGA and we want to build the dummy driver without it,
+XFreeXDGA will be defined by the server and will be picked up rather than
+our configuration option.  This change forces us to honor our configuration
+hoice.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/configure.ac b/configure.ac
+index d92e22a..6861485 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ 
+ if test "x$DGA" = xyes; then
+ 	XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+-	AC_DEFINE(XFreeXDGA, 1, [Support DGA extension])
++	AC_DEFINE(USE_DGA, 1, [Support DGA extension])
+ fi
+ AC_SUBST([DGA])
+ AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 041ca96..6533b27 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -45,7 +45,7 @@
+ #include <X11/Xproto.h>
+ #include "scrnintstr.h"
+ #include "servermd.h"
+-#ifdef XFreeXDGA
++#ifdef USE_DGA
+ #define _XF86DGA_SERVER_
+ #include <X11/extensions/xf86dgaproto.h>
+ #endif
+@@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 
+     xf86SetBlackWhitePixels(pScreen);
+ 
+-#ifdef XFreeXDGA
++#ifdef USE_DGA
+     DUMMYDGAInit(pScreen);
+ #endif
+     
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..daab54cf0d4d
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild,v 1.1 2012/07/08 15:13:58 chithanh Exp $
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for dummy cards"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="dga"
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	dga? (
+		x11-proto/xf86dgaproto
+	)"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dga)
+	)
+	xorg-2_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dga-support.patch
+)