/[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.60 Revision 1.79
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.60 2006/05/23 17:50:30 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.79 2006/10/30 06:13:48 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.
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 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 28inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools font
31 29
32# Directory prefix to use for everything 30# Directory prefix to use for everything
33XDIR="/usr" 31XDIR="/usr"
34 32
35# Set up default patchset version(s) if necessary 33# Set up default patchset version(s) if necessary
130# If we're a driver package 128# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 129if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 130 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 131 DRIVER="yes"
134 132
133 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 134 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 135 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 136 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
137 fi
138fi 138fi
139 139
140# Debugging -- ignore packages that can't be built with debugging 140# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 141if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 142 || [[ "${PN/app-doc}" != "${PN}" ]] \
159DEPEND="${DEPEND} 159DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 160 >=dev-util/pkgconfig-0.18"
161 161
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 162if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 163 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3"
165fi 166fi
166 167
167RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
169 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
168 !<=x11-base/xorg-x11-6.9" 170 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 171# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 172# x11-base/x11-env"
171 173
172x-modular_specs_check() { 174x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 175 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then 176 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 177 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now 178 filter-ldflags -Wl,-z,now
182 fi 179 fi
183} 180}
184 181
193 fi 190 fi
194 fi 191 fi
195 fi 192 fi
196} 193}
197 194
195x-modular_server_supports_drivers_check() {
196 # (#135873) Only certain servers will actually use or be capable of
197 # building external drivers, including binary drivers.
198 if [[ -n "${DRIVER}" ]]; then
199 if has_version '>=x11-base/xorg-server-1.1'; then
200 if ! built_with_use x11-base/xorg-server xorg; then
201 eerror "x11-base/xorg-server is not built with support for external drivers."
202 die "You must build x11-base/xorg-server with USE=xorg."
203 fi
204 fi
205 fi
206}
207
198x-modular_unpack_source() { 208x-modular_unpack_source() {
199 unpack ${A} 209 unpack ${A}
200 cd ${S} 210 cd ${S}
201 211
202 if [[ -n ${FONT_OPTIONS} ]]; then 212 if [[ -n ${FONT_OPTIONS} ]]; then
213 fi 223 fi
214 224
215 # If this is a driver package we need to fix man page install location. 225 # 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 226 # 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. 227 # change for us, so we only need to patch if it is not going to run.
218 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 228 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
229 && [[ ${XDPVER} != -1 ]]; then
219 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 230 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
220 fi 231 fi
221 232
222 # For specific list of patches 233 # For specific list of patches
223 if [[ -n "${PATCHES}" ]] ; then 234 if [[ -n "${PATCHES}" ]] ; then
237x-modular_reconf_source() { 248x-modular_reconf_source() {
238 # Run autoreconf for CVS snapshots only 249 # Run autoreconf for CVS snapshots only
239 if [[ "${SNAPSHOT}" = "yes" ]] 250 if [[ "${SNAPSHOT}" = "yes" ]]
240 then 251 then
241 # If possible, generate configure if it doesn't exist 252 # If possible, generate configure if it doesn't exist
242 if [ -f "${S}/configure.ac" ] 253 if [ -f "./configure.ac" ]
243 then 254 then
244 eautoreconf 255 eautoreconf
245 fi 256 fi
246 fi 257 fi
247 258
250 elibtoolize 261 elibtoolize
251} 262}
252 263
253x-modular_src_unpack() { 264x-modular_src_unpack() {
254 x-modular_specs_check 265 x-modular_specs_check
266 x-modular_server_supports_drivers_check
255 x-modular_dri_check 267 x-modular_dri_check
256 x-modular_unpack_source 268 x-modular_unpack_source
257 x-modular_patch_source 269 x-modular_patch_source
258 x-modular_reconf_source 270 x-modular_reconf_source
259} 271}
333 345
334 # Make sure docs get compressed 346 # Make sure docs get compressed
335 prepalldocs 347 prepalldocs
336 348
337 # Don't install libtool archives for server modules 349 # Don't install libtool archives for server modules
338 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 350 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
339 find ${D}/usr/lib/xorg/modules -name '*.la' \ 351 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
340 | xargs rm -f 352 | xargs rm -f
341 fi 353 fi
342 354
343 # Don't install overlapping fonts.* files 355 # Don't install overlapping fonts.* files
344 # Generate them instead when possible 356 # Generate them instead when possible
345 if [[ -n "${FONT}" ]]; then 357 if [[ -n "${FONT}" ]]; then
346 remove_font_metadata 358 remove_font_metadata
347 fi 359 fi
360
361 if [[ -n "${DRIVER}" ]]; then
362 install_driver_hwdata
363 fi
348} 364}
349 365
350x-modular_pkg_preinst() { 366x-modular_pkg_preinst() {
351 if [[ -n "${FONT}" ]]; then 367 # We no longer do anything here, but we can't remove it from the API
352 discover_font_dirs 368 :
353 fi
354} 369}
355 370
356x-modular_pkg_postinst() { 371x-modular_pkg_postinst() {
357 if [[ -n "${FONT}" ]]; then 372 if [[ -n "${FONT}" ]]; then
358 setup_fonts 373 setup_fonts
360} 375}
361 376
362x-modular_pkg_postrm() { 377x-modular_pkg_postrm() {
363 if [[ -n "${FONT}" ]]; then 378 if [[ -n "${FONT}" ]]; then
364 cleanup_fonts 379 cleanup_fonts
380 font_pkg_postrm
365 fi 381 fi
366} 382}
367 383
368cleanup_fonts() { 384cleanup_fonts() {
369 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 385 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
399 eend 0 415 eend 0
400 done 416 done
401} 417}
402 418
403setup_fonts() { 419setup_fonts() {
404 if [[ ! -n "${FONT_DIRS}" ]]; then 420 if [[ ! -n "${FONT_DIR}" ]]; then
405 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 421 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
406 eerror "${msg}" 422 eerror "${msg}"
407 die "${msg}" 423 die "${msg}"
408 fi 424 fi
409 425
410 create_fonts_scale 426 create_fonts_scale
423 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 439 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
424 fi 440 fi
425 done 441 done
426} 442}
427 443
444# Installs device-to-driver mappings for system-config-display
445# and anything else that uses hwdata
446install_driver_hwdata() {
447 insinto /usr/share/hwdata/videoaliases
448 for i in "${FILESDIR}"/*.xinf; do
449 # We need this for the case when none exist,
450 # so *.xinf doesn't expand
451 if [[ -e $i ]]; then
452 doins $i
453 fi
454 done
455}
456
428discover_font_dirs() { 457discover_font_dirs() {
429 pushd ${IMAGE}/usr/share/fonts 458 FONT_DIRS="${FONT_DIR}"
430 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
431 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
432 popd
433} 459}
434 460
435create_fonts_scale() { 461create_fonts_scale() {
436 ebegin "Creating fonts.scale files" 462 ebegin "Creating fonts.scale files"
437 local x 463 local x
438 for FONT_DIR in ${FONT_DIRS}; do 464 for DIR in ${FONT_DIR}; do
439 x=${ROOT}/usr/share/fonts/${FONT_DIR} 465 x=${ROOT}/usr/share/fonts/${DIR}
440 [[ -z "$(ls ${x}/)" ]] && continue 466 [[ -z "$(ls ${x}/)" ]] && continue
441 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 467 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
442 468
443 # Only generate .scale files if truetype, opentype or type1 469 # Only generate .scale files if truetype, opentype or type1
444 # fonts are present ... 470 # fonts are present ...
445 471
446 # First truetype (ttf,ttc)
447 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
448 # Also, there is no way to regenerate Speedo/CID fonts.scale 472 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
449 # <spyderous@gentoo.org> 2 August 2004 473 # <spyderous@gentoo.org> 2 August 2004
450 if [[ "${x/encodings}" = "${x}" ]] \ 474 if [[ "${x/encodings}" = "${x}" ]] \
451 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
452 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
453 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
454 ${ROOT}/usr/bin/ttmkfdir -x 2 \
455 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
456 -o ${x}/fonts.scale -d ${x}
457 # ttmkfdir fails on some stuff, so try mkfontscale if it does
458 local ttmkfdir_return=$?
459 else
460 # We didn't use ttmkfdir at all
461 local ttmkfdir_return=2
462 fi
463 if [[ ${ttmkfdir_return} -ne 0 ]]; then
464 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
465 ${ROOT}/usr/bin/mkfontscale \
466 -a /usr/share/fonts/encodings/encodings.dir \
467 -- ${x}
468 fi
469 # Next type1 and opentype (pfa,pfb,otf,otc)
470 elif [[ "${x/encodings}" = "${x}" ]] \
471 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 475 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
472 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 476 mkfontscale \
473 ${ROOT}/usr/bin/mkfontscale \
474 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 477 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
475 -- ${x} 478 -- ${x}
476 fi 479 fi
477 done 480 done
478 eend 0 481 eend 0
479} 482}
480 483
481create_fonts_dir() { 484create_fonts_dir() {
482 ebegin "Generating fonts.dir files" 485 ebegin "Generating fonts.dir files"
483 for FONT_DIR in ${FONT_DIRS}; do 486 for DIR in ${FONT_DIR}; do
484 x=${ROOT}/usr/share/fonts/${FONT_DIR} 487 x=${ROOT}/usr/share/fonts/${DIR}
485 [[ -z "$(ls ${x}/)" ]] && continue 488 [[ -z "$(ls ${x}/)" ]] && continue
486 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 489 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
487 490
488 if [[ "${x/encodings}" = "${x}" ]]; then 491 if [[ "${x/encodings}" = "${x}" ]]; then
489 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 492 mkfontdir \
490 ${ROOT}/usr/bin/mkfontdir \
491 -e ${ROOT}/usr/share/fonts/encodings \ 493 -e ${ROOT}/usr/share/fonts/encodings \
492 -e ${ROOT}/usr/share/fonts/encodings/large \ 494 -e ${ROOT}/usr/share/fonts/encodings/large \
493 -- ${x} 495 -- ${x}
494 fi 496 fi
495 done 497 done
496 eend 0 498 eend 0
497} 499}
498 500
499fix_font_permissions() { 501fix_font_permissions() {
500 ebegin "Fixing permissions" 502 ebegin "Fixing permissions"
501 for FONT_DIR in ${FONT_DIRS}; do 503 for DIR in ${FONT_DIR}; do
502 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 504 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
503 -exec chmod 0644 {} \; 505 -exec chmod 0644 {} \;
504 done 506 done
505 eend 0 507 eend 0
506} 508}
507 509
508create_font_cache() { 510create_font_cache() {
509 # danarmak found out that fc-cache should be run AFTER all the above 511 font_pkg_postinst
510 # stuff, as otherwise the cache is invalid, and has to be run again
511 # as root anyway
512 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
513 ebegin "Creating FC font cache"
514 HOME="/root" ${ROOT}/usr/bin/fc-cache
515 eend 0
516 fi
517} 512}
513
514EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.79

  ViewVC Help
Powered by ViewVC 1.1.20