[gentoo-commits] proj/x11:master commit in: x11-drivers/xf86-video-intel/, x11-drivers/xf86-video-intel/files/

[Chi-Thanh Christopher Nguyen]

commit:     67dd2199847def50220db24e39b1912a8b48fc87
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 18:04:49 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Jan 26 18:04:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=67dd2199

x11-drivers/xf86-video-intel: remove ebuild that is in portage now

---
 ...15-handle-updates-to-DamageUnregister-API.patch | 24 -------
 .../xf86-video-intel-2.21.15.ebuild                | 74 ----------------------
 2 files changed, 98 deletions(-)

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch
deleted file mode 100644
index 1dc79ba..0000000
--- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.21.15-handle-updates-to-DamageUnregister-API.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@×××××××××××××××.uk>
-Date: Sat, 05 Oct 2013 17:42:24 +0000
-Subject: compat-api: Map changes of DamageUnregister API in 1.14.99.2
-
-Reported-by: Emmanuel Benisty <benisty.e@×××××.com>
-Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
----
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 8eb46ef..244a486 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap)
- 	if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
- #endif
- 
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
-+#define DamageUnregister(d, dd) DamageUnregister(dd)
-+#endif
-+
- #endif
---
-cgit v0.9.0.2-2-gbebe
-

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild
deleted file mode 100644
index a5073a7..0000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="|| ( glamor sna uxa )"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/resourceproto"
-
-src_prepare() {
-	# wrong variable name, fix configure directly to avoid autoreconf
-	# see bug #490342
-	sed -e "s/DRI_CFLAGS/DRI1_CFLAGS/g" -i configure
-	# see bug #496682
-	epatch "${FILESDIR}/${PN}-2.21.15-handle-updates-to-DamageUnregister-API.patch"
-	xorg-2_src_prepare
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-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
-}