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

Gentoo Archives: gentoo-commits

From: "Donnie Berkholz (dberkholz)" <dberkholz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/mesa: mesa-6.5.2.ebuild mesa-6.5.1-r1.ebuild mesa-6.5-r3.ebuild ChangeLog mesa-7.0.1.ebuild mesa-6.5.3.ebuild mesa-6.5.1-r4.ebuild mesa-6.5.2-r1.ebuild
Date: Tue, 09 Oct 2007 08:33:40
Message-Id: E1IfANh-0008SB-Tf@stork.gentoo.org
1 dberkholz 07/10/09 08:23:57
2
3 Modified: mesa-6.5.2.ebuild mesa-6.5.1-r1.ebuild
4 mesa-6.5-r3.ebuild ChangeLog mesa-7.0.1.ebuild
5 mesa-6.5.3.ebuild mesa-6.5.1-r4.ebuild
6 mesa-6.5.2-r1.ebuild
7 Log:
8 Fix quoting issues caught by latest repoman.
9 (Portage version: 2.1.3.12)
10
11 Revision Changes Path
12 1.9 media-libs/mesa/mesa-6.5.2.ebuild
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild?rev=1.9&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild?rev=1.9&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild?r1=1.8&r2=1.9
17
18 Index: mesa-6.5.2.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v
21 retrieving revision 1.8
22 retrieving revision 1.9
23 diff -u -r1.8 -r1.9
24 --- mesa-6.5.2.ebuild 12 Aug 2007 05:12:36 -0000 1.8
25 +++ mesa-6.5.2.ebuild 9 Oct 2007 08:23:57 -0000 1.9
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2007 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.8 2007/08/12 05:12:36 dberkholz Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.9 2007/10/09 08:23:57 dberkholz Exp $
31
32 inherit eutils toolchain-funcs multilib flag-o-matic portability
33
34 @@ -107,7 +107,7 @@
35 HOSTCONF="${S}/configs/${CONFIG}"
36
37 unpack ${A}
38 - cd ${S}
39 + cd "${S}"
40
41 # FreeBSD 6.* doesn't have posix_memalign().
42 [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
43 @@ -119,21 +119,21 @@
44 fi
45
46 # Set up libdir
47 - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
48 + echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
49
50 # Set default dri drivers directory
51 - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
52 + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
53
54 # Do we want thread-local storage (TLS)?
55 if use nptl; then
56 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
57 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
58 fi
59
60 - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
61 + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
62 if use xcb; then
63 - echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
64 - echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
65 - echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
66 + echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
67 + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
68 + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
69 fi
70
71 # Configurable DRI drivers
72 @@ -175,51 +175,51 @@
73 fi
74
75 # Set drivers to everything on which we ran add_drivers()
76 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
77 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
78
79 if use hardened; then
80 einfo "Deactivating assembly code for hardened build"
81 - echo "ASM_FLAGS =" >> ${HOSTCONF}
82 - echo "ASM_SOURCES =" >> ${HOSTCONF}
83 - echo "ASM_API =" >> ${HOSTCONF}
84 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
85 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
86 + echo "ASM_API =" >> "${HOSTCONF}"
87 fi
88
89 if use sparc; then
90 einfo "Sparc assembly code is not working; deactivating"
91 - echo "ASM_FLAGS =" >> ${HOSTCONF}
92 - echo "ASM_SOURCES =" >> ${HOSTCONF}
93 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
94 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
95 fi
96
97 # Replace hardcoded /usr/X11R6 with this
98 - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
99 + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
100
101 - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
102 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
103 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
104 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
105 + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
106 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
107 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
108 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
109 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
110 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
111 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
112
113 # Removed glut, since we have separate freeglut/glut ebuilds
114 # Remove EGL, since Brian Paul says it's not ready for a release
115 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
116 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
117
118 # Get rid of glut includes
119 - rm -f ${S}/include/GL/glut*h
120 + rm -f "${S}"/include/GL/glut*h
121
122 # r200 breaks without this, since it's the only EGL-enabled driver so far
123 - echo "USING_EGL = 0" >> ${HOSTCONF}
124 + echo "USING_EGL = 0" >> "${HOSTCONF}"
125
126 # Don't build EGL demos. EGL isn't ready for release, plus they produce a
127 # circular dependency with glut.
128 - echo "PROGRAM_DIRS =" >> ${HOSTCONF}
129 + echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
130
131 # Documented in configs/default
132 if use motif; then
133 # Add -lXm
134 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
135 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
136 # Add GLwMDrawA.c
137 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
138 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
139 fi
140 }
141
142 @@ -236,11 +236,11 @@
143 install || die "Installation failed"
144
145 if ! use motif; then
146 - rm ${D}/usr/include/GL/GLwMDrawA.h
147 + rm "${D}"/usr/include/GL/GLwMDrawA.h
148 fi
149
150 # Don't install private headers
151 - rm ${D}/usr/include/GL/GLw*P.h
152 + rm "${D}"/usr/include/GL/GLw*P.h
153
154 fix_opengl_symlinks
155 dynamic_libgl_install
156 @@ -248,17 +248,17 @@
157 # Install libtool archives
158 insinto /usr/$(get_libdir)
159 # (#67729) Needs to be lib, not $(get_libdir)
160 - doins ${FILESDIR}/lib/libGLU.la
161 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
162 - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
163 + doins "${FILESDIR}"/lib/libGLU.la
164 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
165 + > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
166
167 # On *BSD libcs dlopen() and similar functions are present directly in
168 # libc.so and does not require linking to libdl. portability eclass takes
169 # care of finding the needed library (if needed) witht the dlopen_lib
170 # function.
171 sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
172 - ${D}/usr/$(get_libdir)/libGLU.la \
173 - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
174 + "${D}"/usr/$(get_libdir)/libGLU.la \
175 + "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
176
177 # Create the two-number versioned libs (.so.#.#), since only .so.# and
178 # .so.#.#.# were made
179 @@ -279,7 +279,7 @@
180 fix_opengl_symlinks() {
181 # Remove invalid symlinks
182 local LINK
183 - for LINK in $(find ${D}/usr/$(get_libdir) \
184 + for LINK in $(find "${D}"/usr/$(get_libdir) \
185 -name libGL\.* -type l); do
186 rm -f ${LINK}
187 done
188 @@ -300,18 +300,18 @@
189 ebegin "Moving libGL and friends for dynamic switching"
190 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
191 local x=""
192 - for x in ${D}/usr/$(get_libdir)/libGL.so* \
193 - ${D}/usr/$(get_libdir)/libGL.la \
194 - ${D}/usr/$(get_libdir)/libGL.a; do
195 - if [ -f ${x} -o -L ${x} ]; then
196 + for x in "${D}"/usr/$(get_libdir)/libGL.so* \
197 + "${D}"/usr/$(get_libdir)/libGL.la \
198 + "${D}"/usr/$(get_libdir)/libGL.a; do
199 + if [[ -f ${x} || -L ${x} ]]; then
200 # libGL.a cause problems with tuxracer, etc
201 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
202 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
203 fi
204 done
205 # glext.h added for #54984
206 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
207 - if [ -f ${x} -o -L ${x} ]; then
208 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
209 + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
210 + if [[ -f ${x} || -L ${x} ]]; then
211 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
212 fi
213 done
214 eend 0
215
216
217
218 1.17 media-libs/mesa/mesa-6.5.1-r1.ebuild
219
220 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild?rev=1.17&view=markup
221 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild?rev=1.17&content-type=text/plain
222 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild?r1=1.16&r2=1.17
223
224 Index: mesa-6.5.1-r1.ebuild
225 ===================================================================
226 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v
227 retrieving revision 1.16
228 retrieving revision 1.17
229 diff -u -r1.16 -r1.17
230 --- mesa-6.5.1-r1.ebuild 12 Aug 2007 05:12:36 -0000 1.16
231 +++ mesa-6.5.1-r1.ebuild 9 Oct 2007 08:23:57 -0000 1.17
232 @@ -1,6 +1,6 @@
233 # Copyright 1999-2007 Gentoo Foundation
234 # Distributed under the terms of the GNU General Public License v2
235 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.16 2007/08/12 05:12:36 dberkholz Exp $
236 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.17 2007/10/09 08:23:57 dberkholz Exp $
237
238 inherit eutils toolchain-funcs multilib flag-o-matic portability
239
240 @@ -99,7 +99,7 @@
241 unpack ${A}
242 # Fixes for bug #146892
243 epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch
244 - cd ${S}
245 + cd "${S}"
246 # FreeBSD 6.* doesn't have posix_memalign().
247 [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
248
249 @@ -110,17 +110,17 @@
250 fi
251
252 # Set up libdir
253 - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
254 + echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
255
256 # Set default dri drivers directory
257 - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
258 + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
259
260 # Do we want thread-local storage (TLS)?
261 if use nptl; then
262 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
263 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
264 fi
265
266 - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
267 + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
268
269 # Configurable DRI drivers
270 if use video_cards_i810; then
271 @@ -161,51 +161,51 @@
272 fi
273
274 # Set drivers to everything on which we ran add_drivers()
275 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
276 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
277
278 if use hardened; then
279 einfo "Deactivating assembly code for hardened build"
280 - echo "ASM_FLAGS =" >> ${HOSTCONF}
281 - echo "ASM_SOURCES =" >> ${HOSTCONF}
282 - echo "ASM_API =" >> ${HOSTCONF}
283 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
284 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
285 + echo "ASM_API =" >> "${HOSTCONF}"
286 fi
287
288 if use sparc; then
289 einfo "Sparc assembly code is not working; deactivating"
290 - echo "ASM_FLAGS =" >> ${HOSTCONF}
291 - echo "ASM_SOURCES =" >> ${HOSTCONF}
292 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
293 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
294 fi
295
296 # Replace hardcoded /usr/X11R6 with this
297 - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
298 + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
299
300 - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
301 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
302 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
303 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
304 + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
305 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
306 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
307 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
308 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
309 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
310 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
311
312 # Removed glut, since we have separate freeglut/glut ebuilds
313 # Remove EGL, since Brian Paul says it's not ready for a release
314 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
315 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
316
317 # Get rid of glut includes
318 - rm -f ${S}/include/GL/glut*h
319 + rm -f "${S}"/include/GL/glut*h
320
321 # r200 breaks without this, since it's the only EGL-enabled driver so far
322 - echo "USING_EGL = 0" >> ${HOSTCONF}
323 + echo "USING_EGL = 0" >> "${HOSTCONF}"
324
325 # Don't build EGL demos. EGL isn't ready for release, plus they produce a
326 # circular dependency with glut.
327 - echo "PROGRAM_DIRS =" >> ${HOSTCONF}
328 + echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
329
330 # Documented in configs/default
331 if use motif; then
332 # Add -lXm
333 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
334 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
335 # Add GLwMDrawA.c
336 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
337 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
338 fi
339 }
340
341 @@ -222,11 +222,11 @@
342 install || die "Installation failed"
343
344 if ! use motif; then
345 - rm ${D}/usr/include/GL/GLwMDrawA.h
346 + rm "${D}"/usr/include/GL/GLwMDrawA.h
347 fi
348
349 # Don't install private headers
350 - rm ${D}/usr/include/GL/GLw*P.h
351 + rm "${D}"/usr/include/GL/GLw*P.h
352
353 fix_opengl_symlinks
354 dynamic_libgl_install
355 @@ -234,17 +234,17 @@
356 # Install libtool archives
357 insinto /usr/$(get_libdir)
358 # (#67729) Needs to be lib, not $(get_libdir)
359 - doins ${FILESDIR}/lib/libGLU.la
360 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
361 - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
362 + doins "${FILESDIR}"/lib/libGLU.la
363 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
364 + > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
365
366 # On *BSD libcs dlopen() and similar functions are present directly in
367 # libc.so and does not require linking to libdl. portability eclass takes
368 # care of finding the needed library (if needed) witht the dlopen_lib
369 # function.
370 sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
371 - ${D}/usr/$(get_libdir)/libGLU.la \
372 - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
373 + "${D}"/usr/$(get_libdir)/libGLU.la \
374 + "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
375
376 # Create the two-number versioned libs (.so.#.#), since only .so.# and
377 # .so.#.#.# were made
378 @@ -265,7 +265,7 @@
379 fix_opengl_symlinks() {
380 # Remove invalid symlinks
381 local LINK
382 - for LINK in $(find ${D}/usr/$(get_libdir) \
383 + for LINK in $(find "${D}"/usr/$(get_libdir) \
384 -name libGL\.* -type l); do
385 rm -f ${LINK}
386 done
387 @@ -286,18 +286,18 @@
388 ebegin "Moving libGL and friends for dynamic switching"
389 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
390 local x=""
391 - for x in ${D}/usr/$(get_libdir)/libGL.so* \
392 - ${D}/usr/$(get_libdir)/libGL.la \
393 - ${D}/usr/$(get_libdir)/libGL.a; do
394 - if [ -f ${x} -o -L ${x} ]; then
395 + for x in "${D}"/usr/$(get_libdir)/libGL.so* \
396 + "${D}"/usr/$(get_libdir)/libGL.la \
397 + "${D}"/usr/$(get_libdir)/libGL.a; do
398 + if [[ -f ${x} || -L ${x} ]]; then
399 # libGL.a cause problems with tuxracer, etc
400 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
401 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
402 fi
403 done
404 # glext.h added for #54984
405 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
406 - if [ -f ${x} -o -L ${x} ]; then
407 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
408 + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
409 + if [[ -f ${x} || -L ${x} ]]; then
410 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
411 fi
412 done
413 eend 0
414
415
416
417 1.18 media-libs/mesa/mesa-6.5-r3.ebuild
418
419 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild?rev=1.18&view=markup
420 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild?rev=1.18&content-type=text/plain
421 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild?r1=1.17&r2=1.18
422
423 Index: mesa-6.5-r3.ebuild
424 ===================================================================
425 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v
426 retrieving revision 1.17
427 retrieving revision 1.18
428 diff -u -r1.17 -r1.18
429 --- mesa-6.5-r3.ebuild 12 Aug 2007 05:12:36 -0000 1.17
430 +++ mesa-6.5-r3.ebuild 9 Oct 2007 08:23:57 -0000 1.18
431 @@ -1,6 +1,6 @@
432 # Copyright 1999-2007 Gentoo Foundation
433 # Distributed under the terms of the GNU General Public License v2
434 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.17 2007/08/12 05:12:36 dberkholz Exp $
435 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.18 2007/10/09 08:23:57 dberkholz Exp $
436
437 inherit eutils toolchain-funcs multilib flag-o-matic portability
438
439 @@ -91,12 +91,12 @@
440 HOSTCONF="${S}/configs/${CONFIG}"
441
442 unpack ${A}
443 - cd ${S}
444 + cd "${S}"
445
446 - epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
447 - epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch
448 - epatch ${FILESDIR}/6.4-multilib-fix.patch
449 - epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
450 + epatch "${FILESDIR}"/6.4-dont-install-gles-headers.patch
451 + epatch "${FILESDIR}"/change-default-dri-driver-dir-X7.1.patch
452 + epatch "${FILESDIR}"/6.4-multilib-fix.patch
453 + epatch "${FILESDIR}"/6.5-re-order-context-destruction.patch
454
455 # Don't compile debug code with USE=-debug - bug #125004
456 if ! use debug; then
457 @@ -105,11 +105,11 @@
458 fi
459
460 # Set default dri drivers directory
461 - echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> ${HOSTCONF}
462 + echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> "${HOSTCONF}"
463
464 # Do we want thread-local storage (TLS)?
465 if use nptl; then
466 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
467 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
468 fi
469
470 # Configurable DRI drivers
471 @@ -179,51 +179,51 @@
472 fi
473
474 # Set drivers to everything on which we ran add_drivers()
475 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
476 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
477
478 if use hardened; then
479 einfo "Deactivating assembly code for hardened build"
480 - echo "ASM_FLAGS =" >> ${HOSTCONF}
481 - echo "ASM_SOURCES =" >> ${HOSTCONF}
482 - echo "ASM_API =" >> ${HOSTCONF}
483 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
484 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
485 + echo "ASM_API =" >> "${HOSTCONF}"
486 fi
487
488 if use sparc; then
489 einfo "Sparc assembly code is not working; deactivating"
490 - echo "ASM_FLAGS =" >> ${HOSTCONF}
491 - echo "ASM_SOURCES =" >> ${HOSTCONF}
492 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
493 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
494 fi
495
496 # Kill this; we don't want /usr/X11R6/lib ever to be searched in this
497 # build.
498 - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
499 + echo "EXTRA_LIB_PATH =" >> "${HOSTCONF}"
500
501 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
502 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
503 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
504 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
505 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
506 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
507 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
508 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
509 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
510
511 # Removed glut, since we have separate freeglut/glut ebuilds
512 # Remove EGL, since Brian Paul says it's not ready for a release
513 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
514 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
515
516 # Get rid of glut includes
517 - rm -f ${S}/include/GL/glut*h
518 + rm -f "${S}"/include/GL/glut*h
519
520 # r200 breaks without this, since it's the only EGL-enabled driver so far
521 - echo "USING_EGL = 0" >> ${HOSTCONF}
522 + echo "USING_EGL = 0" >> "${HOSTCONF}"
523
524 # Don't build EGL demos. EGL isn't ready for release, plus they produce a
525 # circular dependency with glut.
526 - echo "PROGRAM_DIRS =" >> ${HOSTCONF}
527 + echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
528
529 # Documented in configs/default
530 if use motif; then
531 # Add -lXm
532 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
533 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
534 # Add GLwMDrawA.c
535 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
536 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
537 fi
538 }
539
540 @@ -250,11 +250,11 @@
541 eend $?
542
543 if ! use motif; then
544 - rm ${D}/usr/include/GL/GLwMDrawA.h
545 + rm "${D}"/usr/include/GL/GLwMDrawA.h
546 fi
547
548 # Don't install private headers
549 - rm ${D}/usr/include/GL/GLw*P.h
550 + rm "${D}"/usr/include/GL/GLw*P.h
551
552 fix_opengl_symlinks
553 dynamic_libgl_install
554 @@ -262,17 +262,17 @@
555 # Install libtool archives
556 insinto /usr/$(get_libdir)
557 # (#67729) Needs to be lib, not $(get_libdir)
558 - doins ${FILESDIR}/lib/libGLU.la
559 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
560 - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
561 + doins "${FILESDIR}"/lib/libGLU.la
562 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
563 + > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
564
565 # On *BSD libcs dlopen() and similar functions are present directly in
566 # libc.so and does not require linking to libdl. portability eclass takes
567 # care of finding the needed library (if needed) witht the dlopen_lib
568 # function.
569 sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
570 - ${D}/usr/$(get_libdir)/libGLU.la \
571 - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
572 + "${D}"/usr/$(get_libdir)/libGLU.la \
573 + "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
574
575 # Create the two-number versioned libs (.so.#.#), since only .so.# and
576 # .so.#.#.# were made
577 @@ -293,7 +293,7 @@
578 fix_opengl_symlinks() {
579 # Remove invalid symlinks
580 local LINK
581 - for LINK in $(find ${D}/usr/$(get_libdir) \
582 + for LINK in $(find "${D}"/usr/$(get_libdir) \
583 -name libGL\.* -type l); do
584 rm -f ${LINK}
585 done
586 @@ -314,18 +314,18 @@
587 ebegin "Moving libGL and friends for dynamic switching"
588 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
589 local x=""
590 - for x in ${D}/usr/$(get_libdir)/libGL.so* \
591 - ${D}/usr/$(get_libdir)/libGL.la \
592 - ${D}/usr/$(get_libdir)/libGL.a; do
593 - if [ -f ${x} -o -L ${x} ]; then
594 + for x in "${D}"/usr/$(get_libdir)/libGL.so* \
595 + "${D}"/usr/$(get_libdir)/libGL.la \
596 + "${D}"/usr/$(get_libdir)/libGL.a; do
597 + if [[ -f ${x} || -L ${x} ]]; then
598 # libGL.a cause problems with tuxracer, etc
599 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
600 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
601 fi
602 done
603 # glext.h added for #54984
604 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
605 - if [ -f ${x} -o -L ${x} ]; then
606 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
607 + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
608 + if [[ -f ${x} || -L ${x} ]]; then
609 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
610 fi
611 done
612 eend 0
613
614
615
616 1.158 media-libs/mesa/ChangeLog
617
618 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.158&view=markup
619 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.158&content-type=text/plain
620 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.157&r2=1.158
621
622 Index: ChangeLog
623 ===================================================================
624 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
625 retrieving revision 1.157
626 retrieving revision 1.158
627 diff -u -r1.157 -r1.158
628 --- ChangeLog 12 Aug 2007 05:12:36 -0000 1.157
629 +++ ChangeLog 9 Oct 2007 08:23:57 -0000 1.158
630 @@ -1,6 +1,11 @@
631 # ChangeLog for media-libs/mesa
632 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
633 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.157 2007/08/12 05:12:36 dberkholz Exp $
634 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.158 2007/10/09 08:23:57 dberkholz Exp $
635 +
636 + 09 Oct 2007; Donnie Berkholz <dberkholz@g.o>; mesa-6.5-r3.ebuild,
637 + mesa-6.5.1-r1.ebuild, mesa-6.5.1-r4.ebuild, mesa-6.5.2.ebuild,
638 + mesa-6.5.2-r1.ebuild, mesa-6.5.3.ebuild, mesa-7.0.1.ebuild:
639 + Fix quoting issues caught by latest repoman.
640
641 12 Aug 2007; Donnie Berkholz <dberkholz@g.o>; mesa-6.5-r3.ebuild,
642 mesa-6.5.1-r1.ebuild, mesa-6.5.1-r4.ebuild, mesa-6.5.2.ebuild,
643
644
645
646 1.2 media-libs/mesa/mesa-7.0.1.ebuild
647
648 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild?rev=1.2&view=markup
649 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild?rev=1.2&content-type=text/plain
650 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild?r1=1.1&r2=1.2
651
652 Index: mesa-7.0.1.ebuild
653 ===================================================================
654 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v
655 retrieving revision 1.1
656 retrieving revision 1.2
657 diff -u -r1.1 -r1.2
658 --- mesa-7.0.1.ebuild 11 Aug 2007 08:47:04 -0000 1.1
659 +++ mesa-7.0.1.ebuild 9 Oct 2007 08:23:57 -0000 1.2
660 @@ -1,6 +1,6 @@
661 # Copyright 1999-2007 Gentoo Foundation
662 # Distributed under the terms of the GNU General Public License v2
663 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.1 2007/08/11 08:47:04 dberkholz Exp $
664 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.2 2007/10/09 08:23:57 dberkholz Exp $
665
666 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
667
668 @@ -124,21 +124,21 @@
669 fi
670
671 # Set up libdir
672 - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
673 + echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
674
675 # Set default dri drivers directory
676 - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
677 + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
678
679 # Do we want thread-local storage (TLS)?
680 if use nptl; then
681 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
682 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
683 fi
684
685 - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
686 + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
687 if use xcb; then
688 - echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
689 - echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
690 - echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
691 + echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
692 + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
693 + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
694 fi
695
696 # Configurable DRI drivers
697 @@ -156,34 +156,34 @@
698 driver_enable video_cards_via unichrome
699
700 # Set drivers to everything on which we ran driver_enable()
701 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
702 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
703
704 if use hardened; then
705 einfo "Deactivating assembly code for hardened build"
706 - echo "ASM_FLAGS =" >> ${HOSTCONF}
707 - echo "ASM_SOURCES =" >> ${HOSTCONF}
708 - echo "ASM_API =" >> ${HOSTCONF}
709 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
710 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
711 + echo "ASM_API =" >> "${HOSTCONF}"
712 fi
713
714 if use sparc; then
715 einfo "Sparc assembly code is not working; deactivating"
716 - echo "ASM_FLAGS =" >> ${HOSTCONF}
717 - echo "ASM_SOURCES =" >> ${HOSTCONF}
718 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
719 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
720 fi
721
722 # Replace hardcoded /usr/X11R6 with this
723 - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
724 + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
725
726 - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
727 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
728 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
729 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
730 + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
731 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
732 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
733 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
734 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
735 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
736 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
737
738 # Removed glut, since we have separate freeglut/glut ebuilds
739 # Remove EGL, since Brian Paul says it's not ready for a release
740 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
741 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
742
743 # Get rid of glut includes
744 rm -f "${S}"/include/GL/glut*h
745 @@ -191,15 +191,15 @@
746 # Documented in configs/default
747 if use motif; then
748 # Add -lXm
749 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
750 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
751 # Add GLwMDrawA.c
752 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
753 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
754 fi
755
756 # Shut up pointless warnings
757 -# echo "MKDEP = gcc -M" >> ${HOSTCONF}
758 -# echo "MKDEP_OPTIONS = -MF depend" >> ${HOSTCONF}
759 - echo "MKDEP_OPTIONS = -fdepend -I$(gcc-config -L)/include" >> ${HOSTCONF}
760 +# echo "MKDEP = gcc -M" >> "${HOSTCONF}"
761 +# echo "MKDEP_OPTIONS = -MF depend" >> "${HOSTCONF}"
762 + echo "MKDEP_OPTIONS = -fdepend -I$(gcc-config -L)/include" >> "${HOSTCONF}"
763 }
764
765 src_compile() {
766 @@ -227,8 +227,8 @@
767 # Install libtool archives
768 insinto /usr/$(get_libdir)
769 # (#67729) Needs to be lib, not $(get_libdir)
770 - doins ${FILESDIR}/lib/libGLU.la
771 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
772 + doins "${FILESDIR}"/lib/libGLU.la
773 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
774 > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
775
776 # On *BSD libcs dlopen() and similar functions are present directly in
777
778
779
780 1.7 media-libs/mesa/mesa-6.5.3.ebuild
781
782 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild?rev=1.7&view=markup
783 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild?rev=1.7&content-type=text/plain
784 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild?r1=1.6&r2=1.7
785
786 Index: mesa-6.5.3.ebuild
787 ===================================================================
788 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v
789 retrieving revision 1.6
790 retrieving revision 1.7
791 diff -u -r1.6 -r1.7
792 --- mesa-6.5.3.ebuild 12 Aug 2007 05:12:36 -0000 1.6
793 +++ mesa-6.5.3.ebuild 9 Oct 2007 08:23:57 -0000 1.7
794 @@ -1,6 +1,6 @@
795 # Copyright 1999-2007 Gentoo Foundation
796 # Distributed under the terms of the GNU General Public License v2
797 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.6 2007/08/12 05:12:36 dberkholz Exp $
798 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.7 2007/10/09 08:23:57 dberkholz Exp $
799
800 inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
801
802 @@ -112,7 +112,7 @@
803 HOSTCONF="${S}/configs/${CONFIG}"
804
805 unpack ${A}
806 - cd ${S}
807 + cd "${S}"
808
809 # Bug #177329
810 epatch "${FILESDIR}/${P}-pthread.patch"
811 @@ -127,21 +127,21 @@
812 fi
813
814 # Set up libdir
815 - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
816 + echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
817
818 # Set default dri drivers directory
819 - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
820 + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
821
822 # Do we want thread-local storage (TLS)?
823 if use nptl; then
824 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
825 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
826 fi
827
828 - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
829 + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
830 if use xcb; then
831 - echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
832 - echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
833 - echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
834 + echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
835 + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
836 + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
837 fi
838
839 # Configurable DRI drivers
840 @@ -183,51 +183,51 @@
841 fi
842
843 # Set drivers to everything on which we ran add_drivers()
844 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
845 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
846
847 if use hardened; then
848 einfo "Deactivating assembly code for hardened build"
849 - echo "ASM_FLAGS =" >> ${HOSTCONF}
850 - echo "ASM_SOURCES =" >> ${HOSTCONF}
851 - echo "ASM_API =" >> ${HOSTCONF}
852 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
853 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
854 + echo "ASM_API =" >> "${HOSTCONF}"
855 fi
856
857 if use sparc; then
858 einfo "Sparc assembly code is not working; deactivating"
859 - echo "ASM_FLAGS =" >> ${HOSTCONF}
860 - echo "ASM_SOURCES =" >> ${HOSTCONF}
861 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
862 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
863 fi
864
865 # Replace hardcoded /usr/X11R6 with this
866 - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
867 + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
868
869 - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
870 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
871 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
872 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
873 + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
874 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
875 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
876 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
877 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
878 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
879 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
880
881 # Removed glut, since we have separate freeglut/glut ebuilds
882 # Remove EGL, since Brian Paul says it's not ready for a release
883 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
884 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
885
886 # Get rid of glut includes
887 - rm -f ${S}/include/GL/glut*h
888 + rm -f "${S}"/include/GL/glut*h
889
890 # r200 breaks without this, since it's the only EGL-enabled driver so far
891 - echo "USING_EGL = 0" >> ${HOSTCONF}
892 + echo "USING_EGL = 0" >> "${HOSTCONF}"
893
894 # Don't build EGL demos. EGL isn't ready for release, plus they produce a
895 # circular dependency with glut.
896 - echo "PROGRAM_DIRS =" >> ${HOSTCONF}
897 + echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
898
899 # Documented in configs/default
900 if use motif; then
901 # Add -lXm
902 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
903 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
904 # Add GLwMDrawA.c
905 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
906 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
907 fi
908 }
909
910 @@ -244,11 +244,11 @@
911 install || die "Installation failed"
912
913 if ! use motif; then
914 - rm ${D}/usr/include/GL/GLwMDrawA.h
915 + rm "${D}"/usr/include/GL/GLwMDrawA.h
916 fi
917
918 # Don't install private headers
919 - rm ${D}/usr/include/GL/GLw*P.h
920 + rm "${D}"/usr/include/GL/GLw*P.h
921
922 fix_opengl_symlinks
923 dynamic_libgl_install
924 @@ -256,17 +256,17 @@
925 # Install libtool archives
926 insinto /usr/$(get_libdir)
927 # (#67729) Needs to be lib, not $(get_libdir)
928 - doins ${FILESDIR}/lib/libGLU.la
929 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
930 - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
931 + doins "${FILESDIR}"/lib/libGLU.la
932 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
933 + > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
934
935 # On *BSD libcs dlopen() and similar functions are present directly in
936 # libc.so and does not require linking to libdl. portability eclass takes
937 # care of finding the needed library (if needed) witht the dlopen_lib
938 # function.
939 sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
940 - ${D}/usr/$(get_libdir)/libGLU.la \
941 - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
942 + "${D}"/usr/$(get_libdir)/libGLU.la \
943 + "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
944
945 # Create the two-number versioned libs (.so.#.#), since only .so.# and
946 # .so.#.#.# were made
947 @@ -290,7 +290,7 @@
948 fix_opengl_symlinks() {
949 # Remove invalid symlinks
950 local LINK
951 - for LINK in $(find ${D}/usr/$(get_libdir) \
952 + for LINK in $(find "${D}"/usr/$(get_libdir) \
953 -name libGL\.* -type l); do
954 rm -f ${LINK}
955 done
956 @@ -311,18 +311,18 @@
957 ebegin "Moving libGL and friends for dynamic switching"
958 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
959 local x=""
960 - for x in ${D}/usr/$(get_libdir)/libGL.so* \
961 - ${D}/usr/$(get_libdir)/libGL.la \
962 - ${D}/usr/$(get_libdir)/libGL.a; do
963 - if [ -f ${x} -o -L ${x} ]; then
964 + for x in "${D}"/usr/$(get_libdir)/libGL.so* \
965 + "${D}"/usr/$(get_libdir)/libGL.la \
966 + "${D}"/usr/$(get_libdir)/libGL.a; do
967 + if [[ -f ${x} || -L ${x} ]]; then
968 # libGL.a cause problems with tuxracer, etc
969 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
970 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
971 fi
972 done
973 # glext.h added for #54984
974 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
975 - if [ -f ${x} -o -L ${x} ]; then
976 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
977 + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
978 + if [[ -f ${x} || -L ${x} ]]; then
979 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
980 fi
981 done
982 eend 0
983
984
985
986 1.7 media-libs/mesa/mesa-6.5.1-r4.ebuild
987
988 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild?rev=1.7&view=markup
989 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild?rev=1.7&content-type=text/plain
990 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild?r1=1.6&r2=1.7
991
992 Index: mesa-6.5.1-r4.ebuild
993 ===================================================================
994 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v
995 retrieving revision 1.6
996 retrieving revision 1.7
997 diff -u -r1.6 -r1.7
998 --- mesa-6.5.1-r4.ebuild 12 Aug 2007 05:12:36 -0000 1.6
999 +++ mesa-6.5.1-r4.ebuild 9 Oct 2007 08:23:57 -0000 1.7
1000 @@ -1,6 +1,6 @@
1001 # Copyright 1999-2007 Gentoo Foundation
1002 # Distributed under the terms of the GNU General Public License v2
1003 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.6 2007/08/12 05:12:36 dberkholz Exp $
1004 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.7 2007/10/09 08:23:57 dberkholz Exp $
1005
1006 inherit eutils toolchain-funcs multilib flag-o-matic portability
1007
1008 @@ -108,7 +108,7 @@
1009 unpack ${A}
1010 # Fixes for bug #146892
1011 epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch
1012 - cd ${S}
1013 + cd "${S}"
1014 # FreeBSD 6.* doesn't have posix_memalign().
1015 [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
1016
1017 @@ -131,21 +131,21 @@
1018 fi
1019
1020 # Set up libdir
1021 - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
1022 + echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
1023
1024 # Set default dri drivers directory
1025 - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
1026 + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
1027
1028 # Do we want thread-local storage (TLS)?
1029 if use nptl; then
1030 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
1031 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
1032 fi
1033
1034 - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
1035 + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
1036 if use xcb; then
1037 - echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
1038 - echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
1039 - echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
1040 + echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
1041 + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
1042 + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
1043 fi
1044
1045 # Configurable DRI drivers
1046 @@ -187,51 +187,51 @@
1047 fi
1048
1049 # Set drivers to everything on which we ran add_drivers()
1050 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
1051 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
1052
1053 if use hardened; then
1054 einfo "Deactivating assembly code for hardened build"
1055 - echo "ASM_FLAGS =" >> ${HOSTCONF}
1056 - echo "ASM_SOURCES =" >> ${HOSTCONF}
1057 - echo "ASM_API =" >> ${HOSTCONF}
1058 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
1059 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
1060 + echo "ASM_API =" >> "${HOSTCONF}"
1061 fi
1062
1063 if use sparc; then
1064 einfo "Sparc assembly code is not working; deactivating"
1065 - echo "ASM_FLAGS =" >> ${HOSTCONF}
1066 - echo "ASM_SOURCES =" >> ${HOSTCONF}
1067 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
1068 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
1069 fi
1070
1071 # Replace hardcoded /usr/X11R6 with this
1072 - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
1073 + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
1074
1075 - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
1076 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
1077 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
1078 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
1079 + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
1080 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
1081 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
1082 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
1083 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
1084 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
1085 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
1086
1087 # Removed glut, since we have separate freeglut/glut ebuilds
1088 # Remove EGL, since Brian Paul says it's not ready for a release
1089 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
1090 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
1091
1092 # Get rid of glut includes
1093 - rm -f ${S}/include/GL/glut*h
1094 + rm -f "${S}"/include/GL/glut*h
1095
1096 # r200 breaks without this, since it's the only EGL-enabled driver so far
1097 - echo "USING_EGL = 0" >> ${HOSTCONF}
1098 + echo "USING_EGL = 0" >> "${HOSTCONF}"
1099
1100 # Don't build EGL demos. EGL isn't ready for release, plus they produce a
1101 # circular dependency with glut.
1102 - echo "PROGRAM_DIRS =" >> ${HOSTCONF}
1103 + echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
1104
1105 # Documented in configs/default
1106 if use motif; then
1107 # Add -lXm
1108 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
1109 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
1110 # Add GLwMDrawA.c
1111 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
1112 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
1113 fi
1114 }
1115
1116 @@ -248,11 +248,11 @@
1117 install || die "Installation failed"
1118
1119 if ! use motif; then
1120 - rm ${D}/usr/include/GL/GLwMDrawA.h
1121 + rm "${D}"/usr/include/GL/GLwMDrawA.h
1122 fi
1123
1124 # Don't install private headers
1125 - rm ${D}/usr/include/GL/GLw*P.h
1126 + rm "${D}"/usr/include/GL/GLw*P.h
1127
1128 fix_opengl_symlinks
1129 dynamic_libgl_install
1130 @@ -260,17 +260,17 @@
1131 # Install libtool archives
1132 insinto /usr/$(get_libdir)
1133 # (#67729) Needs to be lib, not $(get_libdir)
1134 - doins ${FILESDIR}/lib/libGLU.la
1135 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
1136 - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1137 + doins "${FILESDIR}"/lib/libGLU.la
1138 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
1139 + > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1140
1141 # On *BSD libcs dlopen() and similar functions are present directly in
1142 # libc.so and does not require linking to libdl. portability eclass takes
1143 # care of finding the needed library (if needed) witht the dlopen_lib
1144 # function.
1145 sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
1146 - ${D}/usr/$(get_libdir)/libGLU.la \
1147 - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1148 + "${D}"/usr/$(get_libdir)/libGLU.la \
1149 + "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1150
1151 # Create the two-number versioned libs (.so.#.#), since only .so.# and
1152 # .so.#.#.# were made
1153 @@ -291,7 +291,7 @@
1154 fix_opengl_symlinks() {
1155 # Remove invalid symlinks
1156 local LINK
1157 - for LINK in $(find ${D}/usr/$(get_libdir) \
1158 + for LINK in $(find "${D}"/usr/$(get_libdir) \
1159 -name libGL\.* -type l); do
1160 rm -f ${LINK}
1161 done
1162 @@ -312,18 +312,18 @@
1163 ebegin "Moving libGL and friends for dynamic switching"
1164 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
1165 local x=""
1166 - for x in ${D}/usr/$(get_libdir)/libGL.so* \
1167 - ${D}/usr/$(get_libdir)/libGL.la \
1168 - ${D}/usr/$(get_libdir)/libGL.a; do
1169 - if [ -f ${x} -o -L ${x} ]; then
1170 + for x in "${D}"/usr/$(get_libdir)/libGL.so* \
1171 + "${D}"/usr/$(get_libdir)/libGL.la \
1172 + "${D}"/usr/$(get_libdir)/libGL.a; do
1173 + if [[ -f ${x} || -L ${x} ]]; then
1174 # libGL.a cause problems with tuxracer, etc
1175 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
1176 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
1177 fi
1178 done
1179 # glext.h added for #54984
1180 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
1181 - if [ -f ${x} -o -L ${x} ]; then
1182 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
1183 + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
1184 + if [[ -f ${x} || -L ${x} ]]; then
1185 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
1186 fi
1187 done
1188 eend 0
1189
1190
1191
1192 1.15 media-libs/mesa/mesa-6.5.2-r1.ebuild
1193
1194 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild?rev=1.15&view=markup
1195 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild?rev=1.15&content-type=text/plain
1196 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild?r1=1.14&r2=1.15
1197
1198 Index: mesa-6.5.2-r1.ebuild
1199 ===================================================================
1200 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v
1201 retrieving revision 1.14
1202 retrieving revision 1.15
1203 diff -u -r1.14 -r1.15
1204 --- mesa-6.5.2-r1.ebuild 12 Aug 2007 05:12:36 -0000 1.14
1205 +++ mesa-6.5.2-r1.ebuild 9 Oct 2007 08:23:57 -0000 1.15
1206 @@ -1,6 +1,6 @@
1207 # Copyright 1999-2007 Gentoo Foundation
1208 # Distributed under the terms of the GNU General Public License v2
1209 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.14 2007/08/12 05:12:36 dberkholz Exp $
1210 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.15 2007/10/09 08:23:57 dberkholz Exp $
1211
1212 inherit eutils toolchain-funcs multilib flag-o-matic portability
1213
1214 @@ -107,7 +107,7 @@
1215 HOSTCONF="${S}/configs/${CONFIG}"
1216
1217 unpack ${A}
1218 - cd ${S}
1219 + cd "${S}"
1220
1221 epatch "${FILESDIR}/${PV}-i965-wine-fix.patch"
1222
1223 @@ -121,21 +121,21 @@
1224 fi
1225
1226 # Set up libdir
1227 - echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
1228 + echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
1229
1230 # Set default dri drivers directory
1231 - echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
1232 + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
1233
1234 # Do we want thread-local storage (TLS)?
1235 if use nptl; then
1236 - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
1237 + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
1238 fi
1239
1240 - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
1241 + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
1242 if use xcb; then
1243 - echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
1244 - echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
1245 - echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
1246 + echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
1247 + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
1248 + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
1249 fi
1250
1251 # Configurable DRI drivers
1252 @@ -177,51 +177,51 @@
1253 fi
1254
1255 # Set drivers to everything on which we ran add_drivers()
1256 - echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
1257 + echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
1258
1259 if use hardened; then
1260 einfo "Deactivating assembly code for hardened build"
1261 - echo "ASM_FLAGS =" >> ${HOSTCONF}
1262 - echo "ASM_SOURCES =" >> ${HOSTCONF}
1263 - echo "ASM_API =" >> ${HOSTCONF}
1264 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
1265 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
1266 + echo "ASM_API =" >> "${HOSTCONF}"
1267 fi
1268
1269 if use sparc; then
1270 einfo "Sparc assembly code is not working; deactivating"
1271 - echo "ASM_FLAGS =" >> ${HOSTCONF}
1272 - echo "ASM_SOURCES =" >> ${HOSTCONF}
1273 + echo "ASM_FLAGS =" >> "${HOSTCONF}"
1274 + echo "ASM_SOURCES =" >> "${HOSTCONF}"
1275 fi
1276
1277 # Replace hardcoded /usr/X11R6 with this
1278 - echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
1279 + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
1280
1281 - echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
1282 - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
1283 - echo "CC = $(tc-getCC)" >> ${HOSTCONF}
1284 - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
1285 + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
1286 + echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
1287 + echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
1288 + echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
1289 # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
1290 - echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
1291 + echo "PIC_FLAGS = -fPIC" >> "${HOSTCONF}"
1292
1293 # Removed glut, since we have separate freeglut/glut ebuilds
1294 # Remove EGL, since Brian Paul says it's not ready for a release
1295 - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
1296 + echo "SRC_DIRS = glx/x11 mesa glu glw" >> "${HOSTCONF}"
1297
1298 # Get rid of glut includes
1299 - rm -f ${S}/include/GL/glut*h
1300 + rm -f "${S}"/include/GL/glut*h
1301
1302 # r200 breaks without this, since it's the only EGL-enabled driver so far
1303 - echo "USING_EGL = 0" >> ${HOSTCONF}
1304 + echo "USING_EGL = 0" >> "${HOSTCONF}"
1305
1306 # Don't build EGL demos. EGL isn't ready for release, plus they produce a
1307 # circular dependency with glut.
1308 - echo "PROGRAM_DIRS =" >> ${HOSTCONF}
1309 + echo "PROGRAM_DIRS =" >> "${HOSTCONF}"
1310
1311 # Documented in configs/default
1312 if use motif; then
1313 # Add -lXm
1314 - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
1315 + echo "GLW_LIB_DEPS += -lXm" >> "${HOSTCONF}"
1316 # Add GLwMDrawA.c
1317 - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
1318 + echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
1319 fi
1320 }
1321
1322 @@ -238,11 +238,11 @@
1323 install || die "Installation failed"
1324
1325 if ! use motif; then
1326 - rm ${D}/usr/include/GL/GLwMDrawA.h
1327 + rm "${D}"/usr/include/GL/GLwMDrawA.h
1328 fi
1329
1330 # Don't install private headers
1331 - rm ${D}/usr/include/GL/GLw*P.h
1332 + rm "${D}"/usr/include/GL/GLw*P.h
1333
1334 fix_opengl_symlinks
1335 dynamic_libgl_install
1336 @@ -250,17 +250,17 @@
1337 # Install libtool archives
1338 insinto /usr/$(get_libdir)
1339 # (#67729) Needs to be lib, not $(get_libdir)
1340 - doins ${FILESDIR}/lib/libGLU.la
1341 - sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
1342 - > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1343 + doins "${FILESDIR}"/lib/libGLU.la
1344 + sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
1345 + > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1346
1347 # On *BSD libcs dlopen() and similar functions are present directly in
1348 # libc.so and does not require linking to libdl. portability eclass takes
1349 # care of finding the needed library (if needed) witht the dlopen_lib
1350 # function.
1351 sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
1352 - ${D}/usr/$(get_libdir)/libGLU.la \
1353 - ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1354 + "${D}"/usr/$(get_libdir)/libGLU.la \
1355 + "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
1356
1357 # Create the two-number versioned libs (.so.#.#), since only .so.# and
1358 # .so.#.#.# were made
1359 @@ -281,7 +281,7 @@
1360 fix_opengl_symlinks() {
1361 # Remove invalid symlinks
1362 local LINK
1363 - for LINK in $(find ${D}/usr/$(get_libdir) \
1364 + for LINK in $(find "${D}"/usr/$(get_libdir) \
1365 -name libGL\.* -type l); do
1366 rm -f ${LINK}
1367 done
1368 @@ -302,18 +302,18 @@
1369 ebegin "Moving libGL and friends for dynamic switching"
1370 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
1371 local x=""
1372 - for x in ${D}/usr/$(get_libdir)/libGL.so* \
1373 - ${D}/usr/$(get_libdir)/libGL.la \
1374 - ${D}/usr/$(get_libdir)/libGL.a; do
1375 - if [ -f ${x} -o -L ${x} ]; then
1376 + for x in "${D}"/usr/$(get_libdir)/libGL.so* \
1377 + "${D}"/usr/$(get_libdir)/libGL.la \
1378 + "${D}"/usr/$(get_libdir)/libGL.a; do
1379 + if [[ -f ${x} || -L ${x} ]]; then
1380 # libGL.a cause problems with tuxracer, etc
1381 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
1382 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
1383 fi
1384 done
1385 # glext.h added for #54984
1386 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
1387 - if [ -f ${x} -o -L ${x} ]; then
1388 - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
1389 + for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
1390 + if [[ -f ${x} || -L ${x} ]]; then
1391 + mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
1392 fi
1393 done
1394 eend 0
1395
1396
1397
1398 --
1399 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups