From 64e3b0e60bcfa5056a99b4f120f67ea8b5417d50 Mon Sep 17 00:00:00 2001 From: Remi Cardona Date: Sun, 14 Mar 2010 22:33:55 +0000 Subject: x11-drivers/xf86-video-intel: drop old ebuilds Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- x11-drivers/xf86-video-intel/ChangeLog | 9 +- x11-drivers/xf86-video-intel/Manifest | 10 +- ...n-page-generation-and-remove-all-traces-o.patch | 117 --------------------- ....6.3-0002-Fix-Xv-crash-with-overlay-video.patch | 27 ----- .../xf86-video-intel-2.6.3-r1.ebuild | 37 ------- .../xf86-video-intel/xf86-video-intel-2.7.1.ebuild | 32 ------ .../xf86-video-intel/xf86-video-intel-2.9.0.ebuild | 34 ------ 7 files changed, 9 insertions(+), 257 deletions(-) delete mode 100644 x11-drivers/xf86-video-intel/files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch delete mode 100644 x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch delete mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild delete mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.7.1.ebuild delete mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0.ebuild (limited to 'x11-drivers') diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog index 0ca5057f82db..9871779c4819 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.47 2010/01/18 19:39:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.48 2010/03/14 22:33:54 remi Exp $ + + 14 Mar 2010; Rémi Cardona + -files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.pat + ch, -xf86-video-intel-2.6.3-r1.ebuild, -xf86-video-intel-2.7.1.ebuild, + -xf86-video-intel-2.9.0.ebuild, + -files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch: + drop old ebuilds 18 Jan 2010; Raúl Porcel xf86-video-intel-2.9.1.ebuild: diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest index 1b5d4d16c651..3ab3103c4c9b 100644 --- a/x11-drivers/xf86-video-intel/Manifest +++ b/x11-drivers/xf86-video-intel/Manifest @@ -1,17 +1,9 @@ -AUX 2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 RMD160 c8526c1814d59f4114e6c9cc6fe1e7c32598fd46 SHA1 e566804c2677c7f8fae5d97f9a883f162cd3c649 SHA256 78e20343a166d11f2c3bb5be0456bbd74758bc9a98e9aeefce75e0918923347c -AUX 2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch 809 RMD160 6f6d7f25efddeb2db9d35e2ea92d408a54af5a56 SHA1 2208274bb58f76503cf2d10d236e6591c48681cf SHA256 4236e01b101a69ca27dfc9c06c367d2b0a381afa343dc3a2b65504559b24fc3c AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347 DIST xf86-video-intel-2.10.0.tar.bz2 885299 RMD160 e37d47758231d61d99fa65873884727b44623c33 SHA1 1683eddf89ed88f109cb2fe46284e3f8f304a0d9 SHA256 e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab -DIST xf86-video-intel-2.6.3.tar.bz2 790275 RMD160 7b31866c2fd42fbb2d46efb137bf968d80221fb1 SHA1 96fe7e8b804ab8833b1d462f99c08be29bb9e283 SHA256 b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258 -DIST xf86-video-intel-2.7.1.tar.bz2 780625 RMD160 25208fe03f0fe849974a703f4a81e734e67cad18 SHA1 f863ee65b4b7779077af9f819b07033264284628 SHA256 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 DIST xf86-video-intel-2.8.1.tar.bz2 748928 RMD160 9416290dcbc7631f165a3378bf7aa189a1dea880 SHA1 76ae4c8fbd14a7a16e3f8dc2f2588947635db2bc SHA256 c6778fc7e43c701d5829514329ee70f5dc539ff8f5b3c79587577b617a535c81 -DIST xf86-video-intel-2.9.0.tar.bz2 791890 RMD160 71fbffb7ddbaf320c146b98d34d47422cd36980e SHA1 62e29344824a5de421178fec568d7ff0688309f8 SHA256 69f4f4992ceee24ab3dace23abdd995c2fc776538732d7e2457b7c21b8142e51 DIST xf86-video-intel-2.9.1.tar.bz2 789001 RMD160 2ccac37af91ec10973c9dc22adc9f172a8ac057a SHA1 ca5887df67ec46f27eeeaf8158048d6500333ccf SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 EBUILD xf86-video-intel-2.10.0.ebuild 799 RMD160 c598ff8c59c256be892eeb863d44358223341138 SHA1 7dd040f731599b2c7a3d14a34eca51827b94fb6b SHA256 d5658bc56688a44a7987887b4672f9097d3df18dded2a70ee60d7ea4e750f64a -EBUILD xf86-video-intel-2.6.3-r1.ebuild 971 RMD160 57dd223b3cadcd1f22b590e60ee50de199cf2608 SHA1 07801544e8c0538e2d3a0d8f8c5961929f7cf52e SHA256 38f6e974c24a05bb1b5dc5454552388fd6171036617998f1ae9273b7a6f434e6 -EBUILD xf86-video-intel-2.7.1.ebuild 812 RMD160 71f55b4d6dcf7a59d6d6263171cf1b39668ef678 SHA1 35f01a7124fa98968ea20c5265cd7d1a530654f3 SHA256 7ff62d754a4750253f074543c752bfcb5d8bbbe2d03edce8567c9ffc2bbc8e14 EBUILD xf86-video-intel-2.8.1.ebuild 810 RMD160 f516c452a6b13354529fa47a93fe3bfabb77e4a0 SHA1 a5764d81c92ed60cedce493dc5a1770d156e0779 SHA256 e022006015034d3c2481a670df34668ae48a82fe12d5c6476e72aa21ede0453f -EBUILD xf86-video-intel-2.9.0.ebuild 855 RMD160 aae1a09b97dab3264ed67f75d21279318a392cbe SHA1 dbf348ed3cc429e98e2de7bbac0d219d768a4c15 SHA256 fdbc5148843c3483f339162cf30d571f19e0a09742809b5f20ff14263a0c5636 EBUILD xf86-video-intel-2.9.1.ebuild 791 RMD160 ee50e0d9a6f45bf9799e9f55ecece68a8df79255 SHA1 fc5d1759327e852030a9bae8d1b16bc8fe5f4167 SHA256 f8774f0096595f4d43059e0b0d196409d0b756697a2396842616aa44cea06b10 -MISC ChangeLog 38186 RMD160 26e52f9b4fb1dcd67791ba57ca4d808efbd7d002 SHA1 b2a3f1768ddcb66b5fd1c1656d4ae858de505dcf SHA256 fa327592f1796ae9b5e4fdb80b118ed7b8f6ae07f521060c817840ec6d923694 +MISC ChangeLog 38493 RMD160 67dee32873d1ee3e97be34addcda9336398bc363 SHA1 c108250a3f3b35cd7b5244a16037aa2696ffb25d SHA256 9982339a894668cd6039ee05df04c9b1c2ab8f0e608efc03304a20426a0d8d48 MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc diff --git a/x11-drivers/xf86-video-intel/files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch b/x11-drivers/xf86-video-intel/files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch deleted file mode 100644 index 132acca1a206..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= -Date: Fri, 14 Nov 2008 13:55:52 +0100 -Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver - ---- - man/Makefile.am | 20 ++------------------ - src/Makefile.am | 6 ------ - src/i810.h | 1 - - src/i810_driver.c | 19 +------------------ - 4 files changed, 3 insertions(+), 43 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 7432d5a..ac08621 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -25,21 +25,12 @@ - # - - drivermandir = $(DRIVER_MAN_DIR) -+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) - --DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%) -- --driverman_PRE = @DRIVER_NAME@.man -- --driverman_DATA = \ -- $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \ -- i810.@DRIVER_MAN_SUFFIX@ -- --EXTRA_DIST = @DRIVER_NAME@.man -+EXTRA_DIST = $(DRIVER_NAME).man - - CLEANFILES = $(driverman_DATA) - --SED = sed -- - # Strings to replace in man pages - XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 -@@ -60,10 +51,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ -- --BUILT_SOURCES = shadows.DONE -- --shadows.DONE: -- -rm -f i810.@DRIVER_MAN_SUFFIX@ -- echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \ -- i810.@DRIVER_MAN_SUFFIX@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 232ac53..8e3cfad 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -222,9 +222,3 @@ if XVMC - intel_drv_la_SOURCES += \ - $(INTEL_XVMC_SRCS) - endif -- --install-data-local: install-intel_drv_laLTLIBRARIES -- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so) -- --uninstall-local: -- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) -diff --git a/src/i810.h b/src/i810.h -index 7ea2043..c88771e 100644 ---- a/src/i810.h -+++ b/src/i810.h -@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #define I810_VERSION 4000 - #define I810_NAME "intel" - #define I810_DRIVER_NAME "intel" --#define I810_LEGACY_DRIVER_NAME "i810" - - #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR - #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR -diff --git a/src/i810_driver.c b/src/i810_driver.c -index cc28ad8..404789d 100644 ---- a/src/i810_driver.c -+++ b/src/i810_driver.c -@@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = { - - _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; - --static XF86ModuleVersionInfo i810VersRec = { -- "i810", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, -- ABI_CLASS_VIDEODRV, -- ABI_VIDEODRV_VERSION, -- MOD_CLASS_VIDEODRV, -- {0, 0, 0, 0} --}; -- --_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL }; -- - static pointer - i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) - { -@@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags) - * driver, and return if there are none. - */ - if ((numDevSections = -- xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 && -- (numDevSections = -- xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) { -+ xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) { - return FALSE; - } - --- -1.6.0.3 - 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 deleted file mode 100644 index 0c8ed8326795..000000000000 --- a/x11-drivers/xf86-video-intel/files/2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2484b1ed2162c5b96173fd1b07ad3421d0dec5c2 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -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 deleted file mode 100644 index 9e632ccaf1b1..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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.6 2010/01/23 20:11:15 scarabeus 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 )" - -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" -) - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.7.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.7.1.ebuild deleted file mode 100644 index 1e01a5f3865c..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.7.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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.7.1.ebuild,v 1.2 2010/01/23 20:11:15 scarabeus 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.6 - x11-libs/libX11 )" - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0.ebuild deleted file mode 100644 index d8283ba9af54..000000000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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.9.0.ebuild,v 1.1 2009/09/29 16:19:08 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.6 - >=x11-libs/libdrm-2.4.11 - x11-libs/libpciaccess - x11-libs/libXext - x11-libs/libXfixes - 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/xextproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - x11-proto/glproto )" - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable dri)" -} -- cgit v1.2.3-65-gdbad