diff options
Diffstat (limited to 'x11-drivers')
3 files changed, 70 insertions, 1 deletions
diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog index a0310c4b4dc7..e8a9e7b0bf4c 100644 --- a/x11-drivers/xf86-video-intel/ChangeLog +++ b/x11-drivers/xf86-video-intel/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-video-intel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.17 2009/03/13 15:36:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.18 2009/03/21 00:59:35 remi Exp $ + +*xf86-video-intel-2.6.3-r1 (21 Mar 2009) + + 21 Mar 2009; Rémi Cardona <remi@gentoo.org> + +files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch, + +xf86-video-intel-2.6.3-r1.ebuild: + backport patch to fix Xv (fixes bug #261531) 13 Mar 2009; Raúl Porcel <armin76@gentoo.org> xf86-video-intel-1.6.5.ebuild, xf86-video-intel-1.7.4.ebuild, diff --git a/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch b/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch new file mode 100644 index 000000000000..0c8ed8326795 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch @@ -0,0 +1,27 @@ +From 2484b1ed2162c5b96173fd1b07ad3421d0dec5c2 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <kalev@smartlink.ee> +Date: Fri, 13 Mar 2009 21:32:08 +0200 +Subject: [PATCH 2/2] Fix Xv crash with overlay video. + +Bug #20585. +(cherry picked from commit 2026c57cf0a352d9e6f9d208cfb7d4d550614477) +--- + src/i830_video.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/i830_video.c b/src/i830_video.c +index c9a0181..0698107 100644 +--- a/src/i830_video.c ++++ b/src/i830_video.c +@@ -1404,7 +1404,7 @@ I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, + dst_base = pPriv->buf->virtual; + } else { + drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE); +- dst_base = pI830->FbBase + pPriv->buf->offset; ++ dst_base = pI830->FbBase; + } + + if (pPriv->currentBuf == 0) +-- +1.6.2 + diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild new file mode 100644 index 000000000000..110d5768bba2 --- /dev/null +++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild,v 1.1 2009/03/21 00:59:35 remi Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular + +DESCRIPTION="X.Org driver for Intel cards" + +KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd" +IUSE="dri" + +RDEPEND=">=x11-base/xorg-server-1.5 + x11-libs/libXvMC" +DEPEND="${RDEPEND} + >=x11-proto/dri2proto-1.99.3 + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xineramaproto + x11-proto/glproto + x11-proto/xextproto + x11-proto/xproto + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2.4.5 + x11-libs/libX11 )" + +CONFIGURE_OPTIONS="$(use_enable dri)" + +PATCHES=( +"${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch" +"${FILESDIR}/${PV}-0002-Fix-Xv-crash-with-overlay-video.patch" +) |