/[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.56 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.56 2006/05/14 19:17:09 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
41IUSE="" 46IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
43 48
44# Set up SRC_URI for individual modular releases 49# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 50BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 51if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 52 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 53 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 54elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 55 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 56 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2" 73 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 74elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 75 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 76 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 77fi
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 78
78SLOT="0" 79SLOT="0"
79 80
80# Set the license for the package. This can be overridden by setting 81# Set the license for the package. This can be overridden by setting
81# LICENSE after the inherit. 82# LICENSE after the inherit.
83 84
84# Set up shared dependencies 85# Set up shared dependencies
85if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
86# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
87 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
88 >=sys-devel/autoconf-2.57
89 >=sys-devel/automake-1.7
90 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
91 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
92fi 93fi
93 94
94# 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=""
95if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
96 && [[ "${CATEGORY}" = "media-fonts" ]] \ 98 && [[ "${CATEGORY}" = "media-fonts" ]] \
97 && [[ "${PN}" != "font-alias" ]] \ 99 && [[ "${PN}" != "font-alias" ]] \
98 && [[ "${PN}" != "font-util" ]]; then 100 && [[ "${PN}" != "font-util" ]]; then
99 # Activate font code in the rest of the eclass 101 # Activate font code in the rest of the eclass
100 FONT="yes" 102 FONT="yes"
101 103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
106
102 RDEPEND="${RDEPEND} 107 RDEPEND="${RDEPEND}
103 media-fonts/encodings 108 media-fonts/encodings
104 x11-apps/mkfontscale 109 x11-apps/mkfontscale
105 x11-apps/mkfontdir" 110 x11-apps/mkfontdir"
106 PDEPEND="${PDEPEND} 111 PDEPEND="${PDEPEND}
134# If we're a driver package 139# If we're a driver package
135if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 140if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
136 # Enable driver code in the rest of the eclass 141 # Enable driver code in the rest of the eclass
137 DRIVER="yes" 142 DRIVER="yes"
138 143
144 if [[ ${XDPVER} != -1 ]]; then
139 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
140 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
141 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
142fi 149fi
143 150
144# Debugging -- ignore packages that can't be built with debugging 151# Debugging -- ignore packages that can't be built with debugging
145if [[ -z "${FONT}" ]] \ 152if [[ -z "${FONT}" ]] \
146 || [[ "${PN/app-doc}" != "${PN}" ]] \ 153 || [[ "${PN/app-doc}" != "${PN}" ]] \
163DEPEND="${DEPEND} 170DEPEND="${DEPEND}
164 >=dev-util/pkgconfig-0.18" 171 >=dev-util/pkgconfig-0.18"
165 172
166if [[ "${PN/util-macros}" = "${PN}" ]]; then 173if [[ "${PN/util-macros}" = "${PN}" ]]; then
167 DEPEND="${DEPEND} 174 DEPEND="${DEPEND}
168 >=x11-misc/util-macros-0.99.2" 175 >=x11-misc/util-macros-0.99.2
176 >=sys-devel/binutils-2.16.1-r3"
169fi 177fi
170 178
171# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
172RDEPEND="${RDEPEND} 179RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
173 !<=x11-base/xorg-x11-6.9 181 !<=x11-base/xorg-x11-6.9"
174 >=sys-apps/man-1.6b-r2"
175# Provides virtual/x11 for temporary use until packages are ported 182# Provides virtual/x11 for temporary use until packages are ported
176# x11-base/x11-env" 183# x11-base/x11-env"
177 184
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
186
178x-modular_specs_check() { 187x-modular_specs_check() {
179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
180 if gcc-specs-now; then 189 append-ldflags -Wl,-z,lazy
181 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
182 eerror "$msg"
183 die "$msg"
184 fi
185
186 # (#116698) breaks loading 190 # (#116698) breaks loading
187 filter-ldflags -Wl,-z,now 191 filter-ldflags -Wl,-z,now
188 fi 192 fi
189} 193}
190 194
199 fi 203 fi
200 fi 204 fi
201 fi 205 fi
202} 206}
203 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
204x-modular_unpack_source() { 221x-modular_unpack_source() {
205 unpack ${A} 222 unpack ${A}
206 cd ${S} 223 cd ${S}
207 224
208 if [[ -n ${FONT_OPTIONS} ]]; then 225 if [[ -n ${FONT_OPTIONS} ]]; then
219 fi 236 fi
220 237
221 # 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.
222 # Running autoreconf will use the patched util-macros to make the 239 # Running autoreconf will use the patched util-macros to make the
223 # 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.
224 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 241 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
242 && [[ ${XDPVER} != -1 ]]; then
225 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 243 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
226 fi 244 fi
227 245
228 # For specific list of patches 246 # For specific list of patches
229 if [[ -n "${PATCHES}" ]] ; then 247 if [[ -n "${PATCHES}" ]] ; then
243x-modular_reconf_source() { 261x-modular_reconf_source() {
244 # Run autoreconf for CVS snapshots only 262 # Run autoreconf for CVS snapshots only
245 if [[ "${SNAPSHOT}" = "yes" ]] 263 if [[ "${SNAPSHOT}" = "yes" ]]
246 then 264 then
247 # If possible, generate configure if it doesn't exist 265 # If possible, generate configure if it doesn't exist
248 if [ -f "${S}/configure.ac" ] 266 if [ -f "./configure.ac" ]
249 then 267 then
250 eautoreconf 268 eautoreconf
251 fi 269 fi
252 fi 270 fi
253 271
256 elibtoolize 274 elibtoolize
257} 275}
258 276
259x-modular_src_unpack() { 277x-modular_src_unpack() {
260 x-modular_specs_check 278 x-modular_specs_check
279 x-modular_server_supports_drivers_check
261 x-modular_dri_check 280 x-modular_dri_check
262 x-modular_unpack_source 281 x-modular_unpack_source
263 x-modular_patch_source 282 x-modular_patch_source
264 x-modular_reconf_source 283 x-modular_reconf_source
265} 284}
331# Shouldn't be necessary in XDIR=/usr 350# Shouldn't be necessary in XDIR=/usr
332# einstall forces datadir, so we need to re-force it 351# einstall forces datadir, so we need to re-force it
333# datadir=${XDIR}/share \ 352# datadir=${XDIR}/share \
334# mandir=${XDIR}/share/man \ 353# mandir=${XDIR}/share/man \
335 354
355 if [[ -e ${S}/ChangeLog ]]; then
356 dodoc ${S}/ChangeLog
357 fi
358
336 # Make sure docs get compressed 359 # Make sure docs get compressed
337 prepalldocs 360 prepalldocs
338 361
339 # Don't install libtool archives for server modules 362 # Don't install libtool archives for server modules
340 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 363 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
341 find ${D}/usr/lib/xorg/modules -name '*.la' \ 364 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
342 | xargs rm -f 365 | xargs rm -f
343 fi 366 fi
344 367
345 # Don't install overlapping fonts.* files 368 # Don't install overlapping fonts.* files
346 # Generate them instead when possible 369 # Generate them instead when possible
347 if [[ -n "${FONT}" ]]; then 370 if [[ -n "${FONT}" ]]; then
348 remove_font_metadata 371 remove_font_metadata
349 fi 372 fi
373
374 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata
376 fi
350} 377}
351 378
352x-modular_pkg_preinst() { 379x-modular_pkg_preinst() {
353 if [[ -n "${FONT}" ]]; then 380 # We no longer do anything here, but we can't remove it from the API
354 discover_font_dirs 381 :
355 fi
356} 382}
357 383
358x-modular_pkg_postinst() { 384x-modular_pkg_postinst() {
359 if [[ -n "${FONT}" ]]; then 385 if [[ -n "${FONT}" ]]; then
360 setup_fonts 386 setup_fonts
362} 388}
363 389
364x-modular_pkg_postrm() { 390x-modular_pkg_postrm() {
365 if [[ -n "${FONT}" ]]; then 391 if [[ -n "${FONT}" ]]; then
366 cleanup_fonts 392 cleanup_fonts
393 font_pkg_postrm
367 fi 394 fi
368} 395}
369 396
370cleanup_fonts() { 397cleanup_fonts() {
371 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"
401 eend 0 428 eend 0
402 done 429 done
403} 430}
404 431
405setup_fonts() { 432setup_fonts() {
406 if [[ ! -n "${FONT_DIRS}" ]]; then 433 if [[ ! -n "${FONT_DIR}" ]]; then
407 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."
408 eerror "${msg}" 435 eerror "${msg}"
409 die "${msg}" 436 die "${msg}"
410 fi 437 fi
411 438
412 create_fonts_scale 439 create_fonts_scale
425 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}
426 fi 453 fi
427 done 454 done
428} 455}
429 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
430discover_font_dirs() { 470discover_font_dirs() {
431 pushd ${IMAGE}/usr/share/fonts 471 FONT_DIRS="${FONT_DIR}"
432 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
433 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
434 popd
435} 472}
436 473
437create_fonts_scale() { 474create_fonts_scale() {
438 ebegin "Creating fonts.scale files" 475 ebegin "Creating fonts.scale files"
439 local x 476 local x
440 for FONT_DIR in ${FONT_DIRS}; do 477 for DIR in ${FONT_DIR}; do
441 x=${ROOT}/usr/share/fonts/${FONT_DIR} 478 x=${ROOT}/usr/share/fonts/${DIR}
442 [[ -z "$(ls ${x}/)" ]] && continue 479 [[ -z "$(ls ${x}/)" ]] && continue
443 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
444 481
445 # Only generate .scale files if truetype, opentype or type1 482 # Only generate .scale files if truetype, opentype or type1
446 # fonts are present ... 483 # fonts are present ...
447 484
448 # First truetype (ttf,ttc)
449 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
450 # Also, there is no way to regenerate Speedo/CID fonts.scale 485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
451 # <spyderous@gentoo.org> 2 August 2004 486 # <spyderous@gentoo.org> 2 August 2004
452 if [[ "${x/encodings}" = "${x}" ]] \ 487 if [[ "${x/encodings}" = "${x}" ]] \
453 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
454 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
455 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
456 ${ROOT}/usr/bin/ttmkfdir -x 2 \
457 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
458 -o ${x}/fonts.scale -d ${x}
459 # ttmkfdir fails on some stuff, so try mkfontscale if it does
460 local ttmkfdir_return=$?
461 else
462 # We didn't use ttmkfdir at all
463 local ttmkfdir_return=2
464 fi
465 if [[ ${ttmkfdir_return} -ne 0 ]]; then
466 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
467 ${ROOT}/usr/bin/mkfontscale \
468 -a /usr/share/fonts/encodings/encodings.dir \
469 -- ${x}
470 fi
471 # Next type1 and opentype (pfa,pfb,otf,otc)
472 elif [[ "${x/encodings}" = "${x}" ]] \
473 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
474 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 489 mkfontscale \
475 ${ROOT}/usr/bin/mkfontscale \
476 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
477 -- ${x} 491 -- ${x}
478 fi 492 fi
479 done 493 done
480 eend 0 494 eend 0
481} 495}
482 496
483create_fonts_dir() { 497create_fonts_dir() {
484 ebegin "Generating fonts.dir files" 498 ebegin "Generating fonts.dir files"
485 for FONT_DIR in ${FONT_DIRS}; do 499 for DIR in ${FONT_DIR}; do
486 x=${ROOT}/usr/share/fonts/${FONT_DIR} 500 x=${ROOT}/usr/share/fonts/${DIR}
487 [[ -z "$(ls ${x}/)" ]] && continue 501 [[ -z "$(ls ${x}/)" ]] && continue
488 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 502 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
489 503
490 if [[ "${x/encodings}" = "${x}" ]]; then 504 if [[ "${x/encodings}" = "${x}" ]]; then
491 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 505 mkfontdir \
492 ${ROOT}/usr/bin/mkfontdir \
493 -e ${ROOT}/usr/share/fonts/encodings \ 506 -e ${ROOT}/usr/share/fonts/encodings \
494 -e ${ROOT}/usr/share/fonts/encodings/large \ 507 -e ${ROOT}/usr/share/fonts/encodings/large \
495 -- ${x} 508 -- ${x}
496 fi 509 fi
497 done 510 done
498 eend 0 511 eend 0
499} 512}
500 513
501fix_font_permissions() { 514fix_font_permissions() {
502 ebegin "Fixing permissions" 515 ebegin "Fixing permissions"
503 for FONT_DIR in ${FONT_DIRS}; do 516 for DIR in ${FONT_DIR}; do
504 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
505 -exec chmod 0644 {} \; 518 -exec chmod 0644 {} \;
506 done 519 done
507 eend 0 520 eend 0
508} 521}
509 522
510create_font_cache() { 523create_font_cache() {
511 # danarmak found out that fc-cache should be run AFTER all the above 524 font_pkg_postinst
512 # stuff, as otherwise the cache is invalid, and has to be run again
513 # as root anyway
514 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
515 ebegin "Creating FC font cache"
516 HOME="/root" ${ROOT}/usr/bin/fc-cache
517 eend 0
518 fi
519} 525}
526
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.56  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20