Fix issues with dri and missing assert.h. (Bug #130320, Bill Krueger)

(Portage version: 2.1_rc1-r2)

5 files changed, 59 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-via/ChangeLog b/x11-drivers/xf86-video-via/ChangeLog
index d0d2811ea50e..65cd154399c3 100644
--- a/x11-drivers/xf86-video-via/ChangeLog
+++ b/x11-drivers/xf86-video-via/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-via
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/ChangeLog,v 1.19 2006/04/16 14:30:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-via/ChangeLog,v 1.20 2006/05/16 02:42:15 joshuabaergen Exp $
+
+*xf86-video-via-0.2.1-r1 (16 May 2006)
+
+  16 May 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/missing-assert.patch, -xf86-video-via-0.2.1.ebuild,
+  +xf86-video-via-0.2.1-r1.ebuild:
+  Fix issues with dri and missing assert.h.  (Bug #130320, Bill Krueger)
 
   16 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   xf86-video-via-0.1.33.2.ebuild:
diff --git a/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.1.33.2 b/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.1.33.2
index 84cb301bb92a..7b4500f8e3c3 100644
--- a/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.1.33.2
+++ b/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.1.33.2
@@ -1,2 +1,4 @@
 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 b003e299f15e3f62850c40e941afe0ec xf86-video-via-0.1.33.2.tar.bz2 364333
diff --git a/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.2.1-r1 b/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.2.1-r1
new file mode 100644
index 000000000000..5badcf3af080
--- /dev/null
+++ b/x11-drivers/xf86-video-via/files/digest-xf86-video-via-0.2.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 7c92846dcf363204f7530fa0fa621e43 xf86-video-via-0.2.1.tar.bz2 386913
+RMD160 7fd9ee7420a27766e240e2910247cb11ec4f315f xf86-video-via-0.2.1.tar.bz2 386913
+SHA256 436c61ea2dfbc58b48430290d31aa8c71f55458f0048f4b8397344b2eec3a1c8 xf86-video-via-0.2.1.tar.bz2 386913
diff --git a/x11-drivers/xf86-video-via/files/missing-assert.patch b/x11-drivers/xf86-video-via/files/missing-assert.patch
new file mode 100644
index 000000000000..d2100e47f8f1
--- /dev/null
+++ b/x11-drivers/xf86-video-via/files/missing-assert.patch
@@ -0,0 +1,11 @@
+diff -urpbB xf86-video-via/src/via.h xf86-video-via.assert/src/via.h
+--- xf86-video-via/src/via.h	2006-04-21 10:42:21.000000000 +0200
++++ xf86-video-via.assert/src/via.h	2006-05-02 19:08:09.358006673 +0200
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <math.h>
++#include <assert.h>
+ 
+ /* Video status flag */
+ 
diff --git a/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild b/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..9f2b76e897da
--- /dev/null
+++ b/x11-drivers/xf86-video-via/xf86-video-via-0.2.1-r1.ebuild
@@ -0,0 +1,32 @@
+# 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-via/xf86-video-via-0.2.1-r1.ebuild,v 1.1 2006/05/16 02:42:15 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for via cards"
+KEYWORDS="~amd64 ~ia64 ~sh ~x86"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99
+		x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+		x11-libs/libX11 )"
+
+PATCHES="${FILESDIR}/missing-assert.patch"
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}