From a5d005dfe7654b8239410cb00206494b22940dc2 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Mon, 19 Feb 2007 21:16:41 +0000 Subject: Fix re-spawn crash. (Bug #162830; Slava Gorbunov and Pablo De Nápoli) (Portage version: 2.1.2-r9) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x11-drivers/xf86-video-savage/ChangeLog | 8 ++++- .../files/2.1.2-fix-respawn-crash.patch | 12 +++++++ .../files/digest-xf86-video-savage-2.1.2-r1 | 6 ++++ .../xf86-video-savage-2.1.2-r1.ebuild | 39 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 x11-drivers/xf86-video-savage/files/2.1.2-fix-respawn-crash.patch create mode 100644 x11-drivers/xf86-video-savage/files/digest-xf86-video-savage-2.1.2-r1 create mode 100644 x11-drivers/xf86-video-savage/xf86-video-savage-2.1.2-r1.ebuild (limited to 'x11-drivers') 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 + +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 ; -xf86-video-savage-2.0.2.3.ebuild: 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." +} -- cgit v1.2.3-65-gdbad