/[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.53 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.53 2006/04/20 23:43:48 spyderous 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
41IUSE="" 39IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 40HOMEPAGE="http://xorg.freedesktop.org/"
43 41
44# Set up SRC_URI for individual modular releases 42# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 43BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 44if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 45 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 46 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 47elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 48 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 49 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2" 66 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 67elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 68 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 69 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 70fi
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 71
78SLOT="0" 72SLOT="0"
79 73
80# Set the license for the package. This can be overridden by setting 74# Set the license for the package. This can be overridden by setting
81# LICENSE after the inherit. 75# LICENSE after the inherit.
134# If we're a driver package 128# If we're a driver package
135if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 129if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
136 # Enable driver code in the rest of the eclass 130 # Enable driver code in the rest of the eclass
137 DRIVER="yes" 131 DRIVER="yes"
138 132
133 if [[ ${XDPVER} != -1 ]]; then
139 # Add driver patchset to SRC_URI 134 # Add driver patchset to SRC_URI
140 SRC_URI="${SRC_URI} 135 SRC_URI="${SRC_URI}
141 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
142fi 138fi
143 139
144# Debugging -- ignore packages that can't be built with debugging 140# Debugging -- ignore packages that can't be built with debugging
145if [[ -z "${FONT}" ]] \ 141if [[ -z "${FONT}" ]] \
146 || [[ "${PN/app-doc}" != "${PN}" ]] \ 142 || [[ "${PN/app-doc}" != "${PN}" ]] \
163DEPEND="${DEPEND} 159DEPEND="${DEPEND}
164 >=dev-util/pkgconfig-0.18" 160 >=dev-util/pkgconfig-0.18"
165 161
166if [[ "${PN/util-macros}" = "${PN}" ]]; then 162if [[ "${PN/util-macros}" = "${PN}" ]]; then
167 DEPEND="${DEPEND} 163 DEPEND="${DEPEND}
168 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3"
169fi 166fi
170 167
171# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
172RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
169 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
173 !<=x11-base/xorg-x11-6.9 170 !<=x11-base/xorg-x11-6.9"
174 >=sys-apps/man-1.6b-r2"
175# Provides virtual/x11 for temporary use until packages are ported 171# Provides virtual/x11 for temporary use until packages are ported
176# x11-base/x11-env" 172# x11-base/x11-env"
177 173
178x-modular_unpack_source() { 174x-modular_specs_check() {
175 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
176 append-ldflags -Wl,-z,lazy
177 # (#116698) breaks loading
178 filter-ldflags -Wl,-z,now
179 fi
180}
181
182x-modular_dri_check() {
179 # (#120057) Enabling DRI in drivers requires that the server was built with 183 # (#120057) Enabling DRI in drivers requires that the server was built with
180 # support for it 184 # support for it
181 if [[ -n "${DRIVER}" ]]; then 185 if [[ -n "${DRIVER}" ]]; then
182 if has dri ${IUSE} && use dri; then 186 if has dri ${IUSE} && use dri; then
183 einfo "Checking for direct rendering capabilities ..." 187 einfo "Checking for direct rendering capabilities ..."
184 if ! built_with_use x11-base/xorg-server dri; then 188 if ! built_with_use x11-base/xorg-server dri; then
185 die "You must build x11-base/xorg-server with USE=dri." 189 die "You must build x11-base/xorg-server with USE=dri."
186 fi 190 fi
187 fi 191 fi
188 fi 192 fi
193}
189 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
208x-modular_unpack_source() {
190 unpack ${A} 209 unpack ${A}
191 cd ${S} 210 cd ${S}
192 211
193 if [[ -n ${FONT_OPTIONS} ]]; then 212 if [[ -n ${FONT_OPTIONS} ]]; then
194 einfo "Detected font directory: ${FONT_DIR}" 213 einfo "Detected font directory: ${FONT_DIR}"
204 fi 223 fi
205 224
206 # 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.
207 # Running autoreconf will use the patched util-macros to make the 226 # Running autoreconf will use the patched util-macros to make the
208 # 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.
209 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 228 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
229 && [[ ${XDPVER} != -1 ]]; then
210 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 230 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
211 fi 231 fi
212 232
213 # For specific list of patches 233 # For specific list of patches
214 if [[ -n "${PATCHES}" ]] ; then 234 if [[ -n "${PATCHES}" ]] ; then
228x-modular_reconf_source() { 248x-modular_reconf_source() {
229 # Run autoreconf for CVS snapshots only 249 # Run autoreconf for CVS snapshots only
230 if [[ "${SNAPSHOT}" = "yes" ]] 250 if [[ "${SNAPSHOT}" = "yes" ]]
231 then 251 then
232 # If possible, generate configure if it doesn't exist 252 # If possible, generate configure if it doesn't exist
233 if [ -f "${S}/configure.ac" ] 253 if [ -f "./configure.ac" ]
234 then 254 then
235 eautoreconf 255 eautoreconf
236 fi 256 fi
237 fi 257 fi
238 258
259 # Joshua Baergen - October 23, 2005
260 # Fix shared lib issues on MIPS, FBSD, etc etc
261 elibtoolize
239} 262}
240 263
241x-modular_src_unpack() { 264x-modular_src_unpack() {
242 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 265 x-modular_specs_check
243 if gcc-specs-now; then 266 x-modular_server_supports_drivers_check
244 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}." 267 x-modular_dri_check
245 eerror "$msg"
246 die "$msg"
247 fi
248 fi
249
250 x-modular_unpack_source 268 x-modular_unpack_source
251 x-modular_patch_source 269 x-modular_patch_source
252 x-modular_reconf_source 270 x-modular_reconf_source
253
254 # Joshua Baergen - October 23, 2005
255 # Fix shared lib issues on MIPS, FBSD, etc etc
256 elibtoolize
257} 271}
258 272
259x-modular_font_configure() { 273x-modular_font_configure() {
260 if [[ -n "${FONT}" ]]; then 274 if [[ -n "${FONT}" ]]; then
261 # Might be worth adding an option to configure your desired font 275 # Might be worth adding an option to configure your desired font
323# Shouldn't be necessary in XDIR=/usr 337# Shouldn't be necessary in XDIR=/usr
324# einstall forces datadir, so we need to re-force it 338# einstall forces datadir, so we need to re-force it
325# datadir=${XDIR}/share \ 339# datadir=${XDIR}/share \
326# mandir=${XDIR}/share/man \ 340# mandir=${XDIR}/share/man \
327 341
342 if [[ -e ${S}/ChangeLog ]]; then
343 dodoc ${S}/ChangeLog
344 fi
345
328 # Make sure docs get compressed 346 # Make sure docs get compressed
329 prepalldocs 347 prepalldocs
330 348
331 # Don't install libtool archives for server modules 349 # Don't install libtool archives for server modules
332 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 350 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
333 find ${D}/usr/lib/xorg/modules -name '*.la' \ 351 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
334 | xargs rm -f 352 | xargs rm -f
335 fi 353 fi
336 354
337 # Don't install overlapping fonts.* files 355 # Don't install overlapping fonts.* files
338 # Generate them instead when possible 356 # Generate them instead when possible
339 if [[ -n "${FONT}" ]]; then 357 if [[ -n "${FONT}" ]]; then
340 remove_font_metadata 358 remove_font_metadata
341 fi 359 fi
360
361 if [[ -n "${DRIVER}" ]]; then
362 install_driver_hwdata
363 fi
342} 364}
343 365
344x-modular_pkg_preinst() { 366x-modular_pkg_preinst() {
345 if [[ -n "${FONT}" ]]; then 367 # We no longer do anything here, but we can't remove it from the API
346 discover_font_dirs 368 :
347 fi
348} 369}
349 370
350x-modular_pkg_postinst() { 371x-modular_pkg_postinst() {
351 if [[ -n "${FONT}" ]]; then 372 if [[ -n "${FONT}" ]]; then
352 setup_fonts 373 setup_fonts
354} 375}
355 376
356x-modular_pkg_postrm() { 377x-modular_pkg_postrm() {
357 if [[ -n "${FONT}" ]]; then 378 if [[ -n "${FONT}" ]]; then
358 cleanup_fonts 379 cleanup_fonts
380 font_pkg_postrm
359 fi 381 fi
360} 382}
361 383
362cleanup_fonts() { 384cleanup_fonts() {
363 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"
393 eend 0 415 eend 0
394 done 416 done
395} 417}
396 418
397setup_fonts() { 419setup_fonts() {
398 if [[ ! -n "${FONT_DIRS}" ]]; then 420 if [[ ! -n "${FONT_DIR}" ]]; then
399 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."
400 eerror "${msg}" 422 eerror "${msg}"
401 die "${msg}" 423 die "${msg}"
402 fi 424 fi
403 425
404 create_fonts_scale 426 create_fonts_scale
417 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}
418 fi 440 fi
419 done 441 done
420} 442}
421 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
422discover_font_dirs() { 457discover_font_dirs() {
423 pushd ${IMAGE}/usr/share/fonts 458 FONT_DIRS="${FONT_DIR}"
424 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
425 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
426 popd
427} 459}
428 460
429create_fonts_scale() { 461create_fonts_scale() {
430 ebegin "Creating fonts.scale files" 462 ebegin "Creating fonts.scale files"
431 local x 463 local x
432 for FONT_DIR in ${FONT_DIRS}; do 464 for DIR in ${FONT_DIR}; do
433 x=${ROOT}/usr/share/fonts/${FONT_DIR} 465 x=${ROOT}/usr/share/fonts/${DIR}
434 [[ -z "$(ls ${x}/)" ]] && continue 466 [[ -z "$(ls ${x}/)" ]] && continue
435 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 467 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
436 468
437 # Only generate .scale files if truetype, opentype or type1 469 # Only generate .scale files if truetype, opentype or type1
438 # fonts are present ... 470 # fonts are present ...
472 eend 0 504 eend 0
473} 505}
474 506
475create_fonts_dir() { 507create_fonts_dir() {
476 ebegin "Generating fonts.dir files" 508 ebegin "Generating fonts.dir files"
477 for FONT_DIR in ${FONT_DIRS}; do 509 for DIR in ${FONT_DIR}; do
478 x=${ROOT}/usr/share/fonts/${FONT_DIR} 510 x=${ROOT}/usr/share/fonts/${DIR}
479 [[ -z "$(ls ${x}/)" ]] && continue 511 [[ -z "$(ls ${x}/)" ]] && continue
480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 512 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
481 513
482 if [[ "${x/encodings}" = "${x}" ]]; then 514 if [[ "${x/encodings}" = "${x}" ]]; then
483 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 515 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
490 eend 0 522 eend 0
491} 523}
492 524
493fix_font_permissions() { 525fix_font_permissions() {
494 ebegin "Fixing permissions" 526 ebegin "Fixing permissions"
495 for FONT_DIR in ${FONT_DIRS}; do 527 for DIR in ${FONT_DIR}; do
496 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 528 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
497 -exec chmod 0644 {} \; 529 -exec chmod 0644 {} \;
498 done 530 done
499 eend 0 531 eend 0
500} 532}
501 533
502create_font_cache() { 534create_font_cache() {
503 # danarmak found out that fc-cache should be run AFTER all the above 535 font_pkg_postinst
504 # stuff, as otherwise the cache is invalid, and has to be run again
505 # as root anyway
506 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
507 ebegin "Creating FC font cache"
508 HOME="/root" ${ROOT}/usr/bin/fc-cache
509 eend 0
510 fi
511} 536}
537
538EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.78

  ViewVC Help
Powered by ViewVC 1.1.20