/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.44 Revision 1.80
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.44 2006/02/15 21:07:00 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.80 2006/10/30 18:40:58 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
… …
22# directory or directories. 22# directory or directories.
23# 23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25# 25#
26# Pretty much everything else should be automatic. 26# Pretty much everything else should be automatic.
27
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29
30inherit eutils libtool toolchain-funcs flag-o-matic
31 27
32# Directory prefix to use for everything 28# Directory prefix to use for everything
33XDIR="/usr" 29XDIR="/usr"
34 30
35# Set up default patchset version(s) if necessary 31# Set up default patchset version(s) if necessary
… …
41IUSE="" 37IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 38HOMEPAGE="http://xorg.freedesktop.org/"
43 39
44# Set up SRC_URI for individual modular releases 40# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 41BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 42if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 43 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 44 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 45elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 46 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 47 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
… …
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2" 64 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 65elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 66 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 67 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 68fi
73
74# SRC_URI for full releases
75SRC_URI="${SRC_URI}
76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2
77 http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/${P}.tar.bz2
78 http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2
79 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
80 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
81 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
82 69
83SLOT="0" 70SLOT="0"
84 71
85# Set the license for the package. This can be overridden by setting 72# Set the license for the package. This can be overridden by setting
86# LICENSE after the inherit. 73# LICENSE after the inherit.
… …
95 >=sys-devel/libtool-1.5 82 >=sys-devel/libtool-1.5
96 >=sys-devel/m4-1.4" 83 >=sys-devel/m4-1.4"
97fi 84fi
98 85
99# If we're a font package, but not the font.alias one 86# If we're a font package, but not the font.alias one
87FONT_ECLASS=""
100if [[ "${PN/#font-}" != "${PN}" ]] \ 88if [[ "${PN/#font-}" != "${PN}" ]] \
89 && [[ "${CATEGORY}" = "media-fonts" ]] \
101 && [[ "${PN}" != "font-alias" ]] \ 90 && [[ "${PN}" != "font-alias" ]] \
102 && [[ "${PN}" != "font-util" ]]; then 91 && [[ "${PN}" != "font-util" ]]; then
103 # Activate font code in the rest of the eclass 92 # Activate font code in the rest of the eclass
104 FONT="yes" 93 FONT="yes"
94
95 # Whether to inherit the font eclass
96 FONT_ECLASS="font"
105 97
106 RDEPEND="${RDEPEND} 98 RDEPEND="${RDEPEND}
107 media-fonts/encodings 99 media-fonts/encodings
108 x11-apps/mkfontscale 100 x11-apps/mkfontscale
109 x11-apps/mkfontdir" 101 x11-apps/mkfontdir"
… …
138# If we're a driver package 130# If we're a driver package
139if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
140 # Enable driver code in the rest of the eclass 132 # Enable driver code in the rest of the eclass
141 DRIVER="yes" 133 DRIVER="yes"
142 134
135 if [[ ${XDPVER} != -1 ]]; then
143 # Add driver patchset to SRC_URI 136 # Add driver patchset to SRC_URI
144 SRC_URI="${SRC_URI} 137 SRC_URI="${SRC_URI}
145 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 138 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
139 fi
146fi 140fi
147 141
148# Debugging -- ignore packages that can't be built with debugging 142# Debugging -- ignore packages that can't be built with debugging
149if [[ -z "${FONT}" ]] \ 143if [[ -z "${FONT}" ]] \
150 || [[ "${PN/app-doc}" != "${PN}" ]] \ 144 || [[ "${PN/app-doc}" != "${PN}" ]] \
… …
156 || [[ "${PN/xcursor}" != "${PN}" ]] \ 150 || [[ "${PN/xcursor}" != "${PN}" ]] \
157 ; then 151 ; then
158 DEBUGGABLE="yes" 152 DEBUGGABLE="yes"
159 IUSE="${IUSE} debug" 153 IUSE="${IUSE} debug"
160 if use debug; then 154 if use debug; then
155 if ! has splitdebug ${FEATURES}; then
161 RESTRICT="${RESTRICT} nostrip" 156 RESTRICT="${RESTRICT} nostrip"
157 fi
162 fi 158 fi
163fi 159fi
164 160
165DEPEND="${DEPEND} 161DEPEND="${DEPEND}
166 >=dev-util/pkgconfig-0.18" 162 >=dev-util/pkgconfig-0.18"
167 163
168if [[ "${PN/util-macros}" = "${PN}" ]]; then 164if [[ "${PN/util-macros}" = "${PN}" ]]; then
169 DEPEND="${DEPEND} 165 DEPEND="${DEPEND}
170 >=x11-misc/util-macros-0.99.2" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
171fi 168fi
172 169
173# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
174RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
175 !<=x11-base/xorg-x11-6.9 172 !<=x11-base/xorg-x11-6.9"
176 >=sys-apps/man-1.6b-r2"
177# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
178# x11-base/x11-env" 174# x11-base/x11-env"
175
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
177
178x-modular_specs_check() {
179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
180 append-ldflags -Wl,-z,lazy
181 # (#116698) breaks loading
182 filter-ldflags -Wl,-z,now
183 fi
184}
185
186x-modular_dri_check() {
187 # (#120057) Enabling DRI in drivers requires that the server was built with
188 # support for it
189 if [[ -n "${DRIVER}" ]]; then
190 if has dri ${IUSE} && use dri; then
191 einfo "Checking for direct rendering capabilities ..."
192 if ! built_with_use x11-base/xorg-server dri; then
193 die "You must build x11-base/xorg-server with USE=dri."
194 fi
195 fi
196 fi
197}
198
199x-modular_server_supports_drivers_check() {
200 # (#135873) Only certain servers will actually use or be capable of
201 # building external drivers, including binary drivers.
202 if [[ -n "${DRIVER}" ]]; then
203 if has_version '>=x11-base/xorg-server-1.1'; then
204 if ! built_with_use x11-base/xorg-server xorg; then
205 eerror "x11-base/xorg-server is not built with support for external drivers."
206 die "You must build x11-base/xorg-server with USE=xorg."
207 fi
208 fi
209 fi
210}
179 211
180x-modular_unpack_source() { 212x-modular_unpack_source() {
181 unpack ${A} 213 unpack ${A}
182 cd ${S} 214 cd ${S}
183 215
… …
195 fi 227 fi
196 228
197 # If this is a driver package we need to fix man page install location. 229 # If this is a driver package we need to fix man page install location.
198 # Running autoreconf will use the patched util-macros to make the 230 # Running autoreconf will use the patched util-macros to make the
199 # change for us, so we only need to patch if it is not going to run. 231 # change for us, so we only need to patch if it is not going to run.
200 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 232 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
233 && [[ ${XDPVER} != -1 ]]; then
201 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 234 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
202 fi 235 fi
203 236
204 # For specific list of patches 237 # For specific list of patches
205 if [[ -n "${PATCHES}" ]] ; then 238 if [[ -n "${PATCHES}" ]] ; then
… …
219x-modular_reconf_source() { 252x-modular_reconf_source() {
220 # Run autoreconf for CVS snapshots only 253 # Run autoreconf for CVS snapshots only
221 if [[ "${SNAPSHOT}" = "yes" ]] 254 if [[ "${SNAPSHOT}" = "yes" ]]
222 then 255 then
223 # If possible, generate configure if it doesn't exist 256 # If possible, generate configure if it doesn't exist
224 if [ -f "${S}/configure.ac" ] 257 if [ -f "./configure.ac" ]
225 then 258 then
226 einfo "Running autoreconf..." 259 eautoreconf
227 autoreconf -v --force --install
228 fi
229 fi 260 fi
261 fi
230 262
263 # Joshua Baergen - October 23, 2005
264 # Fix shared lib issues on MIPS, FBSD, etc etc
265 elibtoolize
231} 266}
232 267
233x-modular_src_unpack() { 268x-modular_src_unpack() {
234 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 269 x-modular_specs_check
235 if gcc-specs-now; then 270 x-modular_server_supports_drivers_check
236 msg="Do not emerge ${PN} without vanilla gcc!" 271 x-modular_dri_check
237 eerror "$msg"
238 die "$msg"
239 fi
240 fi
241
242 x-modular_unpack_source 272 x-modular_unpack_source
243 x-modular_patch_source 273 x-modular_patch_source
244 x-modular_reconf_source 274 x-modular_reconf_source
245
246 # Joshua Baergen - October 23, 2005
247 # Fix shared lib issues on MIPS, FBSD, etc etc
248 elibtoolize
249} 275}
250 276
251x-modular_font_configure() { 277x-modular_font_configure() {
252 if [[ -n "${FONT}" ]]; then 278 if [[ -n "${FONT}" ]]; then
253 # Might be worth adding an option to configure your desired font 279 # Might be worth adding an option to configure your desired font
… …
315# Shouldn't be necessary in XDIR=/usr 341# Shouldn't be necessary in XDIR=/usr
316# einstall forces datadir, so we need to re-force it 342# einstall forces datadir, so we need to re-force it
317# datadir=${XDIR}/share \ 343# datadir=${XDIR}/share \
318# mandir=${XDIR}/share/man \ 344# mandir=${XDIR}/share/man \
319 345
346 if [[ -e ${S}/ChangeLog ]]; then
347 dodoc ${S}/ChangeLog
348 fi
349
350 # Make sure docs get compressed
351 prepalldocs
352
320 # Don't install libtool archives for server modules 353 # Don't install libtool archives for server modules
321 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 354 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
322 find ${D}/usr/lib/xorg/modules -name '*.la' \ 355 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
323 | xargs rm -f 356 | xargs rm -f
324 fi 357 fi
358
359 # Don't install overlapping fonts.* files
360 # Generate them instead when possible
361 if [[ -n "${FONT}" ]]; then
362 remove_font_metadata
363 fi
364
365 if [[ -n "${DRIVER}" ]]; then
366 install_driver_hwdata
367 fi
325} 368}
326 369
327x-modular_pkg_preinst() { 370x-modular_pkg_preinst() {
328 if [[ -n "${FONT}" ]]; then 371 # We no longer do anything here, but we can't remove it from the API
329 discover_font_dirs 372 :
330 fi
331} 373}
332 374
333x-modular_pkg_postinst() { 375x-modular_pkg_postinst() {
334 if [[ -n "${FONT}" ]]; then 376 if [[ -n "${FONT}" ]]; then
335 setup_fonts 377 setup_fonts
… …
337} 379}
338 380
339x-modular_pkg_postrm() { 381x-modular_pkg_postrm() {
340 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
341 cleanup_fonts 383 cleanup_fonts
384 font_pkg_postrm
342 fi 385 fi
343} 386}
344 387
345cleanup_fonts() { 388cleanup_fonts() {
346 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 389 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
… …
376 eend 0 419 eend 0
377 done 420 done
378} 421}
379 422
380setup_fonts() { 423setup_fonts() {
381 if [[ ! -n "${FONT_DIRS}" ]]; then 424 if [[ ! -n "${FONT_DIR}" ]]; then
382 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 425 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
383 eerror "${msg}" 426 eerror "${msg}"
384 die "${msg}" 427 die "${msg}"
385 fi 428 fi
386 429
387 create_fonts_scale 430 create_fonts_scale
388 create_fonts_dir 431 create_fonts_dir
389 fix_font_permissions 432 fix_font_permissions
390 create_font_cache 433 create_font_cache
391} 434}
392 435
436remove_font_metadata() {
437 local DIR
438 for DIR in ${FONT_DIR}; do
439 if [[ "${DIR}" != "Speedo" ]] && \
440 [[ "${DIR}" != "CID" ]] ; then
441 # Delete font metadata files
442 # fonts.scale, fonts.dir, fonts.cache-1
443 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
444 fi
445 done
446}
447
448# Installs device-to-driver mappings for system-config-display
449# and anything else that uses hwdata
450install_driver_hwdata() {
451 insinto /usr/share/hwdata/videoaliases
452 for i in "${FILESDIR}"/*.xinf; do
453 # We need this for the case when none exist,
454 # so *.xinf doesn't expand
455 if [[ -e $i ]]; then
456 doins $i
457 fi
458 done
459}
460
393discover_font_dirs() { 461discover_font_dirs() {
394 pushd ${IMAGE}/usr/share/fonts 462 FONT_DIRS="${FONT_DIR}"
395 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
396 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
397 popd
398} 463}
399 464
400create_fonts_scale() { 465create_fonts_scale() {
401 ebegin "Creating fonts.scale files" 466 ebegin "Creating fonts.scale files"
402 local x 467 local x
403 for FONT_DIR in ${FONT_DIRS}; do 468 for DIR in ${FONT_DIR}; do
404 x=${ROOT}/usr/share/fonts/${FONT_DIR} 469 x=${ROOT}/usr/share/fonts/${DIR}
405 [[ -z "$(ls ${x}/)" ]] && continue 470 [[ -z "$(ls ${x}/)" ]] && continue
406 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 471 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
407 472
408 # Only generate .scale files if truetype, opentype or type1 473 # Only generate .scale files if truetype, opentype or type1
409 # fonts are present ... 474 # fonts are present ...
410 475
411 # First truetype (ttf,ttc)
412 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
413 # Also, there is no way to regenerate Speedo/CID fonts.scale 476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
414 # <spyderous@gentoo.org> 2 August 2004 477 # <spyderous@gentoo.org> 2 August 2004
415 if [[ "${x/encodings}" = "${x}" ]] \ 478 if [[ "${x/encodings}" = "${x}" ]] \
416 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
417 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
418 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
419 ${ROOT}/usr/bin/ttmkfdir -x 2 \
420 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
421 -o ${x}/fonts.scale -d ${x}
422 # ttmkfdir fails on some stuff, so try mkfontscale if it does
423 local ttmkfdir_return=$?
424 else
425 # We didn't use ttmkfdir at all
426 local ttmkfdir_return=2
427 fi
428 if [[ ${ttmkfdir_return} -ne 0 ]]; then
429 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
430 ${ROOT}/usr/bin/mkfontscale \
431 -a /usr/share/fonts/encodings/encodings.dir \
432 -- ${x}
433 fi
434 # Next type1 and opentype (pfa,pfb,otf,otc)
435 elif [[ "${x/encodings}" = "${x}" ]] \
436 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
437 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 mkfontscale \
438 ${ROOT}/usr/bin/mkfontscale \
439 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
440 -- ${x} 482 -- ${x}
441 fi 483 fi
442 done 484 done
443 eend 0 485 eend 0
444} 486}
445 487
446create_fonts_dir() { 488create_fonts_dir() {
447 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
448 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 494
453 if [[ "${x/encodings}" = "${x}" ]]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
454 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 mkfontdir \
455 ${ROOT}/usr/bin/mkfontdir \
456 -e ${ROOT}/usr/share/fonts/encodings \ 497 -e ${ROOT}/usr/share/fonts/encodings \
457 -e ${ROOT}/usr/share/fonts/encodings/large \ 498 -e ${ROOT}/usr/share/fonts/encodings/large \
458 -- ${x} 499 -- ${x}
459 fi 500 fi
460 done 501 done
461 eend 0 502 eend 0
462} 503}
463 504
464fix_font_permissions() { 505fix_font_permissions() {
465 ebegin "Fixing permissions" 506 ebegin "Fixing permissions"
466 for FONT_DIR in ${FONT_DIRS}; do 507 for DIR in ${FONT_DIR}; do
467 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
468 -exec chmod 0644 {} \; 509 -exec chmod 0644 {} \;
469 done 510 done
470 eend 0 511 eend 0
471} 512}
472 513
473create_font_cache() { 514create_font_cache() {
474 # danarmak found out that fc-cache should be run AFTER all the above 515 font_pkg_postinst
475 # stuff, as otherwise the cache is invalid, and has to be run again
476 # as root anyway
477 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
478 ebegin "Creating FC font cache"
479 HOME="/root" ${ROOT}/usr/bin/fc-cache
480 eend 0
481 fi
482} 516}
517
518EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.44  
changed lines
  Added in v.1.80
  ViewVC Help
Powered by ViewVC 1.1.20