/[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.78
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.78 2006/10/30 05:57:41 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}
325# Shouldn't be necessary in XDIR=/usr 337# Shouldn't be necessary in XDIR=/usr
326# einstall forces datadir, so we need to re-force it 338# einstall forces datadir, so we need to re-force it
327# datadir=${XDIR}/share \ 339# datadir=${XDIR}/share \
328# mandir=${XDIR}/share/man \ 340# mandir=${XDIR}/share/man \
329 341
342 if [[ -e ${S}/ChangeLog ]]; then
343 dodoc ${S}/ChangeLog
344 fi
345
330 # Make sure docs get compressed 346 # Make sure docs get compressed
331 prepalldocs 347 prepalldocs
332 348
333 # Don't install libtool archives for server modules 349 # Don't install libtool archives for server modules
334 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 350 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
335 find ${D}/usr/lib/xorg/modules -name '*.la' \ 351 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
336 | xargs rm -f 352 | xargs rm -f
337 fi 353 fi
338 354
339 # Don't install overlapping fonts.* files 355 # Don't install overlapping fonts.* files
340 # Generate them instead when possible 356 # Generate them instead when possible
341 if [[ -n "${FONT}" ]]; then 357 if [[ -n "${FONT}" ]]; then
342 remove_font_metadata 358 remove_font_metadata
343 fi 359 fi
360
361 if [[ -n "${DRIVER}" ]]; then
362 install_driver_hwdata
363 fi
344} 364}
345 365
346x-modular_pkg_preinst() { 366x-modular_pkg_preinst() {
347 if [[ -n "${FONT}" ]]; then 367 # We no longer do anything here, but we can't remove it from the API
348 discover_font_dirs 368 :
349 fi
350} 369}
351 370
352x-modular_pkg_postinst() { 371x-modular_pkg_postinst() {
353 if [[ -n "${FONT}" ]]; then 372 if [[ -n "${FONT}" ]]; then
354 setup_fonts 373 setup_fonts
356} 375}
357 376
358x-modular_pkg_postrm() { 377x-modular_pkg_postrm() {
359 if [[ -n "${FONT}" ]]; then 378 if [[ -n "${FONT}" ]]; then
360 cleanup_fonts 379 cleanup_fonts
380 font_pkg_postrm
361 fi 381 fi
362} 382}
363 383
364cleanup_fonts() { 384cleanup_fonts() {
365 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"
395 eend 0 415 eend 0
396 done 416 done
397} 417}
398 418
399setup_fonts() { 419setup_fonts() {
400 if [[ ! -n "${FONT_DIRS}" ]]; then 420 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." 421 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
402 eerror "${msg}" 422 eerror "${msg}"
403 die "${msg}" 423 die "${msg}"
404 fi 424 fi
405 425
406 create_fonts_scale 426 create_fonts_scale
419 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}
420 fi 440 fi
421 done 441 done
422} 442}
423 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
424discover_font_dirs() { 457discover_font_dirs() {
425 pushd ${IMAGE}/usr/share/fonts 458 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} 459}
430 460
431create_fonts_scale() { 461create_fonts_scale() {
432 ebegin "Creating fonts.scale files" 462 ebegin "Creating fonts.scale files"
433 local x 463 local x
434 for FONT_DIR in ${FONT_DIRS}; do 464 for DIR in ${FONT_DIR}; do
435 x=${ROOT}/usr/share/fonts/${FONT_DIR} 465 x=${ROOT}/usr/share/fonts/${DIR}
436 [[ -z "$(ls ${x}/)" ]] && continue 466 [[ -z "$(ls ${x}/)" ]] && continue
437 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 467 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
438 468
439 # Only generate .scale files if truetype, opentype or type1 469 # Only generate .scale files if truetype, opentype or type1
440 # fonts are present ... 470 # fonts are present ...
474 eend 0 504 eend 0
475} 505}
476 506
477create_fonts_dir() { 507create_fonts_dir() {
478 ebegin "Generating fonts.dir files" 508 ebegin "Generating fonts.dir files"
479 for FONT_DIR in ${FONT_DIRS}; do 509 for DIR in ${FONT_DIR}; do
480 x=${ROOT}/usr/share/fonts/${FONT_DIR} 510 x=${ROOT}/usr/share/fonts/${DIR}
481 [[ -z "$(ls ${x}/)" ]] && continue 511 [[ -z "$(ls ${x}/)" ]] && continue
482 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 512 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
483 513
484 if [[ "${x/encodings}" = "${x}" ]]; then 514 if [[ "${x/encodings}" = "${x}" ]]; then
485 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 515 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
492 eend 0 522 eend 0
493} 523}
494 524
495fix_font_permissions() { 525fix_font_permissions() {
496 ebegin "Fixing permissions" 526 ebegin "Fixing permissions"
497 for FONT_DIR in ${FONT_DIRS}; do 527 for DIR in ${FONT_DIR}; do
498 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 528 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
499 -exec chmod 0644 {} \; 529 -exec chmod 0644 {} \;
500 done 530 done
501 eend 0 531 eend 0
502} 532}
503 533
504create_font_cache() { 534create_font_cache() {
505 # danarmak found out that fc-cache should be run AFTER all the above 535 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} 536}
537
538EXPORT_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.78

  ViewVC Help
Powered by ViewVC 1.1.20