/[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.63 Revision 1.82
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.63 2006/06/30 03:52:57 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.82 2007/05/02 07:10:02 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.
… …
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}" ]] \
… …
155 fi 166 fi
156 fi 167 fi
157fi 168fi
158 169
159DEPEND="${DEPEND} 170DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18 171 >=dev-util/pkgconfig-0.18"
161 >=sys-devel/binutils-2.16.1-r3"
162 172
163if [[ "${PN/util-macros}" = "${PN}" ]]; then 173if [[ "${PN/util-macros}" = "${PN}" ]]; then
164 DEPEND="${DEPEND} 174 DEPEND="${DEPEND}
165 >=x11-misc/util-macros-0.99.2" 175 >=x11-misc/util-macros-0.99.2
176 >=sys-devel/binutils-2.16.1-r3"
166fi 177fi
167 178
168RDEPEND="${RDEPEND} 179RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
169 !<=x11-base/xorg-x11-6.9" 181 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 182# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 183# x11-base/x11-env"
184
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
172 186
173x-modular_specs_check() { 187x-modular_specs_check() {
174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
175 append-ldflags -Wl,-z,lazy 189 append-ldflags -Wl,-z,lazy
176 # (#116698) breaks loading 190 # (#116698) breaks loading
… …
193 207
194x-modular_server_supports_drivers_check() { 208x-modular_server_supports_drivers_check() {
195 # (#135873) Only certain servers will actually use or be capable of 209 # (#135873) Only certain servers will actually use or be capable of
196 # building external drivers, including binary drivers. 210 # building external drivers, including binary drivers.
197 if [[ -n "${DRIVER}" ]]; then 211 if [[ -n "${DRIVER}" ]]; then
212 if has_version '>=x11-base/xorg-server-1.1'; then
198 if ! built_with_use x11-base/xorg-server xorg; then 213 if ! built_with_use x11-base/xorg-server xorg; then
199 eerror "x11-base/xorg-server is not built with support for external drivers." 214 eerror "x11-base/xorg-server is not built with support for external drivers."
200 die "You must build x11-base/xorg-server with USE=xorg." 215 die "You must build x11-base/xorg-server with USE=xorg."
216 fi
201 fi 217 fi
202 fi 218 fi
203} 219}
204 220
205x-modular_unpack_source() { 221x-modular_unpack_source() {
… …
220 fi 236 fi
221 237
222 # 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.
223 # Running autoreconf will use the patched util-macros to make the 239 # Running autoreconf will use the patched util-macros to make the
224 # 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.
225 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 241 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
242 && [[ ${XDPVER} != -1 ]]; then
226 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 243 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
227 fi 244 fi
228 245
229 # For specific list of patches 246 # For specific list of patches
230 if [[ -n "${PATCHES}" ]] ; then 247 if [[ -n "${PATCHES}" ]] ; then
… …
244x-modular_reconf_source() { 261x-modular_reconf_source() {
245 # Run autoreconf for CVS snapshots only 262 # Run autoreconf for CVS snapshots only
246 if [[ "${SNAPSHOT}" = "yes" ]] 263 if [[ "${SNAPSHOT}" = "yes" ]]
247 then 264 then
248 # If possible, generate configure if it doesn't exist 265 # If possible, generate configure if it doesn't exist
249 if [ -f "${S}/configure.ac" ] 266 if [ -f "./configure.ac" ]
250 then 267 then
251 eautoreconf 268 eautoreconf
252 fi 269 fi
253 fi 270 fi
254 271
… …
341 358
342 # Make sure docs get compressed 359 # Make sure docs get compressed
343 prepalldocs 360 prepalldocs
344 361
345 # Don't install libtool archives for server modules 362 # Don't install libtool archives for server modules
346 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 363 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
347 find ${D}/usr/lib/xorg/modules -name '*.la' \ 364 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
348 | xargs rm -f 365 | xargs rm -f
349 fi 366 fi
350 367
351 # Don't install overlapping fonts.* files 368 # Don't install overlapping fonts.* files
352 # Generate them instead when possible 369 # Generate them instead when possible
353 if [[ -n "${FONT}" ]]; then 370 if [[ -n "${FONT}" ]]; then
354 remove_font_metadata 371 remove_font_metadata
355 fi 372 fi
373
374 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata
376 fi
356} 377}
357 378
358x-modular_pkg_preinst() { 379x-modular_pkg_preinst() {
359 if [[ -n "${FONT}" ]]; then 380 # We no longer do anything here, but we can't remove it from the API
360 discover_font_dirs 381 :
361 fi
362} 382}
363 383
364x-modular_pkg_postinst() { 384x-modular_pkg_postinst() {
365 if [[ -n "${FONT}" ]]; then 385 if [[ -n "${FONT}" ]]; then
366 setup_fonts 386 setup_fonts
… …
368} 388}
369 389
370x-modular_pkg_postrm() { 390x-modular_pkg_postrm() {
371 if [[ -n "${FONT}" ]]; then 391 if [[ -n "${FONT}" ]]; then
372 cleanup_fonts 392 cleanup_fonts
393 font_pkg_postrm
373 fi 394 fi
374} 395}
375 396
376cleanup_fonts() { 397cleanup_fonts() {
377 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"
… …
407 eend 0 428 eend 0
408 done 429 done
409} 430}
410 431
411setup_fonts() { 432setup_fonts() {
412 if [[ ! -n "${FONT_DIRS}" ]]; then 433 if [[ ! -n "${FONT_DIR}" ]]; then
413 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."
414 eerror "${msg}" 435 eerror "${msg}"
415 die "${msg}" 436 die "${msg}"
416 fi 437 fi
417 438
418 create_fonts_scale 439 create_fonts_scale
… …
431 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}
432 fi 453 fi
433 done 454 done
434} 455}
435 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
436discover_font_dirs() { 470discover_font_dirs() {
437 pushd ${IMAGE}/usr/share/fonts 471 FONT_DIRS="${FONT_DIR}"
438 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
439 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
440 popd
441} 472}
442 473
443create_fonts_scale() { 474create_fonts_scale() {
444 ebegin "Creating fonts.scale files" 475 ebegin "Creating fonts.scale files"
445 local x 476 local x
446 for FONT_DIR in ${FONT_DIRS}; do 477 for DIR in ${FONT_DIR}; do
447 x=${ROOT}/usr/share/fonts/${FONT_DIR} 478 x=${ROOT}/usr/share/fonts/${DIR}
448 [[ -z "$(ls ${x}/)" ]] && continue 479 [[ -z "$(ls ${x}/)" ]] && continue
449 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
450 481
451 # Only generate .scale files if truetype, opentype or type1 482 # Only generate .scale files if truetype, opentype or type1
452 # fonts are present ... 483 # fonts are present ...
453 484
454 # First truetype (ttf,ttc)
455 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
456 # Also, there is no way to regenerate Speedo/CID fonts.scale 485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
457 # <spyderous@gentoo.org> 2 August 2004 486 # <spyderous@gentoo.org> 2 August 2004
458 if [[ "${x/encodings}" = "${x}" ]] \ 487 if [[ "${x/encodings}" = "${x}" ]] \
459 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
460 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
461 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
462 ${ROOT}/usr/bin/ttmkfdir -x 2 \
463 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
464 -o ${x}/fonts.scale -d ${x}
465 # ttmkfdir fails on some stuff, so try mkfontscale if it does
466 local ttmkfdir_return=$?
467 else
468 # We didn't use ttmkfdir at all
469 local ttmkfdir_return=2
470 fi
471 if [[ ${ttmkfdir_return} -ne 0 ]]; then
472 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
473 ${ROOT}/usr/bin/mkfontscale \
474 -a /usr/share/fonts/encodings/encodings.dir \
475 -- ${x}
476 fi
477 # Next type1 and opentype (pfa,pfb,otf,otc)
478 elif [[ "${x/encodings}" = "${x}" ]] \
479 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
480 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 489 mkfontscale \
481 ${ROOT}/usr/bin/mkfontscale \
482 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
483 -- ${x} 491 -- ${x}
484 fi 492 fi
485 done 493 done
486 eend 0 494 eend 0
487} 495}
488 496
489create_fonts_dir() { 497create_fonts_dir() {
490 ebegin "Generating fonts.dir files" 498 ebegin "Generating fonts.dir files"
491 for FONT_DIR in ${FONT_DIRS}; do 499 for DIR in ${FONT_DIR}; do
492 x=${ROOT}/usr/share/fonts/${FONT_DIR} 500 x=${ROOT}/usr/share/fonts/${DIR}
493 [[ -z "$(ls ${x}/)" ]] && continue 501 [[ -z "$(ls ${x}/)" ]] && continue
494 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 502 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
495 503
496 if [[ "${x/encodings}" = "${x}" ]]; then 504 if [[ "${x/encodings}" = "${x}" ]]; then
497 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 505 mkfontdir \
498 ${ROOT}/usr/bin/mkfontdir \
499 -e ${ROOT}/usr/share/fonts/encodings \ 506 -e ${ROOT}/usr/share/fonts/encodings \
500 -e ${ROOT}/usr/share/fonts/encodings/large \ 507 -e ${ROOT}/usr/share/fonts/encodings/large \
501 -- ${x} 508 -- ${x}
502 fi 509 fi
503 done 510 done
504 eend 0 511 eend 0
505} 512}
506 513
507fix_font_permissions() { 514fix_font_permissions() {
508 ebegin "Fixing permissions" 515 ebegin "Fixing permissions"
509 for FONT_DIR in ${FONT_DIRS}; do 516 for DIR in ${FONT_DIR}; do
510 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
511 -exec chmod 0644 {} \; 518 -exec chmod 0644 {} \;
512 done 519 done
513 eend 0 520 eend 0
514} 521}
515 522
516create_font_cache() { 523create_font_cache() {
517 # danarmak found out that fc-cache should be run AFTER all the above 524 font_pkg_postinst
518 # stuff, as otherwise the cache is invalid, and has to be run again
519 # as root anyway
520 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
521 ebegin "Creating FC font cache"
522 HOME="/root" ${ROOT}/usr/bin/fc-cache
523 eend 0
524 fi
525} 525}
526
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.63  
changed lines
  Added in v.1.82
  ViewVC Help
Powered by ViewVC 1.1.20