(fd.o #4066) Add 1.4.0-i810-unresolved-symbols.patch to make i810 driver work.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 53 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index c2fb5931056f..8f0df5b75588 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.3 2005/08/12 21:14:36 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.4 2005/08/23 01:14:39 spyderous Exp $
+
+*xf86-video-i810-1.4.0-r2 (23 Aug 2005)
+
+  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/1.4.0-i810-unresolved-symbols.patch,
+  +xf86-video-i810-1.4.0-r2.ebuild:
+  (fd.o #4066) Add 1.4.0-i810-unresolved-symbols.patch to make i810 driver work.
 
   12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -files/dri.patch:
   Pull unused patch.
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index d40b421646cd..a8f7aaf4a831 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,6 +1,9 @@
 MD5 aa0ad3e4bdb6c42ca4446a1dd29d3039 xf86-video-i810-1.4.0.ebuild 668
-MD5 8d270d58480bb1ad2f965cdc0a03be50 ChangeLog 817
+MD5 e9da61133e63456ba74aeef50c5bca7f ChangeLog 1077
 MD5 16aee9fbd5938d772fa611099efc38ab xf86-video-i810-1.4.0-r1.ebuild 720
+MD5 9795a25d39e0182c99af0b0c1ff22fa2 xf86-video-i810-1.4.0-r2.ebuild 769
 MD5 d0714780555df4798544d62da8d2324b files/digest-xf86-video-i810-1.4.0 74
 MD5 d0714780555df4798544d62da8d2324b files/digest-xf86-video-i810-1.4.0-r1 74
 MD5 e40879b52fd68e970d8b2d9621fda3ad files/xf86-video-i810-1.4.0-add-i830-shadow.patch 10424
+MD5 d0714780555df4798544d62da8d2324b files/digest-xf86-video-i810-1.4.0-r2 74
+MD5 81208d2c8f6470c15008a06837952017 files/1.4.0-i810-unresolved-symbols.patch 613
diff --git a/x11-drivers/xf86-video-i810/files/1.4.0-i810-unresolved-symbols.patch b/x11-drivers/xf86-video-i810/files/1.4.0-i810-unresolved-symbols.patch
new file mode 100644
index 000000000000..3c4707fa7eb5
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/1.4.0-i810-unresolved-symbols.patch
@@ -0,0 +1,13 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=4066
+
+--- src/Makefile.am.old	2005-08-12 21:03:59.000000000 -0600
++++ src/Makefile.am	2005-08-12 21:04:19.000000000 -0600
+@@ -23,7 +23,7 @@
+ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
++AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV -DBUILD_FOR_I830
+ 
+ i810_drv_la_LTLIBRARIES = i810_drv.la
+ i810_drv_la_LDFLAGS = -module -avoid-version
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r2 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r2
new file mode 100644
index 000000000000..d09ff9cd887d
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r2
@@ -0,0 +1 @@
+MD5 aaff7b8378d605730ef2db32c8b7149b xf86-video-i810-1.4.0.tar.bz2 322808
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..0eaa8a674d9d
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild,v 1.1 2005/08/23 01:14:39 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular
+
+PATCHES="${FILESDIR}/${P}-add-i830-shadow.patch
+	${FILESDIR}/${PV}-i810-unresolved-symbols.patch"
+
+DESCRIPTION="X.Org driver for i810 cards"
+KEYWORDS="~x86"
+IUSE="dri"
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto )"
+
+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
+}