/[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.77
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.77 2006/10/30 05:44:33 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.
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 28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29 29
30inherit eutils libtool toolchain-funcs flag-o-matic autotools 30inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31 31
32# Directory prefix to use for everything 32# Directory prefix to use for everything
33XDIR="/usr" 33XDIR="/usr"
34 34
35# Set up default patchset version(s) if necessary 35# Set up default patchset version(s) if necessary
41IUSE="" 41IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 42HOMEPAGE="http://xorg.freedesktop.org/"
43 43
44# Set up SRC_URI for individual modular releases 44# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 47 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 49elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2" 68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 72fi
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 73
78SLOT="0" 74SLOT="0"
79 75
80# Set the license for the package. This can be overridden by setting 76# Set the license for the package. This can be overridden by setting
81# LICENSE after the inherit. 77# LICENSE after the inherit.
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
178x-modular_unpack_source() { 176x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading
180 filter-ldflags -Wl,-z,now
181 fi
182}
183
184x-modular_dri_check() {
179 # (#120057) Enabling DRI in drivers requires that the server was built with 185 # (#120057) Enabling DRI in drivers requires that the server was built with
180 # support for it 186 # support for it
181 if [[ -n "${DRIVER}" ]]; then 187 if [[ -n "${DRIVER}" ]]; then
182 if has dri ${IUSE} && use dri; then 188 if has dri ${IUSE} && use dri; then
183 einfo "Checking for direct rendering capabilities ..." 189 einfo "Checking for direct rendering capabilities ..."
184 if ! built_with_use x11-base/xorg-server dri; then 190 if ! built_with_use x11-base/xorg-server dri; then
185 die "You must build x11-base/xorg-server with USE=dri." 191 die "You must build x11-base/xorg-server with USE=dri."
186 fi 192 fi
187 fi 193 fi
188 fi 194 fi
195}
189 196
197x-modular_server_supports_drivers_check() {
198 # (#135873) Only certain servers will actually use or be capable of
199 # building external drivers, including binary drivers.
200 if [[ -n "${DRIVER}" ]]; then
201 if has_version '>=x11-base/xorg-server-1.1'; then
202 if ! built_with_use x11-base/xorg-server xorg; then
203 eerror "x11-base/xorg-server is not built with support for external drivers."
204 die "You must build x11-base/xorg-server with USE=xorg."
205 fi
206 fi
207 fi
208}
209
210x-modular_unpack_source() {
190 unpack ${A} 211 unpack ${A}
191 cd ${S} 212 cd ${S}
192 213
193 if [[ -n ${FONT_OPTIONS} ]]; then 214 if [[ -n ${FONT_OPTIONS} ]]; then
194 einfo "Detected font directory: ${FONT_DIR}" 215 einfo "Detected font directory: ${FONT_DIR}"
204 fi 225 fi
205 226
206 # If this is a driver package we need to fix man page install location. 227 # 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 228 # 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. 229 # change for us, so we only need to patch if it is not going to run.
209 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
231 && [[ ${XDPVER} != -1 ]]; then
210 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 232 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
211 fi 233 fi
212 234
213 # For specific list of patches 235 # For specific list of patches
214 if [[ -n "${PATCHES}" ]] ; then 236 if [[ -n "${PATCHES}" ]] ; then
228x-modular_reconf_source() { 250x-modular_reconf_source() {
229 # Run autoreconf for CVS snapshots only 251 # Run autoreconf for CVS snapshots only
230 if [[ "${SNAPSHOT}" = "yes" ]] 252 if [[ "${SNAPSHOT}" = "yes" ]]
231 then 253 then
232 # If possible, generate configure if it doesn't exist 254 # If possible, generate configure if it doesn't exist
233 if [ -f "${S}/configure.ac" ] 255 if [ -f "./configure.ac" ]
234 then 256 then
235 eautoreconf 257 eautoreconf
236 fi 258 fi
237 fi 259 fi
238 260
261 # Joshua Baergen - October 23, 2005
262 # Fix shared lib issues on MIPS, FBSD, etc etc
263 elibtoolize
239} 264}
240 265
241x-modular_src_unpack() { 266x-modular_src_unpack() {
242 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 267 x-modular_specs_check
243 if gcc-specs-now; then 268 x-modular_server_supports_drivers_check
244 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}." 269 x-modular_dri_check
245 eerror "$msg"
246 die "$msg"
247 fi
248 fi
249
250 x-modular_unpack_source 270 x-modular_unpack_source
251 x-modular_patch_source 271 x-modular_patch_source
252 x-modular_reconf_source 272 x-modular_reconf_source
253
254 # Joshua Baergen - October 23, 2005
255 # Fix shared lib issues on MIPS, FBSD, etc etc
256 elibtoolize
257} 273}
258 274
259x-modular_font_configure() { 275x-modular_font_configure() {
260 if [[ -n "${FONT}" ]]; then 276 if [[ -n "${FONT}" ]]; then
261 # Might be worth adding an option to configure your desired font 277 # Might be worth adding an option to configure your desired font
323# Shouldn't be necessary in XDIR=/usr 339# Shouldn't be necessary in XDIR=/usr
324# einstall forces datadir, so we need to re-force it 340# einstall forces datadir, so we need to re-force it
325# datadir=${XDIR}/share \ 341# datadir=${XDIR}/share \
326# mandir=${XDIR}/share/man \ 342# mandir=${XDIR}/share/man \
327 343
344 if [[ -e ${S}/ChangeLog ]]; then
345 dodoc ${S}/ChangeLog
346 fi
347
328 # Make sure docs get compressed 348 # Make sure docs get compressed
329 prepalldocs 349 prepalldocs
330 350
331 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
332 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
333 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
334 | xargs rm -f 354 | xargs rm -f
335 fi 355 fi
336 356
337 # Don't install overlapping fonts.* files 357 # Don't install overlapping fonts.* files
338 # Generate them instead when possible 358 # Generate them instead when possible
339 if [[ -n "${FONT}" ]]; then 359 if [[ -n "${FONT}" ]]; then
340 remove_font_metadata 360 remove_font_metadata
341 fi 361 fi
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
365 fi
342} 366}
343 367
344x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
345 if [[ -n "${FONT}" ]]; then 369 # We no longer do anything here, but we can't remove it from the API
346 discover_font_dirs 370 :
347 fi
348} 371}
349 372
350x-modular_pkg_postinst() { 373x-modular_pkg_postinst() {
351 if [[ -n "${FONT}" ]]; then 374 if [[ -n "${FONT}" ]]; then
352 setup_fonts 375 setup_fonts
393 eend 0 416 eend 0
394 done 417 done
395} 418}
396 419
397setup_fonts() { 420setup_fonts() {
398 if [[ ! -n "${FONT_DIRS}" ]]; then 421 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." 422 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
400 eerror "${msg}" 423 eerror "${msg}"
401 die "${msg}" 424 die "${msg}"
402 fi 425 fi
403 426
404 create_fonts_scale 427 create_fonts_scale
417 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 440 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
418 fi 441 fi
419 done 442 done
420} 443}
421 444
445# Installs device-to-driver mappings for system-config-display
446# and anything else that uses hwdata
447install_driver_hwdata() {
448 insinto /usr/share/hwdata/videoaliases
449 for i in "${FILESDIR}"/*.xinf; do
450 # We need this for the case when none exist,
451 # so *.xinf doesn't expand
452 if [[ -e $i ]]; then
453 doins $i
454 fi
455 done
456}
457
422discover_font_dirs() { 458discover_font_dirs() {
423 pushd ${IMAGE}/usr/share/fonts 459 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} 460}
428 461
429create_fonts_scale() { 462create_fonts_scale() {
430 ebegin "Creating fonts.scale files" 463 ebegin "Creating fonts.scale files"
431 local x 464 local x
432 for FONT_DIR in ${FONT_DIRS}; do 465 for DIR in ${FONT_DIR}; do
433 x=${ROOT}/usr/share/fonts/${FONT_DIR} 466 x=${ROOT}/usr/share/fonts/${DIR}
434 [[ -z "$(ls ${x}/)" ]] && continue 467 [[ -z "$(ls ${x}/)" ]] && continue
435 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 468 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
436 469
437 # Only generate .scale files if truetype, opentype or type1 470 # Only generate .scale files if truetype, opentype or type1
438 # fonts are present ... 471 # fonts are present ...
472 eend 0 505 eend 0
473} 506}
474 507
475create_fonts_dir() { 508create_fonts_dir() {
476 ebegin "Generating fonts.dir files" 509 ebegin "Generating fonts.dir files"
477 for FONT_DIR in ${FONT_DIRS}; do 510 for DIR in ${FONT_DIR}; do
478 x=${ROOT}/usr/share/fonts/${FONT_DIR} 511 x=${ROOT}/usr/share/fonts/${DIR}
479 [[ -z "$(ls ${x}/)" ]] && continue 512 [[ -z "$(ls ${x}/)" ]] && continue
480 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 513 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
481 514
482 if [[ "${x/encodings}" = "${x}" ]]; then 515 if [[ "${x/encodings}" = "${x}" ]]; then
483 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 516 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
490 eend 0 523 eend 0
491} 524}
492 525
493fix_font_permissions() { 526fix_font_permissions() {
494 ebegin "Fixing permissions" 527 ebegin "Fixing permissions"
495 for FONT_DIR in ${FONT_DIRS}; do 528 for DIR in ${FONT_DIR}; do
496 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
497 -exec chmod 0644 {} \; 530 -exec chmod 0644 {} \;
498 done 531 done
499 eend 0 532 eend 0
500} 533}
501 534

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

  ViewVC Help
Powered by ViewVC 1.1.20