Fix a segmentation fault while running in xorg 1.12 (Debian bug #675407).

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

4 files changed, 56 insertions, 18 deletions

diff --git a/x11-drivers/xf86-video-openchrome/ChangeLog b/x11-drivers/xf86-video-openchrome/ChangeLog
index 99991845a104..8dfa0dcd726a 100644
--- a/x11-drivers/xf86-video-openchrome/ChangeLog
+++ b/x11-drivers/xf86-video-openchrome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-openchrome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.61 2012/06/24 11:16:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.62 2012/07/17 16:32:06 jer Exp $
+
+  17 Jul 2012; Jeroen Roovers <jer@gentoo.org>
+  xf86-video-openchrome-0.2.906.ebuild,
+  +files/xf86-video-openchrome-0.2.906-xorg-1.12.patch:
+  Fix a segmentation fault while running in xorg 1.12 (Debian bug #675407).
 
   24 Jun 2012; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-openchrome-0.2.906.ebuild:
diff --git a/x11-drivers/xf86-video-openchrome/Manifest b/x11-drivers/xf86-video-openchrome/Manifest
index 9cfa6a53c209..f6993a7a2d88 100644
--- a/x11-drivers/xf86-video-openchrome/Manifest
+++ b/x11-drivers/xf86-video-openchrome/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST xf86-video-openchrome-0.2.905.tar.bz2 508469 RMD160 cd8b60b3ba48af8f831a1a2496b5ceabc2c74148 SHA1 bbd64f258e69b29498e5f68d5a28e5253d252dd1 SHA256 0c8f15fb798680a429089a58d5211f9064797e3720010d599acc010d04a88bd2
-DIST xf86-video-openchrome-0.2.906.tar.bz2 514154 RMD160 0a826707b45f3fd17576a82f1f8f589b2d9768c1 SHA1 1c49bf722326442393288db490ff48d437e337f9 SHA256 e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41
-EBUILD xf86-video-openchrome-0.2.905.ebuild 1343 RMD160 d8a7d353c110415d1ef4e38eed91fbc9fa826df2 SHA1 8173993fc78b3d0036e5b10f4ff1a0a1f0213c65 SHA256 a322c2d00ec169a7aa0f152964c19ec9612c8ba1aba549980e626398171d7576
-EBUILD xf86-video-openchrome-0.2.906.ebuild 1336 RMD160 4c5cba373aa0cf92989cf542afddaf35dda00563 SHA1 2f0a199340c13a079528c6f9a261ebe9045a72ff SHA256 e9b9fcb0a149527c08eb2ef46503e44535048eb3c29f3e68c41e1f4d234bef1d
-MISC ChangeLog 10528 RMD160 4c23c53a53a88406b9f97039b9c5276115d79895 SHA1 6a4822ba0124b5f7fc146e32f605ae83e09192ea SHA256 523fd47707f3ab4ff4e3bbc45f049785d78b218a8be07740542cea958d24ac30
-MISC metadata.xml 315 RMD160 9fc61675d6a4140a8da6b8c7018ba06b761f7e20 SHA1 391456b7e6e8caeecde821fecb1f5d94fda9c717 SHA256 d8fa3d7ffb55c1f06f7041b80ce125721c371afc0762ebb197db44821b2b08e8
+AUX xf86-video-openchrome-0.2.906-xorg-1.12.patch 782 SHA256 bb02a78914184a66aec6ee62a08516503e590e3719675b0ba79ab778ea24aa47 SHA512 3e7855a1202c8c990db791337ef5c2f14bf15f77186cc73a7601f50aad2ee8fee2308a46ffdfad26664de689d065d5fd6a6b09cdcb67a5a3623ff4acfc021a60 WHIRLPOOL 867c4ba8bcbe1506a3186d0de872b88abed2739e965656c88978de4489ada73b9c52ca1ac14b5aa74763a7d1bd93b3508bae8acde7ff215cfb19ab740c3b0b3d
+DIST xf86-video-openchrome-0.2.905.tar.bz2 508469 SHA256 0c8f15fb798680a429089a58d5211f9064797e3720010d599acc010d04a88bd2 SHA512 8bbfb6b83321381b6843e78e63d1eae1b33028dc84be61bf69b2bf986601e19b268be69f7ef0df7309e23f0a65e014ebf024a021b796910183beb1762ee0ddd6 WHIRLPOOL c682499b8afc101aff7354fd93ef72ec6d52b3b611245309a763ff49fb51b3110e7f56f8661d869913da3c57fb1295109fe0633e1ca1c432d5c6e2d150f8792d
+DIST xf86-video-openchrome-0.2.906.tar.bz2 514154 SHA256 e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41 SHA512 c4d1a91fc06f16d813543a2d984df7cb141d8d0452c63a48371ac59bf227e30cfa6093081df98ce8c7c1c811198d0da928ab5522856fc7ea1646b5ac264dd6f4 WHIRLPOOL 4cf28b75c44b9a63c6dc8c0df040f4508468d1b99bee8c030ab51afb43c28966eadbcadee879698f208acd66c0c5ea307da1bf5bbd3163eed26a9ca42e508a5a
+EBUILD xf86-video-openchrome-0.2.905.ebuild 1343 SHA256 a322c2d00ec169a7aa0f152964c19ec9612c8ba1aba549980e626398171d7576 SHA512 6c8440334d99b785e74d6c1d58fe0ac7d53ce8a19e4bc22a317973e3b004eb7dc9ba4fc19fa01e428ddf8d6b6e15629f0f33a92a0ef17be3beb169732c2d706a WHIRLPOOL f025b57f6f3883ebead53b57245982a4b14665c1ab899750b3280efda267c1ea91c8a9159ad28a8f9f2170a1615d8037516ea29d52d269767feef62afe874d69
+EBUILD xf86-video-openchrome-0.2.906.ebuild 1405 SHA256 49f755167ffef9cf37cf94f7101ad93074d48dab85c01d0dc353b654dbe86b41 SHA512 9ff94d62c3ccf5d80295a196819f6053cb589655341e42e9065df63a2640016cbf10b3bd11550b1a71ff4ef282a81e5e900b0371717cca59d709f7de5ae77a5a WHIRLPOOL 153d4f9b0de34e66c271b5a34d09849750fec804bbd8d44b6467b7604b986ca7d8274aebd7dc63c62d961742e051d04ad4e05d31716f23878d9ed7cb11eadb9a
+MISC ChangeLog 10748 SHA256 f714d7cb5133ea7d226c01e26ad26c25735fb8d5d8723503de4ae9383547d725 SHA512 0cac0c542cf83deec59c79ef9f2c89aba626fc4bf2774eec5a67a3a15fd8d2a451fed4c7c99002a2bd7410153868128ca80fe92955bde5733d75632e49f7790b WHIRLPOOL 6d42d92d7936dabdf57114c86b31d0db8f174728ad860bb722dedc903f824e653e77df3124a210e33df93605d4df768a268b30a5bbf6aa897b08092b2d4501ca
+MISC metadata.xml 315 SHA256 d8fa3d7ffb55c1f06f7041b80ce125721c371afc0762ebb197db44821b2b08e8 SHA512 c00a8104c842076ee61a655103fa6ebe61a7e901617d020987bac6db6d8fddb61d71c89d898feddc6c3b0ab7b33ffee925ac46d9202d2ab54986c27e260d8b79 WHIRLPOOL 5ef939e7182e73177dbf6ee8efaf037fb20584231a63b9f97e074d84eb650bc05b5bf45e34e40b689d53f34b59dab4aa118f2ddf112ac739909b5b8fde9a4c1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP5vcrAAoJEOTDgjZ80txdDL0IAKTU6W9IBLcbsq1De+jcD9dW
-1H9Y777UoCuMF6CyhDwCIwE+aQ2PURnD/93oHKzfR9b8o/yh6LKKQ5oTMmBn5UFe
-WU3UbPHk/4Hy/o4lkitMv766/+OUbWVIEntkleMZtdwR8O49a32BlcVbB0o6yKv6
-rzyVgnREjjjEJO8uU2XwHjyTzqg2qcRQfTuZCxI+NIp/2i2oiJSsWw0SAd4+jghk
-jFBClhM01X+kfiZwWE92vyWhexZ8AOS3X/+xvstsk+kyBBfHOzVJ1odSbIhvrgLQ
-WHWUNoq9FRocinjAf/oGOLuS1EgHah6rUnMDmzevajTLmLgXv9RfFCqD7j/N4MU=
-=f35j
+iEYEAREIAAYFAlAFk4sACgkQVWmRsqeSphOCxACdGjYZ3NBGA8JZk8Zrnj0T6X5d
+qKcAnir6u6z2YWxAkL5TY/VT0CWIl4ZZ
+=LYSf
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch
new file mode 100644
index 000000000000..1c39353fb231
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.2.906-xorg-1.12.patch
@@ -0,0 +1,32 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675407
+
+
+Deal with X 1.12 by calling vgaHWSetStdFuncs().
+
+Thanks to Leon Winter for testing the initial patch and proposing a
+working one.
+
+Signed-off-by: Cyril Brulebois <kibi@debian.org>
+--- a/src/via_driver.c
++++ b/src/via_driver.c
+@@ -997,6 +997,11 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
+ #endif
+     }
+ 
++    hwp = VGAHWPTR(pScrn);
++
++    /* Needed with X 1.12 */
++    vgaHWSetStdFuncs(hwp);
++
+     if (pVia->Chipset == VIA_CLE266)
+         ViaDoubleCheckCLE266Revision(pScrn);
+ 
+@@ -1012,8 +1017,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
+     struct pci_device *vgaDevice = viaPciDeviceVga();
+ #endif
+ 
+-    hwp = VGAHWPTR(pScrn);
+-
+     switch (pVia->Chipset) {
+         case VIA_CLE266:
+ #ifdef XSERVER_LIBPCIACCESS
diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
index 937559f45853..723e0f29e451 100644
--- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
@@ -1,10 +1,10 @@
 # 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-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.3 2012/06/24 11:16:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.4 2012/07/17 16:32:06 jer Exp $
 
 EAPI=4
 XORG_DRI="dri"
-inherit xorg-2
+inherit eutils xorg-2
 
 DESCRIPTION="X.Org driver for VIA/S3G cards"
 HOMEPAGE="http://www.openchrome.org"
@@ -26,6 +26,10 @@ DEPEND="
 
 DOCS=( ChangeLog NEWS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xorg-1.12.patch
+}
+
 pkg_setup() {
 	xorg-2_pkg_setup
 	XORG_CONFIGURE_OPTIONS=(