* [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.4.0.90.ebuild
@ 2007-12-14 7:55 Donnie Berkholz (dberkholz)
0 siblings, 0 replies; 2+ messages in thread
From: Donnie Berkholz (dberkholz) @ 2007-12-14 7:55 UTC (permalink / raw
To: gentoo-commits
dberkholz 07/12/14 07:55:38
Modified: ChangeLog
Added: xorg-server-1.4.0.90.ebuild
Log:
Bump to 1.4.1 release candidate. It's gotta be an improvement over 1.4,
(Portage version: 2.1.4_rc4)
Revision Changes Path
1.304 x11-base/xorg-server/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.304&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.304&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.303&r2=1.304
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- ChangeLog 30 Nov 2007 06:29:48 -0000 1.303
+++ ChangeLog 14 Dec 2007 07:55:38 -0000 1.304
@@ -1,6 +1,38 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.303 2007/11/30 06:29:48 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.304 2007/12/14 07:55:38 dberkholz Exp $
+
+*xorg-server-1.4.0.90 (14 Dec 2007)
+
+ 14 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ +files/1.4.0.90-clean-generated-files.patch,
+ +files/1.4-dont-hang-openoffice.patch,
+ +files/1.4-fix-kdrive-automake.patch, +xorg-server-1.4.0.90.ebuild:
+ Bump to 1.4.1 release candidate. It's gotta be an improvement over 1.4,
+ so i'm letting it go into ~arch.
+
+ (#192221) 'xorg-server-1.4 - keyboard LEDs do not work' fixed upstream.
+
+ (#201047) 'xorg-server 1.4 no longer loads xmodmap via xinitrc properly'
+ fixed upstream.
+
+ (#197104) 'xorg-server-1.3 and 1.4 consumes 100% CPU, locking the
+ keyboard, apparently triggered by opening an OpenOffice pulldown menu'
+ fixed with patch from master branch.
+
+ (#196019) 'xorg-server creates unnecessary file
+ /etc/X11/X11/Xsession.d/92xprint-xpserverlist' fixed by not installing
+ the same file twice to 2 different places (Andy Crook).
+
+ (#195886) 'xorg-server-1.4.0-r2 built with hal USE flag crashes on
+ shutdown if dbus service is not running' fixed upstream.
+
+ (#195551) 'xorg-server-1.4 fails to build w/kdrive on amd64' fixed with
+ Makefile.am patch designed for easier sed but unsuitable for upstream
+ because the line gets too long (Michael Gorse).
+
+ (#194503) Don't spit versions when showing drivers to rebuild via qlist,
+ and also provide a command for people to do it themselves later.
30 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
xorg-server-1.4-r2.ebuild:
1.1 x11-base/xorg-server/xorg-server-1.4.0.90.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild?rev=1.1&content-type=text/plain
Index: xorg-server-1.4.0.90.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild,v 1.1 2007/12/14 07:55:38 dberkholz Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
inherit x-modular multilib
OPENGL_DIR="xorg-x11"
MESA_PN="Mesa"
MESA_PV="7.0.2"
MESA_P="${MESA_PN}-${MESA_PV}"
MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
SRC_URI="${SRC_URI}
mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
DESCRIPTION="X.Org X servers"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE_INPUT_DEVICES="
input_devices_acecad
input_devices_aiptek
input_devices_calcomp
input_devices_citron
input_devices_digitaledge
input_devices_dmc
input_devices_dynapro
input_devices_elo2300
input_devices_elographics
input_devices_evdev
input_devices_fpit
input_devices_hyperpen
input_devices_jamstudio
input_devices_joystick
input_devices_keyboard
input_devices_magellan
input_devices_microtouch
input_devices_mouse
input_devices_mutouch
input_devices_palmax
input_devices_penmount
input_devices_spaceorb
input_devices_summa
input_devices_tek4957
input_devices_ur98
input_devices_vmmouse
input_devices_void
input_devices_synaptics
input_devices_wacom"
IUSE_VIDEO_CARDS="
video_cards_amd
video_cards_apm
video_cards_ark
video_cards_chips
video_cards_cirrus
video_cards_cyrix
video_cards_dummy
video_cards_epson
video_cards_fbdev
video_cards_glint
video_cards_i128
video_cards_i740
video_cards_i810
video_cards_impact
video_cards_imstt
video_cards_mach64
video_cards_mga
video_cards_neomagic
video_cards_newport
video_cards_nsc
video_cards_nv
video_cards_r128
video_cards_radeon
video_cards_rendition
video_cards_s3
video_cards_s3virge
video_cards_savage
video_cards_siliconmotion
video_cards_sis
video_cards_sisusb
video_cards_sunbw2
video_cards_suncg14
video_cards_suncg3
video_cards_suncg6
video_cards_sunffb
video_cards_sunleo
video_cards_suntcx
video_cards_tdfx
video_cards_tga
video_cards_trident
video_cards_tseng
video_cards_v4l
video_cards_vermilion
video_cards_vesa
video_cards_vga
video_cards_via
video_cards_vmware
video_cards_voodoo
video_cards_xgi
video_cards_fglrx
video_cards_nvidia"
IUSE_SERVERS="dmx kdrive xorg"
IUSE="${IUSE_VIDEO_CARDS}
${IUSE_INPUT_DEVICES}
${IUSE_SERVERS}
3dfx
dri hal ipv6 minimal nptl sdl xprint"
RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libXfont-1.3.1
>=x11-libs/xtrans-1.0.4
>=x11-libs/libXau-1.0.3
>=x11-libs/libXext-1.0.2
>=x11-libs/libX11-1.1.3
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXmu-1.0.3
>=x11-libs/libXrender-0.9.4
>=x11-libs/libXi-1.1.3
>=x11-libs/pixman-0.9.5
media-libs/freetype
>=media-libs/mesa-7.0.1
media-fonts/font-adobe-75dpi
media-fonts/font-misc-misc
media-fonts/font-cursor-misc
>=x11-misc/xbitmaps-1.0.1
>=x11-misc/xkeyboard-config-0.9
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.1
>=x11-apps/xauth-1.0.2
>=x11-apps/xinit-1.0.5
app-admin/eselect-opengl
>=x11-libs/libXaw-1.0.4
>=x11-libs/libXpm-3.5.7
>=x11-libs/libXxf86misc-1.0.1
>=x11-libs/libXxf86vm-1.0.1
dmx? ( >=x11-libs/libdmx-1.0.2
>=x11-libs/libXfixes-4.0.3 )
!minimal? ( >=x11-libs/libXtst-1.0.3
>=x11-libs/libXres-1.0.3 )
>=x11-libs/libxkbui-1.0.2
>=x11-libs/liblbxutil-1.0.1
kdrive? ( sdl? ( media-libs/libsdl ) )"
# Xres is dmx-dependent, xkbui is xorgcfg-dependent
# Xaw is dmx- and xorgcfg-dependent
# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
# Xxf86misc and Xxf86vm are xorgcfg-dependent
# liblbxutil is lbx- dependent
DEPEND="${RDEPEND}
!net-dialup/dtrace
>=x11-proto/randrproto-1.2.1
>=x11-proto/renderproto-0.9.3
>=x11-proto/fixesproto-4
>=x11-proto/damageproto-1.1
>=x11-proto/xextproto-7.0.2
>=x11-proto/xproto-7.0.10
>=x11-proto/xf86dgaproto-2.0.3
>=x11-proto/xf86miscproto-0.9.2
>=x11-proto/xf86rushproto-1.1.2
>=x11-proto/xf86vidmodeproto-2.2.2
>=x11-proto/xf86bigfontproto-1.1.2
>=x11-proto/compositeproto-0.4
>=x11-proto/recordproto-1.13.2
>=x11-proto/resourceproto-1.0.2
>=x11-proto/videoproto-2.2.2
>=x11-proto/scrnsaverproto-1.1.0
>=x11-proto/evieext-1.0.2
>=x11-proto/trapproto-3.4.3
>=x11-proto/xineramaproto-1.1-r1
>=x11-proto/fontsproto-2.0.2
>=x11-proto/kbproto-1.0.3
>=x11-proto/inputproto-1.4.2.1
>=x11-proto/bigreqsproto-1.0.2
>=x11-proto/xcmiscproto-1.1.2
>=x11-proto/glproto-1.4.8
dmx? ( >=x11-proto/dmxproto-2.2.2 )
dri? ( >=x11-proto/xf86driproto-2.0.3
>=x11-libs/libdrm-2.3 )
xprint? ( >=x11-proto/printproto-1.0.3
>=x11-apps/mkfontdir-1.0.3
>=x11-apps/mkfontscale-1.0.3
>=x11-apps/xplsprinters-1.0.1 )"
# Drivers
PDEPEND="
xorg? (
input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.1 )
input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.1 )
input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.1 )
input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.2.0 )
input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.1 )
input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.1 )
input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.2.1 )
input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.2 )
input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
input_devices_synaptics? ( x11-drivers/synaptics )
input_devices_wacom? ( x11-drivers/linuxwacom )
video_cards_amd? ( >=x11-drivers/xf86-video-amd-2.7.7.0 )
video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 )
video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 )
video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 )
video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 )
video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 )
video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 )
video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 )
video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 )
video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 )
video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 )
video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 )
video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 )
video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 )
video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 )
video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 )
video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 )
video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 )
video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 )
video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 )
video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 )
video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 )
video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 )
video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 )
video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 )
video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 )
video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 )
video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 )
video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 )
video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 )
video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 )
video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 )
video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 )
video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 )
video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 )
video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 )
video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 )
video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 )
video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 )
video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 )
video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 )
video_cards_vermilion? ( >=x11-drivers/xf86-video-vermilion-1.0.0 )
video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 )
video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 )
video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 )
video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 )
video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 )
video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 )
video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) )
video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.433 )
video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-71.86.01 )
)"
LICENSE="${LICENSE} MIT"
PATCHES="
${FILESDIR}/1.4-ia64.patch
${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch
${FILESDIR}/1.4-fpic-libxf86config.patch
${FILESDIR}/1.4-document-new-font-catalogs.patch
${FILESDIR}/1.4-fix-dmx-build.patch
${FILESDIR}/1.4-fix-dmx-link.patch
${FILESDIR}/1.4-fix-xephyr-link.patch
${FILESDIR}/1.4-fix-xprint-build.patch
${FILESDIR}/1.4-fix-xprint-link.patch
${FILESDIR}/1.4-fix-kdrive-automake.patch
${FILESDIR}/1.4-dont-hang-openoffice.patch
${FILESDIR}/${PV}-clean-generated-files.patch
"
pkg_setup() {
use minimal || ensure_a_server_is_building
# SDL only available in kdrive build
if use kdrive && use sdl; then
conf_opts="${conf_opts} --enable-xsdl"
else
conf_opts="${conf_opts} --disable-xsdl"
fi
# Only Xorg and Xgl support this, and we won't build Xgl
# until it merges to trunk
if use xorg; then
conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
fi
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
# --enable-install-setuid needed because sparcs default off
CONFIGURE_OPTIONS="
$(use_enable ipv6)
$(use_enable dmx)
$(use_enable kdrive)
$(use_enable !minimal xvfb)
$(use_enable !minimal xnest)
$(use_enable !minimal install-libxf86config)
$(use_enable dri)
$(use_enable xorg)
$(use_enable xprint)
$(use_enable nptl glx-tls)
$(use_enable !minimal xorgcfg)
$(use_enable hal config-dbus)
$(use_enable hal config-hal)
--sysconfdir=/etc/X11
--localstatedir=/var
--enable-install-setuid
--with-fontdir=/usr/share/fonts
--with-xkb-output=/var/lib/xkb
${conf_opts}"
local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
if built_with_use media-libs/mesa nptl; then
use nptl || die "${diemsg}"
else
use nptl && die "${diemsg}"
fi
# (#121394) Causes window corruption
filter-flags -fweb
# Nothing else provides new enough glxtokens.h
ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
OLD_IMPLEM="$(eselect opengl show)"
eselect opengl set --impl-headers ${OPENGL_DIR}
}
src_unpack() {
x-modular_specs_check
x-modular_dri_check
x-modular_unpack_source
x-modular_patch_source
# Clean up for ${PV}-clean-generated-files.patch
pushd hw/xprint
rm -f *-wrapper.c || die
popd
# Set up kdrive servers to build
if use kdrive; then
kdrive_setup
fi
# Make sure eautoreconf gets run if we need the autoconf/make
# changes.
if [[ ${SNAPSHOT} != "yes" ]]; then
if use kdrive || use dmx || use xprint; then
SNAPSHOT="yes"
fi
fi
if use hal; then
sed -i \
-e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \
"${S}"/config/Makefile.am \
|| die "failed to fix DBUS config directory"
SNAPSHOT="yes"
fi
x-modular_reconf_source
#do not install xprint's Xsession.d files, we'll do it later
if use xprint; then
sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \
-i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \
|| die "sed of Xsession.d makefile failed"
fi
}
src_install() {
x-modular_src_install
dynamic_libgl_install
server_based_install
# Install video mode files for system-config-display
insinto /usr/share/xorg
doins hw/xfree86/common/{extra,vesa}modes \
|| die "couldn't install extra modes"
# Bug #151421 - this file is not built with USE="minimal"
# Bug #151670 - this file is also not build if USE="-xorg"
if ! use minimal && use xorg; then
# Install xorg.conf.example
insinto /etc/X11
doins hw/xfree86/xorg.conf.example \
|| die "couldn't install xorg.conf.example"
fi
}
pkg_postinst() {
switch_opengl_implem
# Bug #135544
ewarn "Users of reduced blanking now need:"
ewarn " Option \"ReducedBlanking\""
ewarn "In the relevant Monitor section(s)."
ewarn "Make sure your reduced blanking modelines are safe!"
echo
ewarn "You must rebuild all drivers if upgrading from xorg-server 1.3"
ewarn "or earlier, because the ABI changed. If you cannot start X because"
ewarn "of module version mismatch errors, this is your problem."
ewarn "Here's a list of installed X drivers to emerge:"
print_installed x11-drivers/
echo
ewarn "You can generate a similar list at any point using this command:"
ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
ebeep 5
epause 10
}
pkg_postrm() {
# Get rid of module dir to ensure opengl-update works properly
if ! has_version x11-base/xorg-server; then
if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
fi
fi
}
kdrive_setup() {
local card real_card disable_card kdrive_fbdev kdrive_vesa
einfo "Removing unused kdrive drivers ..."
# Some kdrive servers require fbdev and vesa
kdrive_fbdev="radeon neomagic sis siliconmotion"
# Some kdrive servers require just vesa
kdrive_vesa="chips mach64 mga nv glint r128 via"
for card in ${IUSE_VIDEO_CARDS}; do
real_card=${card#video_cards_}
# Differences between VIDEO_CARDS name and kdrive server name
real_card=${real_card/glint/pm2}
real_card=${real_card/radeon/ati}
real_card=${real_card/%nv/nvidia}
real_card=${real_card/siliconmotion/smi}
real_card=${real_card/%sis/sis300}
disable_card=0
# Check whether it's a valid kdrive server before we waste time
# on the rest of this
if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then
continue
fi
if ! use ${card}; then
if use x86; then
# Some kdrive servers require fbdev and vesa
for i in ${kdrive_fbdev}; do
if use video_cards_${i}; then
if [[ ${real_card} = fbdev ]] \
|| [[ ${real_card} = vesa ]]; then
continue 2 # Don't disable
fi
fi
done
# Some kdrive servers require just vesa
for i in ${kdrive_vesa}; do
if use video_cards_${i}; then
if [[ ${real_card} = vesa ]]; then
continue 2 # Don't disable
fi
fi
done
fi
disable_card=1
# Bug #150052
# fbdev is the only VIDEO_CARDS setting that works on non-x86
elif ! use x86 \
&& [[ ${real_card} != fbdev ]]; then
ewarn " $real_card does not work on your architecture; disabling."
disable_card=1
fi
if [[ $disable_card = 1 ]]; then
ebegin " ${real_card}"
sed -i \
-e "s:\b${real_card}\b::g" \
"${S}"/hw/kdrive/Makefile.am \
|| die "sed of ${real_card} failed"
eend
fi
done
}
dynamic_libgl_install() {
# next section is to setup the dynamic libGL stuff
ebegin "Moving GL files for dynamic switching"
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
local x=""
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do
if [ -f ${x} -o -L ${x} ]; then
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
fi
done
eend 0
}
server_based_install() {
use xprint && xprint_src_install
if ! use xorg; then
rm "${D}"/usr/share/man/man1/Xserver.1x \
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
"${D}"/usr/share/man/man1/Xserver.1x
fi
}
switch_opengl_implem() {
# Switch to the xorg implementation.
# Use new opengl-update that will not reset user selected
# OpenGL interface ...
echo
# eselect opengl set --use-old ${OPENGL_DIR}
eselect opengl set ${OLD_IMPLEM}
}
print_installed() {
local command line token=$1
if $(type -P qlist >/dev/null 2>&1); then
command="qlist -I -C ${token}"
elif $(type -P equery >/dev/null 2>&1); then
command="equery -q -C list ${token} | grep -o '${token}[[:alnum:].-]*'"
elif $(type -P epm >/dev/null 2>&1); then
command="epm -qaG | grep ${token}"
else
local dir
command="true"
for dir in "${PORTDIR}"/${token}*; do
command="${command} ; best_version ${dir#${PORTDIR}/}"
done
fi
while read line; do
ewarn "${line}"
done < <(eval ${command})
}
xprint_src_install() {
# RH-style init script, we provide a wrapper
exeinto /usr/$(get_libdir)/misc
doexe "${S}"/hw/xprint/etc/init.d/xprint
# Install the wrapper
newinitd "${FILESDIR}"/xprint.init xprint
# Install profile scripts
insinto /etc/profile.d
doins "${S}"/hw/xprint/etc/profile.d/xprint*
exeinto /etc/X11/xinit/xinitrc.d
doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist
# Patch profile scripts
sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \
"${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist
# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
dodoc "${D}"/etc/profile.d/xprint*
rm -f "${D}"/etc/profile.d/xprint*
}
ensure_a_server_is_building() {
for server in ${IUSE_SERVERS}; do
use ${server} && return;
done
eerror "You need to specify at least one server to build."
eerror "Valid servers are: ${IUSE_SERVERS}."
die "No servers were specified to build."
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.4.0.90.ebuild
@ 2007-12-16 23:30 Donnie Berkholz (dberkholz)
0 siblings, 0 replies; 2+ messages in thread
From: Donnie Berkholz (dberkholz) @ 2007-12-16 23:30 UTC (permalink / raw
To: gentoo-commits
dberkholz 07/12/16 23:30:23
Modified: ChangeLog xorg-server-1.4.0.90.ebuild
Log:
Don't print output of pushd/popd (Mike Frysinger).
(Portage version: 2.1.4_rc4)
Revision Changes Path
1.305 x11-base/xorg-server/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.305&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.305&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.304&r2=1.305
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- ChangeLog 14 Dec 2007 07:55:38 -0000 1.304
+++ ChangeLog 16 Dec 2007 23:30:23 -0000 1.305
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.304 2007/12/14 07:55:38 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.305 2007/12/16 23:30:23 dberkholz Exp $
+
+ 16 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ xorg-server-1.4.0.90.ebuild:
+ Don't print output of pushd/popd (Mike Frysinger).
*xorg-server-1.4.0.90 (14 Dec 2007)
1.2 x11-base/xorg-server/xorg-server-1.4.0.90.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild?r1=1.1&r2=1.2
Index: xorg-server-1.4.0.90.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-server-1.4.0.90.ebuild 14 Dec 2007 07:55:38 -0000 1.1
+++ xorg-server-1.4.0.90.ebuild 16 Dec 2007 23:30:23 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild,v 1.1 2007/12/14 07:55:38 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90.ebuild,v 1.2 2007/12/16 23:30:23 dberkholz Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -350,9 +350,9 @@
x-modular_patch_source
# Clean up for ${PV}-clean-generated-files.patch
- pushd hw/xprint
+ pushd hw/xprint >/dev/null
rm -f *-wrapper.c || die
- popd
+ popd >/dev/null
# Set up kdrive servers to build
if use kdrive; then
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-16 23:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-16 23:30 [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.4.0.90.ebuild Donnie Berkholz (dberkholz)
-- strict thread matches above, loose matches on Subject: below --
2007-12-14 7:55 Donnie Berkholz (dberkholz)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox