Fix building against xorg-server-1.14, bug #460754.

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

6 files changed, 52 insertions, 95 deletions

diff --git a/x11-drivers/xf86-video-dummy/ChangeLog b/x11-drivers/xf86-video-dummy/ChangeLog
index 948486e1e840..3f3a38ec314d 100644
--- a/x11-drivers/xf86-video-dummy/ChangeLog
+++ b/x11-drivers/xf86-video-dummy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-dummy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.99 2013/02/27 05:41:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.100 2013/03/08 20:56:28 chithanh Exp $
+
+*xf86-video-dummy-0.3.6-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch,
+  +xf86-video-dummy-0.3.6-r1.ebuild,
+  -files/xf86-video-dummy-0.3.5-dga-support.patch,
+  -xf86-video-dummy-0.3.4.ebuild, -xf86-video-dummy-0.3.5-r1.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   27 Feb 2013; Zac Medico <zmedico@gentoo.org> xf86-video-dummy-0.3.6.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index f3056564ebdf..b31ddd54eca4 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-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 SHA256 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc SHA512 976c486dcbc0b700e4e186f3dc2d45851fcdfbc7600baf99805199c3c906fba1f39c77836b75ca4333d6b02bf89250f6f90580c96a1718322ddc035e92dc62f2 WHIRLPOOL b3ee2c6c4c1c00b4d225a28d96dbbf715d19833ea03ea84d52ab93d7fe4e182dad21745ad9283fcc8dac2010c2972d90eaaff6cc46f2a25c5c516e27b3008fd2
-DIST xf86-video-dummy-0.3.5.tar.bz2 274761 SHA256 d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f SHA512 99637074e7ef19d0b72298c5f0c8e571e1ec1fcf832f89d5c6f7ea23cd96dbed0590a42fe9e7d7f85bc4a700980df8091bb0b4e0a38992e2cabb90028c433f9b WHIRLPOOL 2aa3acda827f514135ad6802a0c0ac6e3a0b8db5a240c13cff6155ae03a1072207dbd1e88eb524065e8c03c3dc8633053904126c2615b1a174fc496a7ae28818
+AUX xf86-video-dummy-0.3.6-remove-mibstore_h.patch 864 SHA256 06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb SHA512 c141a4f316b67f06d07318af312c2a37c764b34ea6fdd17413a2e08e4f2e4e817499bea3bbbbf894fc4c08e74f721e3c640a300a8eb052b5b733b5142392c2ac WHIRLPOOL 028306b87cd4910b7ad94d2d8fcf664f0678ad81615f2ff193884f7921c66f8b14fdb2efaae586a109dfdab34f47b015d120c40faf42e908d6bb1ef87bc09eeb
 DIST xf86-video-dummy-0.3.6.tar.bz2 285892 SHA256 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798 SHA512 3a530083d591ebde37b58a329d9a6ed4955d09d8f3f7fb566840681f2588aa752014c8753f411aec0410a2704b3b55729868a27aee138df42eb7d7bb5a5a52c5 WHIRLPOOL 4475426b4469968ad63f830a66cc44452f39194c0abcaf9b54e527fe8c560f6dc7b38030a5f1dd95ecec9e82f291bcb3bde3820c1506f2bcdce60d1e352e6ec4
