Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Remi Cardona (remi)" <remi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-intel/files: 2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch 2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch 2.5.0-0002-clean-up-man-pages-generation-and-installation.patch 2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
Date: Tue, 28 Oct 2008 13:52:43
Message-Id: E1Kuozw-0001Kw-Vi@stork.gentoo.org
1 remi 08/10/28 13:52:40
2
3 Added:
4 2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
5 2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
6 2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
7 2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
8 Log:
9 x11-drivers/xf86-video-intel: bump to 2.5.0 with patches to remove old symlinks
10 (Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64)
11
12 Revision Changes Path
13 1.1 x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch?rev=1.1&content-type=text/plain
17
18 Index: 2.5.0-0004-add-a-configure-switch-for-pre-2.0-compatibility-sym.patch
19 ===================================================================
20 From ef7a85624b6bf3ab9935c8a797978a18e6334dec Mon Sep 17 00:00:00 2001
21 From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@×××.fr>
22 Date: Wed, 22 Oct 2008 12:15:35 +0200
23 Subject: [PATCH 4/4] add a configure switch for pre-2.0 compatibility symlinks
24
25 Conflicts:
26
27 configure.ac
28 ---
29 configure.ac | 8 ++++++++
30 man/Makefile.am | 7 ++++---
31 src/Makefile.am | 2 ++
32 3 files changed, 14 insertions(+), 3 deletions(-)
33
34 diff --git a/configure.ac b/configure.ac
35 index 36852aa..b725acf 100644
36 --- a/configure.ac
37 +++ b/configure.ac
38 @@ -81,6 +81,11 @@ AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
39 [KMS="$enableval"],
40 [KMS=no])
41
42 +AC_ARG_ENABLE(symlinks, AC_HELP_STRING([--enable-symlinks],
43 + [Disable old "i810" symlinks [[default=yes]]]),
44 + [SYMLINKS="$enableval"],
45 + [SYMLINKS="yes"])
46 +
47 # Checks for extensions
48 XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
49 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
50 @@ -262,6 +267,9 @@ if test "$XVMC" = yes; then
51 AC_SUBST([XVMCLIB_CFLAGS])
52 fi
53
54 +AC_MSG_CHECKING([whether to setup old "i810" symlinks])
55 +AC_MSG_RESULT([$SYMLINKS])
56 +AM_CONDITIONAL(SYMLINKS, [test "$SYMLINKS" = "yes"])
57
58 AC_SUBST([DRI_CFLAGS])
59 AC_SUBST([XORG_CFLAGS])
60 diff --git a/man/Makefile.am b/man/Makefile.am
61 index 2a1cc81..b07b3f0 100644
62 --- a/man/Makefile.am
63 +++ b/man/Makefile.am
64 @@ -25,9 +25,10 @@
65 #
66
67 drivermandir = $(DRIVER_MAN_DIR)
68 -driverman_DATA = \
69 - $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) \
70 - i810.$(DRIVER_MAN_SUFFIX)
71 +driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
72 +if SYMLINKS
73 +driverman_DATA += i810.$(DRIVER_MAN_SUFFIX)
74 +endif
75
76 EXTRA_DIST = $(DRIVER_NAME).man
77
78 diff --git a/src/Makefile.am b/src/Makefile.am
79 index b16ba6c..881fbaa 100644
80 --- a/src/Makefile.am
81 +++ b/src/Makefile.am
82 @@ -223,8 +223,10 @@ intel_drv_la_SOURCES += \
83 $(INTEL_XVMC_SRCS)
84 endif
85
86 +if SYMLINKS
87 install-exec-hook:
88 (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so)
89
90 uninstall-hook:
91 (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
92 +endif
93 --
94 1.6.0.2
95
96
97
98
99 1.1 x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
100
101 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch?rev=1.1&view=markup
102 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch?rev=1.1&content-type=text/plain
103
104 Index: 2.5.0-0003-use-standard-automake-macros-for-handling-symlinks.patch
105 ===================================================================
106 From d437f3107635a85486faae15e48a7237b6d69e42 Mon Sep 17 00:00:00 2001
107 From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@×××.fr>
108 Date: Mon, 20 Oct 2008 13:17:32 +0200
109 Subject: [PATCH 3/4] use standard automake macros for handling symlinks
110
111 ---
112 configure.ac | 1 +
113 src/Makefile.am | 6 +++---
114 2 files changed, 4 insertions(+), 3 deletions(-)
115
116 diff --git a/configure.ac b/configure.ac
117 index a53b225..36852aa 100644
118 --- a/configure.ac
119 +++ b/configure.ac
120 @@ -40,6 +40,7 @@ AC_PROG_LIBTOOL
121 DOLT
122 AC_PROG_CC
123 AM_PROG_CC_C_O
124 +AC_PROG_LN_S
125
126 AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no)
127 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
128 diff --git a/src/Makefile.am b/src/Makefile.am
129 index 9b32215..b16ba6c 100644
130 --- a/src/Makefile.am
131 +++ b/src/Makefile.am
132 @@ -223,8 +223,8 @@ intel_drv_la_SOURCES += \
133 $(INTEL_XVMC_SRCS)
134 endif
135
136 -install-data-local: install-intel_drv_laLTLIBRARIES
137 - (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
138 +install-exec-hook:
139 + (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && $(LN_S) intel_drv.so i810_drv.so)
140
141 -uninstall-local:
142 +uninstall-hook:
143 (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
144 --
145 1.6.0.2
146
147
148
149
150 1.1 x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
151
152 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch?rev=1.1&view=markup
153 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0002-clean-up-man-pages-generation-and-installation.patch?rev=1.1&content-type=text/plain
154
155 Index: 2.5.0-0002-clean-up-man-pages-generation-and-installation.patch
156 ===================================================================
157 From 7b847b328e314ac24cdad56dc9846a06b9d44e23 Mon Sep 17 00:00:00 2001
158 From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@×××.fr>
159 Date: Mon, 20 Oct 2008 11:27:36 +0200
160 Subject: [PATCH 2/4] clean up man pages generation and installation
161
162 ---
163 man/Makefile.am | 21 +++++----------------
164 1 files changed, 5 insertions(+), 16 deletions(-)
165
166 diff --git a/man/Makefile.am b/man/Makefile.am
167 index 7432d5a..2a1cc81 100644
168 --- a/man/Makefile.am
169 +++ b/man/Makefile.am
170 @@ -25,21 +25,14 @@
171 #
172
173 drivermandir = $(DRIVER_MAN_DIR)
174 -
175 -DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
176 -
177 -driverman_PRE = @DRIVER_NAME@.man
178 -
179 driverman_DATA = \
180 - $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
181 - i810.@DRIVER_MAN_SUFFIX@
182 + $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) \
183 + i810.$(DRIVER_MAN_SUFFIX)
184
185 -EXTRA_DIST = @DRIVER_NAME@.man
186 +EXTRA_DIST = $(DRIVER_NAME).man
187
188 CLEANFILES = $(driverman_DATA)
189
190 -SED = sed
191 -
192 # Strings to replace in man pages
193 XORGRELSTRING = @PACKAGE_STRING@
194 XORGMANNAME = X Version 11
195 @@ -61,9 +54,5 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
196 .man.$(DRIVER_MAN_SUFFIX):
197 sed $(MAN_SUBSTS) < $< > $@
198
199 -BUILT_SOURCES = shadows.DONE
200 -
201 -shadows.DONE:
202 - -rm -f i810.@DRIVER_MAN_SUFFIX@
203 - echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
204 - i810.@DRIVER_MAN_SUFFIX@
205 +i810.$(DRIVER_MAN_SUFFIX):
206 + echo .so man$(DRIVER_MAN_SUFFIX)/$(DRIVER_NAME).$(DRIVER_MAN_SUFFIX) > $@
207 --
208 1.6.0.2
209
210
211
212
213 1.1 x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
214
215 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch?rev=1.1&view=markup
216 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/xf86-video-intel/files/2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch?rev=1.1&content-type=text/plain
217
218 Index: 2.5.0-0001-Default-kernel-mode-setting-to-off-add-configure-fl.patch
219 ===================================================================
220 From c07321e220df325c315f2138b05ef70146fed5ad Mon Sep 17 00:00:00 2001
221 From: Dave Airlie <airlied@×××××.ie>
222 Date: Mon, 20 Oct 2008 18:46:49 -0700
223 Subject: [PATCH 1/4] Default kernel mode setting to off, add configure flag to enable
224
225 Should help avoid unpleasantness.
226 ---
227 configure.ac | 21 ++++++++++++++-------
228 1 files changed, 14 insertions(+), 7 deletions(-)
229
230 diff --git a/configure.ac b/configure.ac
231 index 67ccbdf..a53b225 100644
232 --- a/configure.ac
233 +++ b/configure.ac
234 @@ -75,6 +75,11 @@ AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
235 [XVMC="$enableval"],
236 [XVMC=auto])
237
238 +AC_ARG_ENABLE(kms, AC_HELP_STRING([--enable-kms],
239 + [Enable kernel mode setting support [[default=no]]]),
240 + [KMS="$enableval"],
241 + [KMS=no])
242 +
243 # Checks for extensions
244 XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
245 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
246 @@ -107,13 +112,15 @@ if test x$DRI != xno; then
247 [have_dristruct_h="yes"], [have_dristruct_h="no"])
248 AC_CHECK_FILE([${sdkdir}/damage.h],
249 [have_damage_h="yes"], [have_damage_h="no"])
250 - AC_CHECK_HEADER(xf86drmMode.h,
251 - [DRM_MODE=yes],[DRM_MODE=no]
252 - [#include "stdint.h"])
253 - dnl exaGetPixmapDriverPrivate required for DRM_MODE.
254 - PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
255 - if test "x$DRM_MODE" = xyes; then
256 - AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
257 + if test x$KMS != xno; then
258 + AC_CHECK_HEADER(xf86drmMode.h,
259 + [DRM_MODE=yes],[DRM_MODE=no]
260 + [#include "stdint.h"])
261 + dnl exaGetPixmapDriverPrivate required for DRM_MODE.
262 + PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], [], [DRM_MODE=no])
263 + if test "x$DRM_MODE" = xyes; then
264 + AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
265 + fi
266 fi
267 fi
268 AC_MSG_CHECKING([whether to include DRI support])
269 --
270 1.6.0.2
Report Message
Find on MARC Find on Google Groups