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

Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-7.8.ebuild mesa-7.7.1.ebuild mesa-7.8_rc2.ebuild mesa-7.7-r1.ebuild mesa-7.7.1_rc2.ebuild mesa-7.6.1.ebuild
Date: Mon, 29 Mar 2010 14:58:03
Message-Id: E1NwGPc-0000oD-HL@stork.gentoo.org
1 scarabeus 10/03/29 14:57:56
2
3 Modified: ChangeLog
4 Added: mesa-7.8.ebuild mesa-7.7.1.ebuild
5 Removed: mesa-7.8_rc2.ebuild mesa-7.7-r1.ebuild
6 mesa-7.7.1_rc2.ebuild mesa-7.6.1.ebuild
7 Log:
8 Version bump to latest releases. Drop old.
9 (Portage version: 2.2_rc67/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.263 media-libs/mesa/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.263&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.263&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.262&r2=1.263
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
21 retrieving revision 1.262
22 retrieving revision 1.263
23 diff -u -r1.262 -r1.263
24 --- ChangeLog 23 Mar 2010 11:20:10 -0000 1.262
25 +++ ChangeLog 29 Mar 2010 14:57:56 -0000 1.263
26 @@ -1,6 +1,14 @@
27 # ChangeLog for media-libs/mesa
28 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.262 2010/03/23 11:20:10 scarabeus Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.263 2010/03/29 14:57:56 scarabeus Exp $
31 +
32 +*mesa-7.8 (29 Mar 2010)
33 +*mesa-7.7.1 (29 Mar 2010)
34 +
35 + 29 Mar 2010; Tomáš Chvátal <scarabeus@g.o> -mesa-7.6.1.ebuild,
36 + -mesa-7.7-r1.ebuild, -mesa-7.7.1_rc2.ebuild, +mesa-7.7.1.ebuild,
37 + -mesa-7.8_rc2.ebuild, +mesa-7.8.ebuild:
38 + Version bump to latest releases. Drop old.
39
40 *mesa-7.8_rc2 (23 Mar 2010)
41 *mesa-7.7.1_rc2 (23 Mar 2010)
42
43
44
45 1.1 media-libs/mesa/mesa-7.8.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.8.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.8.ebuild?rev=1.1&content-type=text/plain
49
50 Index: mesa-7.8.ebuild
51 ===================================================================
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.ebuild,v 1.1 2010/03/29 14:57:56 scarabeus Exp $
55
56 EAPI=3
57
58 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
59
60 if [[ ${PV} = 9999* ]]; then
61 GIT_ECLASS="git"
62 EXPERIMENTAL="true"
63 fi
64
65 inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability versionator
66
67 OPENGL_DIR="xorg-x11"
68
69 MY_PN="${PN/m/M}"
70 MY_P="${MY_PN}-${PV/_/-}"
71 MAJOR_MINOR=$(get_version_component_range 1-2)
72 MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
73 DESCRIPTION="OpenGL-like graphic library for Linux"
74 HOMEPAGE="http://mesa3d.sourceforge.net/"
75
76 #SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
77 if [[ $PV = 9999* ]]; then
78 SRC_URI="${SRC_PATCHES}"
79 else
80 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/${MY_SRC_P}.tar.bz2
81 ${SRC_PATCHES}"
82 fi
83
84 LICENSE="LGPL-2"
85 SLOT="0"
86 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
87
88 VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis svga tdfx via"
89 for card in ${VIDEO_CARDS}; do
90 IUSE_VIDEO_CARDS+=" video_cards_${card}"
91 done
92
93 IUSE="${IUSE_VIDEO_CARDS}
94 debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
95
96 # keep correct libdrm and dri2proto dep
97 # keep blocks in rdepend for binpkg
98 RDEPEND="
99 !<x11-base/xorg-server-1.7
100 !<=x11-proto/xf86driproto-2.0.3
101 >=app-admin/eselect-opengl-1.1.1-r2
102 dev-libs/expat
103 >=x11-libs/libdrm-2.4.17
104 x11-libs/libICE
105 x11-libs/libX11[xcb?]
106 x11-libs/libXdamage
107 x11-libs/libXext
108 x11-libs/libXi
109 x11-libs/libXmu
110 x11-libs/libXxf86vm
111 motif? ( x11-libs/openmotif )
112 "
113 DEPEND="${RDEPEND}
114 dev-util/pkgconfig
115 x11-misc/makedepend
116 >=x11-proto/dri2proto-2.2
117 >=x11-proto/glproto-1.4.11
118 x11-proto/inputproto
119 >=x11-proto/xextproto-7.0.99.1
120 x11-proto/xf86driproto
121 x11-proto/xf86vidmodeproto
122 "
123
124 S="${WORKDIR}/${MY_P}"
125
126 # It is slow without texrels, if someone wants slow
127 # mesa without texrels +pic use is worth shot
128 QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
129 QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
130
131 # Think about: ggi, svga, fbcon, no-X configs
132
133 pkg_setup() {
134 # gcc 4.2 has buggy ivopts
135 if [[ $(gcc-version) = "4.2" ]]; then
136 append-flags -fno-ivopts
137 fi
138
139 # recommended by upstream
140 append-flags -ffast-math
141 }
142
143 src_unpack() {
144 [[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
145 }
146
147 src_prepare() {
148 # apply patches
149 if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
150 EPATCH_FORCE="yes" \
151 EPATCH_SOURCE="${WORKDIR}/patches" \
152 EPATCH_SUFFIX="patch" \
153 epatch
154 fi
155 # FreeBSD 6.* doesn't have posix_memalign().
156 [[ ${CHOST} == *-freebsd6.* ]] && \
157 sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
158
159 eautoreconf
160 }
161
162 src_configure() {
163 local myconf r600
164
165 # Configurable DRI drivers
166 driver_enable swrast
167 driver_enable video_cards_intel i810 i915 i965
168 driver_enable video_cards_mach64 mach64
169 driver_enable video_cards_mga mga
170 driver_enable video_cards_r128 r128
171 # ATI has two implementations as video_cards
172 driver_enable video_cards_radeon radeon r200 r300 r600
173 driver_enable video_cards_radeonhd r300 r600
174 driver_enable video_cards_savage savage
175 driver_enable video_cards_sis sis
176 driver_enable video_cards_tdfx tdfx
177 driver_enable video_cards_via unichrome
178
179 myconf="${myconf} $(use_enable gallium)"
180 if use gallium; then
181 elog "You have enabled gallium infrastructure."
182 elog "This infrastructure currently support these drivers:"
183 elog " Intel: works only i915."
184 elog " Nouveau: Support for nVidia NV30 and later cards."
185 elog " Radeon: Newest implementation of r300-r500 driver."
186 elog " Svga: VMWare Virtual GPU driver."
187 echo
188 myconf="${myconf}
189 --with-state-trackers=glx,dri,egl
190 $(use_enable video_cards_svga gallium-svga)
191 $(use_enable video_cards_nouveau gallium-nouveau)
192 $(use_enable video_cards_intel gallium-intel)"
193 if use video_cards_radeon || use video_cards_radeonhd; then
194 myconf="${myconf} --enable-gallium-radeon"
195 else
196 myconf="${myconf} --disable-gallium-radeon"
197 fi
198 else
199 if use video_cards_nouveau || use video_cards_svga; then
200 elog "SVGA and nouveau drivers are available only via gallium interface."
201 elog "Enable gallium useflag if you want to use them."
202 fi
203 fi
204
205 # --with-driver=dri|xlib|osmesa || do we need osmesa?
206 econf \
207 --disable-option-checking \
208 --with-driver=dri \
209 --disable-glut \
210 --without-demos \
211 $(use_enable debug) \
212 $(use_enable motif glw) \
213 $(use_enable motif) \
214 $(use_enable nptl glx-tls) \
215 $(use_enable xcb) \
216 $(use_enable !pic asm) \
217 --with-dri-drivers=${DRI_DRIVERS} \
218 ${myconf}
219 }
220
221 src_install() {
222 emake DESTDIR="${D}" install || die "Installation failed"
223
224 # Remove redundant headers
225 # GLUT thing
226 rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
227 # Glew includes
228 rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
229 || die "Removing glew includes failed."
230
231 # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
232 # because user can eselect desired GL provider.
233 ebegin "Moving libGL and friends for dynamic switching"
234 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
235 local x
236 for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
237 if [ -f ${x} -o -L ${x} ]; then
238 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
239 || die "Failed to move ${x}"
240 fi
241 done
242 for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
243 if [ -f ${x} -o -L ${x} ]; then
244 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
245 || die "Failed to move ${x}"
246 fi
247 done
248 eend $?
249 }
250
251 pkg_postinst() {
252 # Switch to the xorg implementation.
253 echo
254 eselect opengl set --use-old ${OPENGL_DIR}
255 }
256
257 # $1 - VIDEO_CARDS flag
258 # other args - names of DRI drivers to enable
259 driver_enable() {
260 case $# in
261 # for enabling unconditionally
262 1)
263 DRI_DRIVERS+=",$1"
264 ;;
265 *)
266 if use $1; then
267 shift
268 for i in $@; do
269 DRI_DRIVERS+=",${i}"
270 done
271 fi
272 ;;
273 esac
274 }
275
276
277
278 1.1 media-libs/mesa/mesa-7.7.1.ebuild
279
280 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild?rev=1.1&view=markup
281 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild?rev=1.1&content-type=text/plain
282
283 Index: mesa-7.7.1.ebuild
284 ===================================================================
285 # Copyright 1999-2010 Gentoo Foundation
286 # Distributed under the terms of the GNU General Public License v2
287 # $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild,v 1.1 2010/03/29 14:57:56 scarabeus Exp $
288
289 EAPI="2"
290
291 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
292
293 if [[ ${PV} = 9999* ]]; then
294 GIT_ECLASS="git"
295 EXPERIMENTAL="true"
296 fi
297
298 inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability versionator
299
300 OPENGL_DIR="xorg-x11"
301
302 MY_PN="${PN/m/M}"
303 MY_P="${MY_PN}-${PV/_/-}"
304 MAJOR_MINOR=$(get_version_component_range 1-2)
305 MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
306 DESCRIPTION="OpenGL-like graphic library for Linux"
307 HOMEPAGE="http://mesa3d.sourceforge.net/"
308
309 #SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
310 if [[ $PV = 9999* ]]; then
311 SRC_URI="${SRC_PATCHES}"
312 else
313 SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${MY_SRC_P}.tar.bz2
314 ${SRC_PATCHES}"
315 fi
316
317 LICENSE="LGPL-2"
318 SLOT="0"
319 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
320
321 VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
322 for card in ${VIDEO_CARDS}; do
323 IUSE_VIDEO_CARDS+=" video_cards_${card}"
324 done
325
326 IUSE="${IUSE_VIDEO_CARDS}
327 debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
328
329 # keep correct libdrm and dri2proto dep
330 # keep blocks in rdepend for binpkg
331 RDEPEND="
332 !<x11-base/xorg-server-1.7
333 !<=x11-proto/xf86driproto-2.0.3
334 >=app-admin/eselect-opengl-1.1.1-r2
335 dev-libs/expat
336 >=x11-libs/libdrm-2.4.17
337 x11-libs/libICE
338 x11-libs/libX11[xcb?]
339 x11-libs/libXdamage
340 x11-libs/libXext
341 x11-libs/libXi
342 x11-libs/libXmu
343 x11-libs/libXxf86vm
344 motif? ( x11-libs/openmotif )
345 "
346 DEPEND="${RDEPEND}
347 dev-util/pkgconfig
348 x11-misc/makedepend
349 >=x11-proto/dri2proto-1.99.3
350 >=x11-proto/glproto-1.4.8
351 x11-proto/inputproto
352 >=x11-proto/xextproto-7.0.99.1
353 x11-proto/xf86driproto
354 x11-proto/xf86vidmodeproto
355 "
356
357 S="${WORKDIR}/${MY_P}"
358
359 # Think about: ggi, svga, fbcon, no-X configs
360
361 pkg_setup() {
362 # gcc 4.2 has buggy ivopts
363 if [[ $(gcc-version) = "4.2" ]]; then
364 append-flags -fno-ivopts
365 fi
366
367 # recommended by upstream
368 append-flags -ffast-math
369 }
370
371 src_unpack() {
372 [[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
373 }
374
375 src_prepare() {
376 # apply patches
377 if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
378 EPATCH_FORCE="yes" \
379 EPATCH_SOURCE="${WORKDIR}/patches" \
380 EPATCH_SUFFIX="patch" \
381 epatch
382 fi
383 # FreeBSD 6.* doesn't have posix_memalign().
384 [[ ${CHOST} == *-freebsd6.* ]] && \
385 sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
386
387 eautoreconf
388 }
389
390 src_configure() {
391 local myconf r600
392
393 # Configurable DRI drivers
394 driver_enable swrast
395 driver_enable video_cards_intel i810 i915 i965
396 driver_enable video_cards_mach64 mach64
397 driver_enable video_cards_mga mga
398 driver_enable video_cards_r128 r128
399 # ATI has two implementations as video_cards
400 driver_enable video_cards_radeon radeon r200 r300 r600
401 driver_enable video_cards_radeonhd r300 r600
402 driver_enable video_cards_savage savage
403 driver_enable video_cards_sis sis
404 driver_enable video_cards_sunffb ffb
405 driver_enable video_cards_tdfx tdfx
406 driver_enable video_cards_via unichrome
407
408 myconf="${myconf} $(use_enable gallium)"
409 if use gallium; then
410 elog "You have enabled gallium infrastructure."
411 elog "This infrastructure currently support these drivers:"
412 elog " Intel: driver not really functional, thus disabled."
413 elog " Nouveau: only available implementation. Experimental Quality."
414 elog " Radeon: implementation up to the r500. Testing Quality."
415 elog " Svga: VMWare Virtual GPU driver. Hic sunt leones."
416 echo
417 myconf="${myconf}
418 --disable-gallium-intel
419 --with-state-trackers=glx,dri,egl
420 $(use_enable video_cards_svga gallium-svga)
421 $(use_enable video_cards_nouveau gallium-nouveau)"
422 #$(use_enable video_cards_intel gallium-intel)"
423 if use video_cards_radeon || use video_cards_radeonhd; then
424 myconf="${myconf} --enable-gallium-radeon"
425 else
426 myconf="${myconf} --disable-gallium-radeon"
427 fi
428 else
429 if use video_cards_nouveau || use video_cards_svga; then
430 elog "SVGA and nouveau drivers are available only via gallium interface."
431 elog "Enable gallium useflag if you insist to use them."
432 fi
433 fi
434
435 # --with-driver=dri|xlib|osmesa || do we need osmesa?
436 econf \
437 --disable-option-checking \
438 --with-driver=dri \
439 --disable-glut \
440 --without-demos \
441 $(use_enable debug) \
442 $(use_enable motif glw) \
443 $(use_enable motif) \
444 $(use_enable nptl glx-tls) \
445 $(use_enable xcb) \
446 $(use_enable !pic asm) \
447 --with-dri-drivers=${DRI_DRIVERS} \
448 ${myconf}
449 }
450
451 src_install() {
452 dodir /usr
453 emake DESTDIR="${D}" install || die "Installation failed"
454
455 # Remove redundant headers
456 # GLUT thing
457 rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
458 # Glew includes
459 rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
460 || die "Removing glew includes failed."
461
462 # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
463 # because user can eselect desired GL provider.
464 ebegin "Moving libGL and friends for dynamic switching"
465 dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
466 local x
467 for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
468 if [ -f ${x} -o -L ${x} ]; then
469 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
470 || die "Failed to move ${x}"
471 fi
472 done
473 for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
474 if [ -f ${x} -o -L ${x} ]; then
475 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
476 || die "Failed to move ${x}"
477 fi
478 done
479 eend $?
480 }
481
482 pkg_postinst() {
483 # Switch to the xorg implementation.
484 echo
485 eselect opengl set --use-old ${OPENGL_DIR}
486 }
487
488 # $1 - VIDEO_CARDS flag
489 # other args - names of DRI drivers to enable
490 driver_enable() {
491 case $# in
492 # for enabling unconditionally
493 1)
494 DRI_DRIVERS+=",$1"
495 ;;
496 *)
497 if use $1; then
498 shift
499 for i in $@; do
500 DRI_DRIVERS+=",${i}"
501 done
502 fi
503 ;;
504 esac
505 }
Report Message
Find on MARC Find on Google Groups