-EBUILD xf86-video-dummy-0.3.4.ebuild 589 SHA256 48e3d492fac1047772d5144d7adbc61529c8b5cf9efcd36104d24283536c17ed SHA512 442b2bb9e22a8a7f9b4d75408ed4ebe724121145ae839bc331c16ac2229d170e178d495e8ba77cd852ac581c5dd03a071a905bfd215778c72868f742b85a2eab WHIRLPOOL 076a95d0e323ec32cea1442fb2e2202da6e9ab36c68f2f82f9db28496599107e2678a7f66daee0a4a8e0e836d7e0ce9d138c68f53c7b2320e81d832482076577
-EBUILD xf86-video-dummy-0.3.5-r1.ebuild 643 SHA256 b01dd81c84ea9ff85f527dba55335fc33f03db517237f2991bde83fd5489a152 SHA512 83da6a492ea4496f5ddcb3cd07a9f6c02f2c4b851ffeb2b471d9b19b5613a7f044fc6c1729e9ef8bf470fa4ae42cdbcec0db65f0aa976ee7c48e56fa1641cde4 WHIRLPOOL 49fa171f34bc1524522fb63652a3997c299ead724b70a6381ba38f54f28652ea547e83ee13aaa4398e2a1233a69bbd56b1576e306e015b011aa8375b916f216f
+EBUILD xf86-video-dummy-0.3.6-r1.ebuild 701 SHA256 89ae1f40304b8953f0fbeca04365b02ea6335ef5e375af0dfb2a0613f18ba1dc SHA512 90bb93cc82cc425c65074aef3d86d1ed6a075568cf5a45d263a5373c15e0f7e41460dc33fab2d0a82225c89cdfb76487d0bf5552c81fcf670113f623043aea2e WHIRLPOOL 2fb900012482b5a326f07a3d2133a787921102ae76abe2da61f758755108f7327170b2c7812c6fd4238e0b682289424f6fe24682f48ca59ffe878e4926202898
 EBUILD xf86-video-dummy-0.3.6.ebuild 630 SHA256 6dc3c0be71eb9816b25ccf37890bac9b5abce33187264c390282ef4c61d4187c SHA512 fdef2dc79efb1020c03a02f29c23f29b57903ba8b2ba167028860aaafd0e0a7bac9ea1d71c7413d7a83dcb44c9268874cfb947ea3fd19a64cdeac0f52c661dd0 WHIRLPOOL de5d5f5896f53e16f4b6d570dbd672b4c578ee72f5102f91573bd241c8e793eddbed17c0d4288c37b8279720563efb76a1d00db4a30df93d0b229191e36addcb
-MISC ChangeLog 12504 SHA256 641ae53fc97e6c3748bf3924e38c3785920a7563bd2b755a82203b8aa3696e3c SHA512 1d173aa945ca340995f3b674e72cf09f63bb0296938f7095d26b9f03fc5bbd8eabd99b3851d6bac507755a8edfb5cb31904f23dd1a6db4852123a48d9f97a4b7 WHIRLPOOL 5c18b1a97331997a56a2d869d9ee0791359fda716340136ed161ab726dca5af776a44a13f76e7bf70b2cb4cad751c43df26744af056307ae4a0a6e4238bf12f5
+MISC ChangeLog 12886 SHA256 38704e1c4676dc00ed75343dbe6efad044163c592ed59f3c37136d3b97b309de SHA512 7b719011dac2d3f678d12943d9b05e86b0dca26ed0a6b927673250b5b84fa22ed1a20ebb6a2591eea966594747012547600d9d3d14afba0f2e5eefc2204643ec WHIRLPOOL 9c465710c71afe539bb6d56184b65d120aa82139c5a9872b5df8b37788a4c499ad06e585db23602cd0a90617b8bce6e319a2ee606dd9669b3b03dea1ce088c3d
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlEtnIIACgkQ/ejvha5XGaN89gCg6vYSvn+tF45wTrAnTZJ/1NwY
-TVsAnR5/W1Hn0BtlZvEpWacK0Vllgbts
-=9ffK
------END PGP SIGNATURE-----
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
deleted file mode 100644
index e4a848e69a95..000000000000
--- a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch
new file mode 100644
index 000000000000..4b0b46ef3000
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   , lines - pScrn->virtualY);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 	
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
deleted file mode 100644
index 8432b014b5dd..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 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.4.ebuild,v 1.8 2011/02/14 23:56:24 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
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.6-r1.ebuild
index d69b88d05e91..453d952c3220 100644
--- 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.6-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.8 2012/08/26 19:41:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild,v 1.1 2013/03/08 20:56:28 chithanh Exp $
 
-EAPI=4
+EAPI=5
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
@@ -16,13 +16,13 @@ DEPEND="${RDEPEND}
 		x11-proto/xf86dgaproto
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
+
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dga)
 	)
 	xorg-2_pkg_setup
 }
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dga-support.patch
-)