summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-11-02 03:54:41 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-11-02 03:54:41 +0000
commit19fe1901908726974baf1d1edd948f700f78d9be (patch)
tree4aabd0aaea65123bce619132ab0b4e846743a630 /x11-drivers
parentEnable emboss use flag by default and really resolve bug #153770. (diff)
downloadgentoo-2-19fe1901908726974baf1d1edd948f700f78d9be.tar.gz
gentoo-2-19fe1901908726974baf1d1edd948f700f78d9be.tar.bz2
gentoo-2-19fe1901908726974baf1d1edd948f700f78d9be.zip
Fix xv on 965 chipsets. (Bug #153101, Jack Lloyd)
(Portage version: 2.1.2_rc1-r2)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-i810/ChangeLog8
-rw-r--r--x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.2-r16
-rw-r--r--x11-drivers/xf86-video-i810/files/fix_965_xv.patch22
-rw-r--r--x11-drivers/xf86-video-i810/xf86-video-i810-1.7.2-r1.ebuild36
4 files changed, 71 insertions, 1 deletions
diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index 2dfead1a3e72..c2c2d1a36a55 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-drivers/xf86-video-i810
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.42 2006/10/19 00:22:58 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.43 2006/11/02 03:54:41 joshuabaergen Exp $
+
+*xf86-video-i810-1.7.2-r1 (02 Nov 2006)
+
+ 02 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ +files/fix_965_xv.patch, +xf86-video-i810-1.7.2-r1.ebuild:
+ Fix xv on 965 chipsets. (Bug #153101, Jack Lloyd)
19 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+files/1.6.5-fix_no_dri.patch, xf86-video-i810-1.6.5.ebuild:
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.2-r1 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.2-r1
new file mode 100644
index 000000000000..f04ffed9d107
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.7.2-r1
@@ -0,0 +1,6 @@
+MD5 1bdda42ee3348fbd0a12aa83bf0df80a x11-driver-patches-3.tar.bz2 404
+RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff x11-driver-patches-3.tar.bz2 404
+SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a x11-driver-patches-3.tar.bz2 404
+MD5 1717c2f853e2f5560b24c702da5c5961 xf86-video-i810-1.7.2.tar.bz2 457694
+RMD160 77225f74b1d921ee90d496ffeab0009fdbb23c86 xf86-video-i810-1.7.2.tar.bz2 457694
+SHA256 50df86f92e86756b793ea5339c2ccef35395ff0448e1af39b2b67e449b2a3b07 xf86-video-i810-1.7.2.tar.bz2 457694
diff --git a/x11-drivers/xf86-video-i810/files/fix_965_xv.patch b/x11-drivers/xf86-video-i810/files/fix_965_xv.patch
new file mode 100644
index 000000000000..50736fc4d4d8
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/fix_965_xv.patch
@@ -0,0 +1,22 @@
+--- src/packed_yuv_wm.g4a
++++ src/packed_yuv_wm.g4a
+@@ -144,7 +144,7 @@ mac.sat (8) m8<1>F g15<8,8,1>F 1F { alig
+ */
+ mov (8) m1<1>UD g1<8,8,1>UD { align1 mask_disable };
+ /* Send framebuffer write message: XXX: acc0? */
+-send (16) 0 null g0<8,8,1>UW write (
++send (16) 0 acc0<1>UW g0<8,8,1>UW write (
+ 0, /* binding table index 0 */
+ 8, /* pixel scoreboard clear */
+ 4, /* render target write */
+--- src/wm_prog.h
++++ src/wm_prog.h
+@@ -71,7 +71,7 @@
+ { 0x00600041, 0x20007fbc, 0x008d0220, 0x40011687 },
+ { 0x80600048, 0x21007fbe, 0x008d01e0, 0x3f800000 },
+ { 0x00600201, 0x20200022, 0x008d0020, 0x00000000 },
+- { 0x00800031, 0x20001d3c, 0x008d0000, 0x85a04800 },
++ { 0x00800031, 0x24001d28, 0x008d0000, 0x85a04800 },
+ { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+ { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
+ { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.2-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..089bc52d32c1
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.7.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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-i810/xf86-video-i810-1.7.2-r1.ebuild,v 1.1 2006/11/02 03:54:41 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=3
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+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 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES="${FILESDIR}/fix_965_xv.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
+}