Fix re-spawn crash. (Bug #162830; Slava Gorbunov and Pablo De Nápoli)

Package-Manager: portage-2.1.2-r9

5 files changed, 79 insertions, 5 deletions

diff --git a/x11-drivers/xf86-video-savage/ChangeLog b/x11-drivers/xf86-video-savage/ChangeLog
index f0e04c164252..d7d8f6818586 100644
--- a/x11-drivers/xf86-video-savage/ChangeLog
+++ b/x11-drivers/xf86-video-savage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-savage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.29 2007/01/24 07:05:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/ChangeLog,v 1.30 2007/02/19 21:16:40 joshuabaergen Exp $
+
+*xf86-video-savage-2.1.2-r1 (19 Feb 2007)
+
+  19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/2.1.2-fix-respawn-crash.patch, +xf86-video-savage-2.1.2-r1.ebuild:
+  Fix re-spawn crash.  (Bug #162830; Slava Gorbunov and Pablo De Nápoli)
 
   24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -xf86-video-savage-2.0.2.3.ebuild:
diff --git a/x11-drivers/xf86-video-savage/Manifest b/x11-drivers/xf86-video-savage/Manifest
index 8d785f4611ff..63c88d09d9a6 100644
--- a/x11-drivers/xf86-video-savage/Manifest
+++ b/x11-drivers/xf86-video-savage/Manifest
@@ -1,3 +1,7 @@
+AUX 2.1.2-fix-respawn-crash.patch 259 RMD160 374da4d9df0d1ca624483e008afe4e854b439743 SHA1 6714e4dae7c3b2d1123cacd3643557933ff177f5 SHA256 1f77860498a5fe6aa5d2ab3492fd86365e3c45d0be7c46090677f72db8ef2a8f
+MD5 05c4442a58174359b3dd64626ae36356 files/2.1.2-fix-respawn-crash.patch 259
+RMD160 374da4d9df0d1ca624483e008afe4e854b439743 files/2.1.2-fix-respawn-crash.patch 259
+SHA256 1f77860498a5fe6aa5d2ab3492fd86365e3c45d0be7c46090677f72db8ef2a8f files/2.1.2-fix-respawn-crash.patch 259
 AUX savage.xinf 1320 RMD160 dd8902a9b6e9b29ab3b72f5c77fae0abbc69d021 SHA1 c08f15b33455059f3b9a1dde7d9c3af000b6ca42 SHA256 fa34ea241fdea449fd29574bb10e6cf09f7bb3d5438ff1eddbee132db15241e6
 MD5 443dfc859b783be4e16743f55a6f9024 files/savage.xinf 1320
 RMD160 dd8902a9b6e9b29ab3b72f5c77fae0abbc69d021 files/savage.xinf 1320
@@ -9,14 +13,18 @@ EBUILD xf86-video-savage-2.1.1.ebuild 856 RMD160 675b516c3305afdf16edad420aeca81
 MD5 f7f53cd5f8004cc77d1a5b9078930ca5 xf86-video-savage-2.1.1.ebuild 856
 RMD160 675b516c3305afdf16edad420aeca81c802dcaf8 xf86-video-savage-2.1.1.ebuild 856
 SHA256 832fbda03baeada536e36619adf6cd235778b7f9c71830859bbcda1736eb60e3 xf86-video-savage-2.1.1.ebuild 856
+EBUILD xf86-video-savage-2.1.2-r1.ebuild 1115 RMD160 85e54c9ea4b95b3b97cff1523014b390dfef943b SHA1 16bdbd0f18ef6eca25b7853c1cb87155a7104ee9 SHA256 125928eadbbfe86329e42c5e5562e837477e51a84c9e54d9f6df0b6534a8b4c4
+MD5 9436e8cda69bae4faf842966cc27a359 xf86-video-savage-2.1.2-r1.ebuild 1115
+RMD160 85e54c9ea4b95b3b97cff1523014b390dfef943b xf86-video-savage-2.1.2-r1.ebuild 1115
+SHA256 125928eadbbfe86329e42c5e5562e837477e51a84c9e54d9f6df0b6534a8b4c4 xf86-video-savage-2.1.2-r1.ebuild 1115
 EBUILD xf86-video-savage-2.1.2.ebuild 1055 RMD160 62324d54e0177043321f9c58b835d30fab69f9a9 SHA1 b9785f964da629772cf78714189a7704142de8f0 SHA256 b6383fa4473f0d20d50fef16ba82d319593d15dbf3b3067aa0cb480fd0d2f7cd
 MD5 6143b39291f971bf1563576ab640e576 xf86-video-savage-2.1.2.ebuild 1055
 RMD160 62324d54e0177043321f9c58b835d30fab69f9a9 xf86-video-savage-2.1.2.ebuild 1055
 SHA256 b6383fa4473f0d20d50fef16ba82d319593d15dbf3b3067aa0cb480fd0d2f7cd xf86-video-savage-2.1.2.ebuild 1055
-MISC ChangeLog 4376 RMD160 0a9ea00936a03bef86f296f0fdfe91f6d36c63c4 SHA1 b02ab37df5346fe94d2fa6caac0ef8d2854852cc SHA256 b377d05470e6c50c4e70594130ddb74c22a1a95a0529b51108b453081cc32ade
-MD5 f39bffbba796968f87dcbe3d9f3db300 ChangeLog 4376
-RMD160 0a9ea00936a03bef86f296f0fdfe91f6d36c63c4 ChangeLog 4376
-SHA256 b377d05470e6c50c4e70594130ddb74c22a1a95a0529b51108b453081cc32ade ChangeLog 4376
+MISC ChangeLog 4631 RMD160 05ef51874da7de60ec48fd6c9fb1f3ec73d402ed SHA1 e566ec43a0747a3b8ae2228cb74ff41bfb98d735 SHA256 6478f88cbbd9c06f8521a2e2bf43686d222db51813d755cab3ce7398ced9a028
+MD5 4ba6f2a857c3d789abe7be4456a7775e ChangeLog 4631
+RMD160 05ef51874da7de60ec48fd6c9fb1f3ec73d402ed ChangeLog 4631
+SHA256 6478f88cbbd9c06f8521a2e2bf43686d222db51813d755cab3ce7398ced9a028 ChangeLog 4631
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -27,3 +35,6 @@ SHA256 c087d0c23a137990ce71d6ddc3035dd38bc12d5248a419d79ae376e7a1bbfb39 files/di
 MD5 1eb14abd1c4ef3affbc6cf40342852f6 files/digest-xf86-video-savage-2.1.2 530
 RMD160 86fb8bf0e021b03787cc053c3ebfd3174d95e572 files/digest-xf86-video-savage-2.1.2 530
 SHA256 c6c19e248c8db1c931d56bcfb2bbda00d9d129843d7bf533298d67ce3ea9d93c files/digest-xf86-video-savage-2.1.2 530
+MD5 1eb14abd1c4ef3affbc6cf40342852f6 files/digest-xf86-video-savage-2.1.2-r1 530
+RMD160 86fb8bf0e021b03787cc053c3ebfd3174d95e572 files/digest-xf86-video-savage-2.1.2-r1 530
+SHA256 c6c19e248c8db1c931d56bcfb2bbda00d9d129843d7bf533298d67ce3ea9d93c files/digest-xf86-video-savage-2.1.2-r1 530
diff --git a/x11-drivers/xf86-video-savage/files/2.1.2-fix-respawn-crash.patch b/x11-drivers/xf86-video-savage/files/2.1.2-fix-respawn-crash.patch
new file mode 100644
index 000000000000..f436afaeb7e3
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/files/2.1.2-fix-respawn-crash.patch
@@ -0,0 +1,12 @@
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -3088,6 +3088,9 @@ static Bool SavageScreenInit(int scrnInd
+  
+     SavageEnableMMIO(pScrn);
+ 
++    if (!SavageMapMem(pScrn))
++	return FALSE;
++
+     psav->FBStart2nd = 0;
+ 
+     if (psav->overlayDepth) {
diff --git a/x11-drivers/xf86-video-savage/files/digest-xf86-video-savage-2.1.2-r1 b/x11-drivers/xf86-video-savage/files/digest-xf86-video-savage-2.1.2-r1
new file mode 100644
index 000000000000..9d1a99edbebb
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/files/digest-xf86-video-savage-2.1.2-r1
@@ -0,0 +1,6 @@
+MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
+RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
+SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
+MD5 6367e921a98f6a7fec9d0a9bc5ff0a47 xf86-video-savage-2.1.2.tar.bz2 303497
+RMD160 12fb1f73c2797008c746a5cfe93a3c8fb7ad8838 xf86-video-savage-2.1.2.tar.bz2 303497
+SHA256 1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2 xf86-video-savage-2.1.2.tar.bz2 303497
diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..c813a12d333a
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild,v 1.1 2007/02/19 21:16:40 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="S3 Savage video driver"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES="${FILESDIR}/${PV}-fix-respawn-crash.patch"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+	# (#149567)
+	elog "Direct rendering with kernels <=2.6.18 requires that you use"
+	elog "x11-drm 20060608 or newer rather than the DRM in the kernel."
+}