diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-11 18:56:55 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-11 18:56:55 +0000 |
| commit | 60cecb32891d5121f55f9467761799ffc01349ea (patch) | |
| tree | 46b29e76e6e665ebe06437bd2c6aa73d77ad1f41 /x11-drivers | |
| parent | Fix an overrun that was causing various issues on VT switch. This is already (diff) | |
| download | historical-60cecb32891d5121f55f9467761799ffc01349ea.tar.gz historical-60cecb32891d5121f55f9467761799ffc01349ea.tar.bz2 historical-60cecb32891d5121f55f9467761799ffc01349ea.zip | |
Include Donnie's patch for missing assert.h include. (Toffanin, bug #135759)
Package-Manager: portage-2.1
Diffstat (limited to 'x11-drivers')
4 files changed, 72 insertions, 1 deletions
diff --git a/x11-drivers/xf86-video-sis/ChangeLog b/x11-drivers/xf86-video-sis/ChangeLog index 74fee2dc6c7a..66f5e5a85b42 100644 --- a/x11-drivers/xf86-video-sis/ChangeLog +++ b/x11-drivers/xf86-video-sis/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-sis # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.15 2006/06/05 21:36:48 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/ChangeLog,v 1.16 2006/06/11 18:56:55 joshuabaergen Exp $ + +*xf86-video-sis-0.9.1-r1 (11 Jun 2006) + + 11 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/xf86-video-sis-assert.patch, -xf86-video-sis-0.9.1.ebuild, + +xf86-video-sis-0.9.1-r1.ebuild: + Include Donnie's patch for missing assert.h include. (Toffanin, bug #135759) 05 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> xf86-video-sis-0.9.1.ebuild: diff --git a/x11-drivers/xf86-video-sis/files/digest-xf86-video-sis-0.9.1-r1 b/x11-drivers/xf86-video-sis/files/digest-xf86-video-sis-0.9.1-r1 new file mode 100644 index 000000000000..0914f12080a1 --- /dev/null +++ b/x11-drivers/xf86-video-sis/files/digest-xf86-video-sis-0.9.1-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 ada663e2c0ba297b052175675027d700 xf86-video-sis-0.9.1.tar.bz2 615954 +RMD160 311e2ba46212ff992bba7ecfc389f7e281253934 xf86-video-sis-0.9.1.tar.bz2 615954 +SHA256 56b275fcc24fa9bf82b25867c79ce5b720a83aedfc5707ebe392099932e679be xf86-video-sis-0.9.1.tar.bz2 615954 diff --git a/x11-drivers/xf86-video-sis/files/xf86-video-sis-assert.patch b/x11-drivers/xf86-video-sis/files/xf86-video-sis-assert.patch new file mode 100644 index 000000000000..a285d596174a --- /dev/null +++ b/x11-drivers/xf86-video-sis/files/xf86-video-sis-assert.patch @@ -0,0 +1,23 @@ +Index: xf86-video-sis/src/sis_dri.c +=================================================================== +RCS file: /cvs/xorg/driver/xf86-video-sis/src/sis_dri.c,v +retrieving revision 1.26 +diff -u -B -r1.26 sis_dri.c +--- xf86-video-sis/src/sis_dri.c 21 Oct 2005 18:40:19 -0000 1.26 ++++ xf86-video-sis/src/sis_dri.c 6 Jun 2006 15:15:53 -0000 +@@ -1,5 +1,5 @@ + /* $XFree86$ */ +-/* $XdotOrg: driver/xf86-video-sis/src/sis_dri.c,v 1.26 2005/10/21 18:40:19 ajax Exp $ */ ++/* $XdotOrg$ */ + /* + * DRI wrapper for 300 and 315 series + * +@@ -40,6 +40,8 @@ + #include "config.h" + #endif + ++#include <assert.h> ++ + #include "sis.h" + #include "sis_regs.h" + diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild new file mode 100644 index 000000000000..4a95e3eee7a5 --- /dev/null +++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.9.1-r1.ebuild,v 1.1 2006/06/11 18:56:55 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org driver for sis cards" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sh ~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/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xineramaproto + x11-proto/xproto + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2 )" + +CONFIGURE_OPTIONS="$(use_enable dri)" + +PATCHES="${FILESDIR}/${PN}-assert.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 +} |