From 67b44900d4f80f4fd2ae3de188343221ff484bfd Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 3 Mar 2011 11:43:05 -0500 Subject: [PATCH] xf86-video-intel: Remove ebuild. This ebuild is ancient. --- x11-drivers/xf86-video-intel/Manifest | 4 - .../files/0001-i965-Xv-fix-chroma-pitch.patch | 74 ------------------- ...02-Xv-fixup-overlay-stride-confusion.patch | 37 ---------- .../xf86-video-intel-2.11.0.ebuild | 54 -------------- 4 files changed, 169 deletions(-) delete mode 100644 x11-drivers/xf86-video-intel/Manifest delete mode 100644 x11-drivers/xf86-video-intel/files/0001-i965-Xv-fix-chroma-pitch.patch delete mode 100644 x11-drivers/xf86-video-intel/files/0002-Xv-fixup-overlay-stride-confusion.patch delete mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest deleted file mode 100644 index fabe3de..0000000 --- a/x11-drivers/xf86-video-intel/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 0001-i965-Xv-fix-chroma-pitch.patch 2720 RMD160 23ab0acb4121bad484ba876d967b084a771c24b8 SHA1 c4fa5b41191d796fcb5cd42af7b8bdae1320a4e7 SHA256 536408a2e14096181948ff4da48f98a67e9fa58bcd5a78d78e1eee960189e183 -AUX 0002-Xv-fixup-overlay-stride-confusion.patch 1146 RMD160 aa10d8e51d293442e819b5bed5c741c9dae26536 SHA1 aa01f79634c986af8ab56f6315e16a4a083aa254 SHA256 c6457f3fbcebfa402a5506e05f39683a0e909ecd462d2bebe8da5644eb833a6e -DIST xf86-video-intel-2.11.0.tar.bz2 871551 RMD160 a857942e7eacd9e7c517c485fb6e400103e238f3 SHA1 f25eb8619ac7c107fdcee525388a8a03dd62719b SHA256 db292cbc25f3b132357795697a61c5ec6f08cb041a2cb6fd081298306f4f5a4f -EBUILD xf86-video-intel-2.11.0.ebuild 1488 RMD160 7efc519ad50a74fffccc0c05904793619494d333 SHA1 3ed5a7fe54e6d718c569f885157812c5a1381687 SHA256 60885d3c3b2bc42875d15b6ab200a9fb010f8e5f91d38fd2d804fd2e3e4ae20b diff --git a/x11-drivers/xf86-video-intel/files/0001-i965-Xv-fix-chroma-pitch.patch b/x11-drivers/xf86-video-intel/files/0001-i965-Xv-fix-chroma-pitch.patch deleted file mode 100644 index 567ff0c..0000000 --- a/x11-drivers/xf86-video-intel/files/0001-i965-Xv-fix-chroma-pitch.patch +++ /dev/null @@ -1,74 +0,0 @@ -From bdf0ee509c26ab35e60f3ed02549efa435be032f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Thu, 8 Apr 2010 13:29:04 +0200 -Subject: [PATCH 1/3] i965 Xv: fix chroma pitch - -In my recent fix for the chroma pitch for i915 xvmc I've forgotten about -i965 class hw. For videos with a non-even sized stride (measured in dwords) -the chroma pitch was internally incosistent and one dword off. - -Fix this by using pitch2 for the chroma pitch in i965 textured video like -everywhere else. - -Signed-off-by: Daniel Vetter -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27417 -Tested-by: Nick Bowler -Tested-by: Sven Arvidsson ---- - src/i830_video.c | 2 +- - src/i830_video.h | 2 +- - src/i965_video.c | 5 +++-- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/i830_video.c b/src/i830_video.c -index c8edcd6..45213cb 100644 ---- a/src/i830_video.c -+++ b/src/i830_video.c -@@ -1525,7 +1525,7 @@ I830PutImageTextured(ScrnInfoPtr scrn, - - if (IS_I965G(intel)) { - I965DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes, -- width, height, dstPitch, -+ width, height, dstPitch, dstPitch2, - src_w, src_h, - drw_w, drw_h, pixmap); - } else { -diff --git a/src/i830_video.h b/src/i830_video.h -index fcdae73..b5753bf 100644 ---- a/src/i830_video.h -+++ b/src/i830_video.h -@@ -76,7 +76,7 @@ void I915DisplayVideoTextured(ScrnInfoPtr scrn, - void I965DisplayVideoTextured(ScrnInfoPtr scrn, - intel_adaptor_private *adaptor_priv, - int id, RegionPtr dstRegion, short width, -- short height, int video_pitch, -+ short height, int video_pitch, int video_pitch2, - short src_w, short src_h, - short drw_w, short drw_h, PixmapPtr pixmap); - -diff --git a/src/i965_video.c b/src/i965_video.c -index 05dd2c3..c537860 100644 ---- a/src/i965_video.c -+++ b/src/i965_video.c -@@ -980,7 +980,8 @@ void - I965DisplayVideoTextured(ScrnInfoPtr scrn, - intel_adaptor_private *adaptor_priv, int id, - RegionPtr dstRegion, -- short width, short height, int video_pitch, -+ short width, short height, -+ int video_pitch, int video_pitch2, - short src_w, short src_h, - short drw_w, short drw_h, PixmapPtr pixmap) - { -@@ -1023,7 +1024,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, - src_surf_format = BRW_SURFACEFORMAT_R8_UNORM; - src_width[1] = src_width[0] = width; - src_height[1] = src_height[0] = height; -- src_pitch[1] = src_pitch[0] = video_pitch * 2; -+ src_pitch[1] = src_pitch[0] = video_pitch2; - src_width[4] = src_width[5] = src_width[2] = src_width[3] = - width / 2; - src_height[4] = src_height[5] = src_height[2] = src_height[3] = --- -1.6.4.4 - diff --git a/x11-drivers/xf86-video-intel/files/0002-Xv-fixup-overlay-stride-confusion.patch b/x11-drivers/xf86-video-intel/files/0002-Xv-fixup-overlay-stride-confusion.patch deleted file mode 100644 index ea304ff..0000000 --- a/x11-drivers/xf86-video-intel/files/0002-Xv-fixup-overlay-stride-confusion.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3d7723526b181686d62f09f81fba3ccdbf7d2b1a Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Thu, 8 Apr 2010 22:21:01 +0200 -Subject: [PATCH 2/3] Xv: fixup overlay stride confusion - -For some reason I've made a mess out of the overlay stride constrains. -Fix it up. - -Signed-off-by: Daniel Vetter -Tested-by: Calvin Walton -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27453 ---- - src/i830_video.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/i830_video.c b/src/i830_video.c -index 45213cb..c6fd78d 100644 ---- a/src/i830_video.c -+++ b/src/i830_video.c -@@ -1348,9 +1348,12 @@ i830_setup_dst_params(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, sho - pitchAlignMask = 3; - } else { - if (IS_I965G(intel)) -- pitchAlignMask = 255; -+ /* Actually the alignment is 64 bytes, too. But the -+ * stride must be at least 512 bytes. Take the easy fix -+ * and align on 512 bytes unconditionally. */ -+ pitchAlignMask = 511; - else -- pitchAlignMask = 255; -+ pitchAlignMask = 63; - } - - #if INTEL_XVMC --- -1.6.4.4 - diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild deleted file mode 100644 index e774c40..0000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 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.11.0.ebuild,v 1.1 2010/04/01 21:39:23 remi Exp $ - -EAPI=3 - -inherit linux-info xorg-2 - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.6 - >=x11-libs/libdrm-2.4.16 - x11-libs/libpciaccess - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXvMC - >=x11-libs/libxcb-1.5" -DEPEND="${RDEPEND} - >=x11-proto/dri2proto-1.99.3 - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - x11-proto/glproto )" - -pkg_setup() { - xorg-2_pkg_setup - CONFIGURE_OPTIONS="$(use_enable dri) --enable-xvmc" -} - -src_prepare() { - epatch "${FILESDIR}/0001-i965-Xv-fix-chroma-pitch.patch" - epatch "${FILESDIR}/0002-Xv-fixup-overlay-stride-confusion.patch" -} - -pkg_postinst() { - if linux_config_exists \ - && ! linux_chkconfig_present DRM_I915_KMS; then - echo - ewarn "This driver requires KMS support in your kernel" - ewarn " Device Drivers --->" - ewarn " Graphics support --->" - ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->" - ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->" - ewarn " i915 driver" - ewarn " [*] Enable modesetting on intel by default" - echo - fi -} -- 2.43.2