| 1 |
remi 09/02/26 23:22:30 |
| 2 |
|
| 3 |
Added: |
| 4 |
2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch |
| 5 |
Log: |
| 6 |
x11-drivers/xf86-video-intel: bump to 2.6.2, under p.mask as the ChangeLog is scary |
| 7 |
(Portage version: 2.2_rc23/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-drivers/xf86-video-intel/files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 2.6.2-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch |
| 16 |
=================================================================== |
| 17 |
From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@g.o> |
| 19 |
Date: Fri, 14 Nov 2008 13:55:52 +0100 |
| 20 |
Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver |
| 21 |
|
| 22 |
--- |
| 23 |
man/Makefile.am | 20 ++------------------ |
| 24 |
src/Makefile.am | 6 ------ |
| 25 |
src/i810.h | 1 - |
| 26 |
src/i810_driver.c | 19 +------------------ |
| 27 |
4 files changed, 3 insertions(+), 43 deletions(-) |
| 28 |
|
| 29 |
diff --git a/man/Makefile.am b/man/Makefile.am |
| 30 |
index 7432d5a..ac08621 100644 |
| 31 |
--- a/man/Makefile.am |
| 32 |
+++ b/man/Makefile.am |
| 33 |
@@ -25,21 +25,12 @@ |
| 34 |
# |
| 35 |
|
| 36 |
drivermandir = $(DRIVER_MAN_DIR) |
| 37 |
+driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) |
| 38 |
|
| 39 |
-DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%) |
| 40 |
- |
| 41 |
-driverman_PRE = @DRIVER_NAME@.man |
| 42 |
- |
| 43 |
-driverman_DATA = \ |
| 44 |
- $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \ |
| 45 |
- i810.@DRIVER_MAN_SUFFIX@ |
| 46 |
- |
| 47 |
-EXTRA_DIST = @DRIVER_NAME@.man |
| 48 |
+EXTRA_DIST = $(DRIVER_NAME).man |
| 49 |
|
| 50 |
CLEANFILES = $(driverman_DATA) |
| 51 |
|
| 52 |
-SED = sed |
| 53 |
- |
| 54 |
# Strings to replace in man pages |
| 55 |
XORGRELSTRING = @PACKAGE_STRING@ |
| 56 |
XORGMANNAME = X Version 11 |
| 57 |
@@ -60,10 +51,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man |
| 58 |
|
| 59 |
.man.$(DRIVER_MAN_SUFFIX): |
| 60 |
sed $(MAN_SUBSTS) < $< > $@ |
| 61 |
- |
| 62 |
-BUILT_SOURCES = shadows.DONE |
| 63 |
- |
| 64 |
-shadows.DONE: |
| 65 |
- -rm -f i810.@DRIVER_MAN_SUFFIX@ |
| 66 |
- echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \ |
| 67 |
- i810.@DRIVER_MAN_SUFFIX@ |
| 68 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 69 |
index 232ac53..8e3cfad 100644 |
| 70 |
--- a/src/Makefile.am |
| 71 |
+++ b/src/Makefile.am |
| 72 |
@@ -222,9 +222,3 @@ if XVMC |
| 73 |
intel_drv_la_SOURCES += \ |
| 74 |
$(INTEL_XVMC_SRCS) |
| 75 |
endif |
| 76 |
- |
| 77 |
-install-data-local: install-intel_drv_laLTLIBRARIES |
| 78 |
- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so) |
| 79 |
- |
| 80 |
-uninstall-local: |
| 81 |
- (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so) |
| 82 |
diff --git a/src/i810.h b/src/i810.h |
| 83 |
index 7ea2043..c88771e 100644 |
| 84 |
--- a/src/i810.h |
| 85 |
+++ b/src/i810.h |
| 86 |
@@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 87 |
#define I810_VERSION 4000 |
| 88 |
#define I810_NAME "intel" |
| 89 |
#define I810_DRIVER_NAME "intel" |
| 90 |
-#define I810_LEGACY_DRIVER_NAME "i810" |
| 91 |
|
| 92 |
#define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR |
| 93 |
#define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR |
| 94 |
diff --git a/src/i810_driver.c b/src/i810_driver.c |
| 95 |
index cc28ad8..404789d 100644 |
| 96 |
--- a/src/i810_driver.c |
| 97 |
+++ b/src/i810_driver.c |
| 98 |
@@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = { |
| 99 |
|
| 100 |
_X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL }; |
| 101 |
|
| 102 |
-static XF86ModuleVersionInfo i810VersRec = { |
| 103 |
- "i810", |
| 104 |
- MODULEVENDORSTRING, |
| 105 |
- MODINFOSTRING1, |
| 106 |
- MODINFOSTRING2, |
| 107 |
- XORG_VERSION_CURRENT, |
| 108 |
- INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, |
| 109 |
- ABI_CLASS_VIDEODRV, |
| 110 |
- ABI_VIDEODRV_VERSION, |
| 111 |
- MOD_CLASS_VIDEODRV, |
| 112 |
- {0, 0, 0, 0} |
| 113 |
-}; |
| 114 |
- |
| 115 |
-_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL }; |
| 116 |
- |
| 117 |
static pointer |
| 118 |
i810Setup(pointer module, pointer opts, int *errmaj, int *errmin) |
| 119 |
{ |
| 120 |
@@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags) |
| 121 |
* driver, and return if there are none. |
| 122 |
*/ |
| 123 |
if ((numDevSections = |
| 124 |
- xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 && |
| 125 |
- (numDevSections = |
| 126 |
- xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) { |
| 127 |
+ xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) { |
| 128 |
return FALSE; |
| 129 |
} |
| 130 |
|
| 131 |
-- |
| 132 |
1.6.0.3 |
Archives