/[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.59 Revision 1.83
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.59 2006/05/16 06:23:43 exg Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.83 2007/05/02 07:10:33 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <dberkholz@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.
9# 9#
10# Using this eclass: 10# Using this eclass:
19# 19#
20# If you're creating a font package and the suffix of PN is not equal to the 20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that 21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories. 22# directory or directories.
23# 23#
24# If you want to change the auto-application of the driver patchset or prevent
25# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
26# application or positive integers for that patch version.
27#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 28# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
29#
30# If you want to install to a non-default prefix (e.g., /opt/xorg), change
31# XDIR. This has not been recently tested. You may need to uncomment the
32# setting of datadir and mandir in x-modular_src_install() or add it back in if
33# it's no longer there. You may also want to change the SLOT.
25# 34#
26# Pretty much everything else should be automatic. 35# 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 autotools
31 36
32# Directory prefix to use for everything 37# Directory prefix to use for everything
33XDIR="/usr" 38XDIR="/usr"
34 39
35# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
79 84
80# Set up shared dependencies 85# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
88fi 93fi
89 94
90# If we're a font package, but not the font.alias one 95# If we're a font package, but not the font.alias one
96FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 98 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 99 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 100 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 101 # Activate font code in the rest of the eclass
96 FONT="yes" 102 FONT="yes"
97 103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
106
98 RDEPEND="${RDEPEND} 107 RDEPEND="${RDEPEND}
99 media-fonts/encodings 108 media-fonts/encodings
100 x11-apps/mkfontscale 109 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 110 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 111 PDEPEND="${PDEPEND}
130# If we're a driver package 139# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 140if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 141 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 142 DRIVER="yes"
134 143
144 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 147 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi
138fi 149fi
139 150
140# Debugging -- ignore packages that can't be built with debugging 151# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 152if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 153 || [[ "${PN/app-doc}" != "${PN}" ]] \
159DEPEND="${DEPEND} 170DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 171 >=dev-util/pkgconfig-0.18"
161 172
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 173if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 174 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 175 >=x11-misc/util-macros-0.99.2
176 >=sys-devel/binutils-2.16.1-r3"
165fi 177fi
166 178
167RDEPEND="${RDEPEND} 179RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
168 !<=x11-base/xorg-x11-6.9" 181 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 182# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 183# x11-base/x11-env"
171 184
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
186
172x-modular_specs_check() { 187x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then 189 append-ldflags -Wl,-z,lazy
175 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
176 eerror "$msg"
177 die "$msg"
178 fi
179
180 # (#116698) breaks loading 190 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now 191 filter-ldflags -Wl,-z,now
182 fi 192 fi
183} 193}
184 194
193 fi 203 fi
194 fi 204 fi
195 fi 205 fi
196} 206}
197 207
208x-modular_server_supports_drivers_check() {
209 # (#135873) Only certain servers will actually use or be capable of
210 # building external drivers, including binary drivers.
211 if [[ -n "${DRIVER}" ]]; then
212 if has_version '>=x11-base/xorg-server-1.1'; then
213 if ! built_with_use x11-base/xorg-server xorg; then
214 eerror "x11-base/xorg-server is not built with support for external drivers."
215 die "You must build x11-base/xorg-server with USE=xorg."
216 fi
217 fi
218 fi
219}
220
198x-modular_unpack_source() { 221x-modular_unpack_source() {
199 unpack ${A} 222 unpack ${A}
200 cd ${S} 223 cd ${S}
201 224
202 if [[ -n ${FONT_OPTIONS} ]]; then 225 if [[ -n ${FONT_OPTIONS} ]]; then
213 fi 236 fi
214 237
215 # If this is a driver package we need to fix man page install location. 238 # If this is a driver package we need to fix man page install location.
216 # Running autoreconf will use the patched util-macros to make the 239 # Running autoreconf will use the patched util-macros to make the
217 # change for us, so we only need to patch if it is not going to run. 240 # change for us, so we only need to patch if it is not going to run.
218 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 241 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
242 && [[ ${XDPVER} != -1 ]]; then
219 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 243 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
220 fi 244 fi
221 245
222 # For specific list of patches 246 # For specific list of patches
223 if [[ -n "${PATCHES}" ]] ; then 247 if [[ -n "${PATCHES}" ]] ; then
237x-modular_reconf_source() { 261x-modular_reconf_source() {
238 # Run autoreconf for CVS snapshots only 262 # Run autoreconf for CVS snapshots only
239 if [[ "${SNAPSHOT}" = "yes" ]] 263 if [[ "${SNAPSHOT}" = "yes" ]]
240 then 264 then
241 # If possible, generate configure if it doesn't exist 265 # If possible, generate configure if it doesn't exist
242 if [ -f "${S}/configure.ac" ] 266 if [ -f "./configure.ac" ]
243 then 267 then
244 eautoreconf 268 eautoreconf
245 fi 269 fi
246 fi 270 fi
247 271
250 elibtoolize 274 elibtoolize
251} 275}
252 276
253x-modular_src_unpack() { 277x-modular_src_unpack() {
254 x-modular_specs_check 278 x-modular_specs_check
279 x-modular_server_supports_drivers_check
255 x-modular_dri_check 280 x-modular_dri_check
256 x-modular_unpack_source 281 x-modular_unpack_source
257 x-modular_patch_source 282 x-modular_patch_source
258 x-modular_reconf_source 283 x-modular_reconf_source
259} 284}
325# Shouldn't be necessary in XDIR=/usr 350# Shouldn't be necessary in XDIR=/usr
326# einstall forces datadir, so we need to re-force it 351# einstall forces datadir, so we need to re-force it
327# datadir=${XDIR}/share \ 352# datadir=${XDIR}/share \
328# mandir=${XDIR}/share/man \ 353# mandir=${XDIR}/share/man \
329 354
355 if [[ -e ${S}/ChangeLog ]]; then
356 dodoc ${S}/ChangeLog
357 fi
358
330 # Make sure docs get compressed 359 # Make sure docs get compressed
331 prepalldocs 360 prepalldocs
332 361
333 # Don't install libtool archives for server modules 362 # Don't install libtool archives for server modules
334 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 363 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
335 find ${D}/usr/lib/xorg/modules -name '*.la' \ 364 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
336 | xargs rm -f 365 | xargs rm -f
337 fi 366 fi
338 367
339 # Don't install overlapping fonts.* files 368 # Don't install overlapping fonts.* files
340 # Generate them instead when possible 369 # Generate them instead when possible
341 if [[ -n "${FONT}" ]]; then 370 if [[ -n "${FONT}" ]]; then
342 remove_font_metadata 371 remove_font_metadata
343 fi 372 fi
373
374 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata
376 fi
344} 377}
345 378
346x-modular_pkg_preinst() { 379x-modular_pkg_preinst() {
347 if [[ -n "${FONT}" ]]; then 380 # We no longer do anything here, but we can't remove it from the API
348 discover_font_dirs 381 :
349 fi
350} 382}
351 383
352x-modular_pkg_postinst() { 384x-modular_pkg_postinst() {
353 if [[ -n "${FONT}" ]]; then 385 if [[ -n "${FONT}" ]]; then
354 setup_fonts 386 setup_fonts
356} 388}
357 389
358x-modular_pkg_postrm() { 390x-modular_pkg_postrm() {
359 if [[ -n "${FONT}" ]]; then 391 if [[ -n "${FONT}" ]]; then
360 cleanup_fonts 392 cleanup_fonts
393 font_pkg_postrm
361 fi 394 fi
362} 395}
363 396
364cleanup_fonts() { 397cleanup_fonts() {
365 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 398 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
395 eend 0 428 eend 0
396 done 429 done
397} 430}
398 431
399setup_fonts() { 432setup_fonts() {
400 if [[ ! -n "${FONT_DIRS}" ]]; then 433 if [[ ! -n "${FONT_DIR}" ]]; then
401 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 434 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
402 eerror "${msg}" 435 eerror "${msg}"
403 die "${msg}" 436 die "${msg}"
404 fi 437 fi
405 438
406 create_fonts_scale 439 create_fonts_scale
419 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 452 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
420 fi 453 fi
421 done 454 done
422} 455}
423 456
457# Installs device-to-driver mappings for system-config-display
458# and anything else that uses hwdata
459install_driver_hwdata() {
460 insinto /usr/share/hwdata/videoaliases
461 for i in "${FILESDIR}"/*.xinf; do
462 # We need this for the case when none exist,
463 # so *.xinf doesn't expand
464 if [[ -e $i ]]; then
465 doins $i
466 fi
467 done
468}
469
424discover_font_dirs() { 470discover_font_dirs() {
425 pushd ${IMAGE}/usr/share/fonts 471 FONT_DIRS="${FONT_DIR}"
426 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
427 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
428 popd
429} 472}
430 473
431create_fonts_scale() { 474create_fonts_scale() {
432 ebegin "Creating fonts.scale files" 475 ebegin "Creating fonts.scale files"
433 local x 476 local x
434 for FONT_DIR in ${FONT_DIRS}; do 477 for DIR in ${FONT_DIR}; do
435 x=${ROOT}/usr/share/fonts/${FONT_DIR} 478 x=${ROOT}/usr/share/fonts/${DIR}
436 [[ -z "$(ls ${x}/)" ]] && continue 479 [[ -z "$(ls ${x}/)" ]] && continue
437 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
438 481
439 # Only generate .scale files if truetype, opentype or type1 482 # Only generate .scale files if truetype, opentype or type1
440 # fonts are present ... 483 # fonts are present ...
441 484
442 # First truetype (ttf,ttc)
443 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
444 # Also, there is no way to regenerate Speedo/CID fonts.scale 485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
445 # <spyderous@gentoo.org> 2 August 2004 486 # <dberkholz@gentoo.org> 2 August 2004
446 if [[ "${x/encodings}" = "${x}" ]] \ 487 if [[ "${x/encodings}" = "${x}" ]] \
447 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
448 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
449 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
450 ${ROOT}/usr/bin/ttmkfdir -x 2 \
451 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
452 -o ${x}/fonts.scale -d ${x}
453 # ttmkfdir fails on some stuff, so try mkfontscale if it does
454 local ttmkfdir_return=$?
455 else
456 # We didn't use ttmkfdir at all
457 local ttmkfdir_return=2
458 fi
459 if [[ ${ttmkfdir_return} -ne 0 ]]; then
460 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
461 ${ROOT}/usr/bin/mkfontscale \
462 -a /usr/share/fonts/encodings/encodings.dir \
463 -- ${x}
464 fi
465 # Next type1 and opentype (pfa,pfb,otf,otc)
466 elif [[ "${x/encodings}" = "${x}" ]] \
467 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
468 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 489 mkfontscale \
469 ${ROOT}/usr/bin/mkfontscale \
470 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
471 -- ${x} 491 -- ${x}
472 fi 492 fi
473 done 493 done
474 eend 0 494 eend 0
475} 495}
476 496
477create_fonts_dir() { 497create_fonts_dir() {
478 ebegin "Generating fonts.dir files" 498 ebegin "Generating fonts.dir files"
479 for FONT_DIR in ${FONT_DIRS}; do 499 for DIR in ${FONT_DIR}; do
480 x=${ROOT}/usr/share/fonts/${FONT_DIR} 500 x=${ROOT}/usr/share/fonts/${DIR}
481 [[ -z "$(ls ${x}/)" ]] && continue 501 [[ -z "$(ls ${x}/)" ]] && continue
482 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 502 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
483 503
484 if [[ "${x/encodings}" = "${x}" ]]; then 504 if [[ "${x/encodings}" = "${x}" ]]; then
485 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 505 mkfontdir \
486 ${ROOT}/usr/bin/mkfontdir \
487 -e ${ROOT}/usr/share/fonts/encodings \ 506 -e ${ROOT}/usr/share/fonts/encodings \
488 -e ${ROOT}/usr/share/fonts/encodings/large \ 507 -e ${ROOT}/usr/share/fonts/encodings/large \
489 -- ${x} 508 -- ${x}
490 fi 509 fi
491 done 510 done
492 eend 0 511 eend 0
493} 512}
494 513
495fix_font_permissions() { 514fix_font_permissions() {
496 ebegin "Fixing permissions" 515 ebegin "Fixing permissions"
497 for FONT_DIR in ${FONT_DIRS}; do 516 for DIR in ${FONT_DIR}; do
498 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
499 -exec chmod 0644 {} \; 518 -exec chmod 0644 {} \;
500 done 519 done
501 eend 0 520 eend 0
502} 521}
503 522
504create_font_cache() { 523create_font_cache() {
505 # danarmak found out that fc-cache should be run AFTER all the above 524 font_pkg_postinst
506 # stuff, as otherwise the cache is invalid, and has to be run again
507 # as root anyway
508 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
509 ebegin "Creating FC font cache"
510 HOME="/root" ${ROOT}/usr/bin/fc-cache
511 eend 0
512 fi
513} 525}
526
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.59  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20