From b20de0224b0c7ee97b4c8b7fb160251c1df44b01 Mon Sep 17 00:00:00 2001 From: Rémi Cardona Date: Thu, 5 Mar 2009 14:02:43 +0000 Subject: x11-drivers/xf86-video-intel: bump to 2.6.3 (without p.mask this time) (Portage version: 2.2_rc23/cvs/Linux x86_64) --- x11-drivers/xf86-video-intel/ChangeLog | 9 +- ...n-page-generation-and-remove-all-traces-o.patch | 117 +++++++++++++++++++++ .../xf86-video-intel/xf86-video-intel-2.6.3.ebuild | 34 ++++++ 3 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 x11-drivers/xf86-video-intel/files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch create mode 100644 x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild (limited to 'x11-drivers/xf86-video-intel') diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog index b99bcb65683b..195b1778d2ba 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.14 2009/02/28 10:38:34 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.15 2009/03/05 14:02:43 remi Exp $ + +*xf86-video-intel-2.6.3 (05 Mar 2009) + + 05 Mar 2009; 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.ebuild: + bump to 2.6.3 (without p.mask this time) 28 Feb 2009; Rémi Cardona +files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.pat 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 new file mode 100644 index 000000000000..132acca1a206 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch @@ -0,0 +1,117 @@ +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/xf86-video-intel-2.6.3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild new file mode 100644 index 000000000000..29de9f1629ec --- /dev/null +++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.3.ebuild @@ -0,0 +1,34 @@ +# 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.ebuild,v 1.1 2009/03/05 14:02:43 remi Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +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.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" +) -- cgit v1.2.3-65-gdbad