/[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.55 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.55 2006/04/21 07:01: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 autotools
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 69
78SLOT="0" 70SLOT="0"
79 71
80# 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
81# LICENSE after the inherit. 73# LICENSE after the inherit.
90 >=sys-devel/libtool-1.5 82 >=sys-devel/libtool-1.5
91 >=sys-devel/m4-1.4" 83 >=sys-devel/m4-1.4"
92fi 84fi
93 85
94# 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=""
95if [[ "${PN/#font-}" != "${PN}" ]] \ 88if [[ "${PN/#font-}" != "${PN}" ]] \
96 && [[ "${CATEGORY}" = "media-fonts" ]] \ 89 && [[ "${CATEGORY}" = "media-fonts" ]] \
97 && [[ "${PN}" != "font-alias" ]] \ 90 && [[ "${PN}" != "font-alias" ]] \
98 && [[ "${PN}" != "font-util" ]]; then 91 && [[ "${PN}" != "font-util" ]]; then
99 # Activate font code in the rest of the eclass 92 # Activate font code in the rest of the eclass
100 FONT="yes" 93 FONT="yes"
101 94
95 # Whether to inherit the font eclass
96 FONT_ECLASS="font"
97
102 RDEPEND="${RDEPEND} 98 RDEPEND="${RDEPEND}
103 media-fonts/encodings 99 media-fonts/encodings
104 x11-apps/mkfontscale 100 x11-apps/mkfontscale
105 x11-apps/mkfontdir" 101 x11-apps/mkfontdir"
106 PDEPEND="${PDEPEND} 102 PDEPEND="${PDEPEND}
134# If we're a driver package 130# If we're a driver package
135if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
136 # Enable driver code in the rest of the eclass 132 # Enable driver code in the rest of the eclass
137 DRIVER="yes" 133 DRIVER="yes"
138 134
135 if [[ ${XDPVER} != -1 ]]; then
139 # Add driver patchset to SRC_URI 136 # Add driver patchset to SRC_URI
140 SRC_URI="${SRC_URI} 137 SRC_URI="${SRC_URI}
141 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
142fi 140fi
143 141
144# Debugging -- ignore packages that can't be built with debugging 142# Debugging -- ignore packages that can't be built with debugging
145if [[ -z "${FONT}" ]] \ 143if [[ -z "${FONT}" ]] \
146 || [[ "${PN/app-doc}" != "${PN}" ]] \ 144 || [[ "${PN/app-doc}" != "${PN}" ]] \
163DEPEND="${DEPEND} 161DEPEND="${DEPEND}
164 >=dev-util/pkgconfig-0.18" 162 >=dev-util/pkgconfig-0.18"
165 163
166if [[ "${PN/util-macros}" = "${PN}" ]]; then 164if [[ "${PN/util-macros}" = "${PN}" ]]; then
167 DEPEND="${DEPEND} 165 DEPEND="${DEPEND}
168 >=x11-misc/util-macros-0.99.2" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
169fi 168fi
170 169
171# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
172RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
173 !<=x11-base/xorg-x11-6.9 172 !<=x11-base/xorg-x11-6.9"
174 >=sys-apps/man-1.6b-r2"
175# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
176# x11-base/x11-env" 174# x11-base/x11-env"
177 175
176inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
177
178x-modular_specs_check() { 178x-modular_specs_check() {
179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
180 if gcc-specs-now; then 180 append-ldflags -Wl,-z,lazy
181 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}." 181 # (#116698) breaks loading
182 eerror "$msg" 182 filter-ldflags -Wl,-z,now
183 die "$msg"
184 fi
185 fi 183 fi
186} 184}
187 185
188x-modular_dri_check() { 186x-modular_dri_check() {
189 # (#120057) Enabling DRI in drivers requires that the server was built with 187 # (#120057) Enabling DRI in drivers requires that the server was built with
196 fi 194 fi
197 fi 195 fi
198 fi 196 fi
199} 197}
200 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}
211
201x-modular_unpack_source() { 212x-modular_unpack_source() {
202 unpack ${A} 213 unpack ${A}
203 cd ${S} 214 cd ${S}
204 215
205 if [[ -n ${FONT_OPTIONS} ]]; then 216 if [[ -n ${FONT_OPTIONS} ]]; then
216 fi 227 fi
217 228
218 # 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.
219 # Running autoreconf will use the patched util-macros to make the 230 # Running autoreconf will use the patched util-macros to make the
220 # 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.
221 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 232 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
233 && [[ ${XDPVER} != -1 ]]; then
222 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 234 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
223 fi 235 fi
224 236
225 # For specific list of patches 237 # For specific list of patches
226 if [[ -n "${PATCHES}" ]] ; then 238 if [[ -n "${PATCHES}" ]] ; then
240x-modular_reconf_source() { 252x-modular_reconf_source() {
241 # Run autoreconf for CVS snapshots only 253 # Run autoreconf for CVS snapshots only
242 if [[ "${SNAPSHOT}" = "yes" ]] 254 if [[ "${SNAPSHOT}" = "yes" ]]
243 then 255 then
244 # If possible, generate configure if it doesn't exist 256 # If possible, generate configure if it doesn't exist
245 if [ -f "${S}/configure.ac" ] 257 if [ -f "./configure.ac" ]
246 then 258 then
247 eautoreconf 259 eautoreconf
248 fi 260 fi
249 fi 261 fi
250 262
253 elibtoolize 265 elibtoolize
254} 266}
255 267
256x-modular_src_unpack() { 268x-modular_src_unpack() {
257 x-modular_specs_check 269 x-modular_specs_check
270 x-modular_server_supports_drivers_check
258 x-modular_dri_check 271 x-modular_dri_check
259 x-modular_unpack_source 272 x-modular_unpack_source
260 x-modular_patch_source 273 x-modular_patch_source
261 x-modular_reconf_source 274 x-modular_reconf_source
262} 275}
328# Shouldn't be necessary in XDIR=/usr 341# Shouldn't be necessary in XDIR=/usr
329# einstall forces datadir, so we need to re-force it 342# einstall forces datadir, so we need to re-force it
330# datadir=${XDIR}/share \ 343# datadir=${XDIR}/share \
331# mandir=${XDIR}/share/man \ 344# mandir=${XDIR}/share/man \
332 345
346 if [[ -e ${S}/ChangeLog ]]; then
347 dodoc ${S}/ChangeLog
348 fi
349
333 # Make sure docs get compressed 350 # Make sure docs get compressed
334 prepalldocs 351 prepalldocs
335 352
336 # Don't install libtool archives for server modules 353 # Don't install libtool archives for server modules
337 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 354 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
338 find ${D}/usr/lib/xorg/modules -name '*.la' \ 355 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
339 | xargs rm -f 356 | xargs rm -f
340 fi 357 fi
341 358
342 # Don't install overlapping fonts.* files 359 # Don't install overlapping fonts.* files
343 # Generate them instead when possible 360 # Generate them instead when possible
344 if [[ -n "${FONT}" ]]; then 361 if [[ -n "${FONT}" ]]; then
345 remove_font_metadata 362 remove_font_metadata
346 fi 363 fi
364
365 if [[ -n "${DRIVER}" ]]; then
366 install_driver_hwdata
367 fi
347} 368}
348 369
349x-modular_pkg_preinst() { 370x-modular_pkg_preinst() {
350 if [[ -n "${FONT}" ]]; then 371 # We no longer do anything here, but we can't remove it from the API
351 discover_font_dirs 372 :
352 fi
353} 373}
354 374
355x-modular_pkg_postinst() { 375x-modular_pkg_postinst() {
356 if [[ -n "${FONT}" ]]; then 376 if [[ -n "${FONT}" ]]; then
357 setup_fonts 377 setup_fonts
359} 379}
360 380
361x-modular_pkg_postrm() { 381x-modular_pkg_postrm() {
362 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
363 cleanup_fonts 383 cleanup_fonts
384 font_pkg_postrm
364 fi 385 fi
365} 386}
366 387
367cleanup_fonts() { 388cleanup_fonts() {
368 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"
398 eend 0 419 eend 0
399 done 420 done
400} 421}
401 422
402setup_fonts() { 423setup_fonts() {
403 if [[ ! -n "${FONT_DIRS}" ]]; then 424 if [[ ! -n "${FONT_DIR}" ]]; then
404 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."
405 eerror "${msg}" 426 eerror "${msg}"
406 die "${msg}" 427 die "${msg}"
407 fi 428 fi
408 429
409 create_fonts_scale 430 create_fonts_scale
422 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 443 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
423 fi 444 fi
424 done 445 done
425} 446}
426 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
427discover_font_dirs() { 461discover_font_dirs() {
428 pushd ${IMAGE}/usr/share/fonts 462 FONT_DIRS="${FONT_DIR}"
429 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
430 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
431 popd
432} 463}
433 464
434create_fonts_scale() { 465create_fonts_scale() {
435 ebegin "Creating fonts.scale files" 466 ebegin "Creating fonts.scale files"
436 local x 467 local x
437 for FONT_DIR in ${FONT_DIRS}; do 468 for DIR in ${FONT_DIR}; do
438 x=${ROOT}/usr/share/fonts/${FONT_DIR} 469 x=${ROOT}/usr/share/fonts/${DIR}
439 [[ -z "$(ls ${x}/)" ]] && continue 470 [[ -z "$(ls ${x}/)" ]] && continue
440 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 471 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
441 472
442 # Only generate .scale files if truetype, opentype or type1 473 # Only generate .scale files if truetype, opentype or type1
443 # fonts are present ... 474 # fonts are present ...
444 475
445 # First truetype (ttf,ttc)
446 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
447 # Also, there is no way to regenerate Speedo/CID fonts.scale 476 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
448 # <spyderous@gentoo.org> 2 August 2004 477 # <spyderous@gentoo.org> 2 August 2004
449 if [[ "${x/encodings}" = "${x}" ]] \ 478 if [[ "${x/encodings}" = "${x}" ]] \
450 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
451 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
452 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
453 ${ROOT}/usr/bin/ttmkfdir -x 2 \
454 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
455 -o ${x}/fonts.scale -d ${x}
456 # ttmkfdir fails on some stuff, so try mkfontscale if it does
457 local ttmkfdir_return=$?
458 else
459 # We didn't use ttmkfdir at all
460 local ttmkfdir_return=2
461 fi
462 if [[ ${ttmkfdir_return} -ne 0 ]]; then
463 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
464 ${ROOT}/usr/bin/mkfontscale \
465 -a /usr/share/fonts/encodings/encodings.dir \
466 -- ${x}
467 fi
468 # Next type1 and opentype (pfa,pfb,otf,otc)
469 elif [[ "${x/encodings}" = "${x}" ]] \
470 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 479 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
471 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 480 mkfontscale \
472 ${ROOT}/usr/bin/mkfontscale \
473 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
474 -- ${x} 482 -- ${x}
475 fi 483 fi
476 done 484 done
477 eend 0 485 eend 0
478} 486}
479 487
480create_fonts_dir() { 488create_fonts_dir() {
481 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
482 for FONT_DIR in ${FONT_DIRS}; do 490 for DIR in ${FONT_DIR}; do
483 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${DIR}
484 [[ -z "$(ls ${x}/)" ]] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
485 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
486 494
487 if [[ "${x/encodings}" = "${x}" ]]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
488 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 mkfontdir \
489 ${ROOT}/usr/bin/mkfontdir \
490 -e ${ROOT}/usr/share/fonts/encodings \ 497 -e ${ROOT}/usr/share/fonts/encodings \
491 -e ${ROOT}/usr/share/fonts/encodings/large \ 498 -e ${ROOT}/usr/share/fonts/encodings/large \
492 -- ${x} 499 -- ${x}
493 fi 500 fi
494 done 501 done
495 eend 0 502 eend 0
496} 503}
497 504
498fix_font_permissions() { 505fix_font_permissions() {
499 ebegin "Fixing permissions" 506 ebegin "Fixing permissions"
500 for FONT_DIR in ${FONT_DIRS}; do 507 for DIR in ${FONT_DIR}; do
501 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 508 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
502 -exec chmod 0644 {} \; 509 -exec chmod 0644 {} \;
503 done 510 done
504 eend 0 511 eend 0
505} 512}
506 513
507create_font_cache() { 514create_font_cache() {
508 # danarmak found out that fc-cache should be run AFTER all the above 515 font_pkg_postinst
509 # stuff, as otherwise the cache is invalid, and has to be run again
510 # as root anyway
511 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
512 ebegin "Creating FC font cache"
513 HOME="/root" ${ROOT}/usr/bin/fc-cache
514 eend 0
515 fi
516} 516}
517
518EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20