From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MnUwT-0005DA-7T for garchives@archives.gentoo.org; Tue, 15 Sep 2009 10:07:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C26E8E0949; Tue, 15 Sep 2009 10:07:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 869F8E0949 for ; Tue, 15 Sep 2009 10:07:20 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 10F516725F for ; Tue, 15 Sep 2009 10:07:20 +0000 (UTC) Received: from scarabeus by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MnUwL-0004FN-PX for gentoo-commits@lists.gentoo.org; Tue, 15 Sep 2009 10:07:17 +0000 From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.6.3.901-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog xorg-server-1.6.3.901-r2.ebuild X-VCS-Directories: x11-base/xorg-server X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tomas Chvatal Date: Tue, 15 Sep 2009 10:07:13 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ca12803c-00ed-464d-a85a-2efcc945a7fd X-Archives-Hash: a7db49cba28e1872c1bdaeeb07c47dee scarabeus 09/09/15 10:07:13 Modified: ChangeLog Added: xorg-server-1.6.3.901-r2.ebuild Log: Version bump to have working env with eselect-opengl 1.0.8 (Portage version: 2.2_rc38/cvs/Linux i686) Revision Changes Path 1.443 x11-base/xorg-server/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-serv= er/ChangeLog?rev=3D1.443&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-serv= er/ChangeLog?rev=3D1.443&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-serv= er/ChangeLog?r1=3D1.442&r2=3D1.443 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v retrieving revision 1.442 retrieving revision 1.443 diff -u -r1.442 -r1.443 --- ChangeLog 4 Sep 2009 23:51:31 -0000 1.442 +++ ChangeLog 15 Sep 2009 10:07:13 -0000 1.443 @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.44= 2 2009/09/04 23:51:31 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.44= 3 2009/09/15 10:07:13 scarabeus Exp $ + +*xorg-server-1.6.3.901-r2 (15 Sep 2009) + + 15 Sep 2009; Tom=C3=A1=C5=A1 Chv=C3=A1tal + +xorg-server-1.6.3.901-r2.ebuild: + Version bump to have working env with eselect-opengl 1.0.8 =20 04 Sep 2009; R=C3=A9mi Cardona xorg-server-1.6.3.901-r1.ebuild: 1.1 x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-serv= er/xorg-server-1.6.3.901-r2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-serv= er/xorg-server-1.6.3.901-r2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: xorg-server-1.6.3.901-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 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.6.3= .901-r2.ebuild,v 1.1 2009/09/15 10:07:13 scarabeus Exp $ EAPI=3D"2" # Must be before x-modular eclass is inherited #SNAPSHOT=3D"yes" inherit x-modular multilib versionator SRC_URI=3D"${SRC_URI}" # mirror://gentoo/${P}-gentoo-patches-01.tar.bz2 OPENGL_DIR=3D"xorg-x11" DESCRIPTION=3D"X.Org X servers" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~= x86 ~x86-fbsd" IUSE_SERVERS=3D"dmx kdrive xorg" IUSE=3D"${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" RDEPEND=3D"hal? ( sys-apps/hal ) tslib? ( >=3Dx11-libs/tslib-1.0 x11-proto/xcalibrateproto ) dev-libs/openssl >=3Dx11-libs/libXfont-1.4.0 >=3Dx11-libs/xtrans-1.2.3 >=3Dx11-libs/libXau-1.0.4 >=3Dx11-libs/libXext-1.0.4 >=3Dx11-libs/libX11-1.1.5 >=3Dx11-libs/libxkbfile-1.0.4 >=3Dx11-libs/libXdmcp-1.0.2 >=3Dx11-libs/libXmu-1.0.3 >=3Dx11-libs/libXrender-0.9.4 >=3Dx11-libs/libXi-1.2.1 >=3Dx11-libs/pixman-0.14.0 media-libs/freetype >=3Dx11-misc/xbitmaps-1.0.1 >=3Dx11-misc/xkeyboard-config-1.4 x11-apps/xkbcomp >=3Dx11-apps/iceauth-1.0.2 >=3Dx11-apps/rgb-1.0.3 >=3Dx11-apps/xauth-1.0.3 >=3Dx11-apps/xinit-1.0.8-r3 >=3Dapp-admin/eselect-opengl-1.0.8 >=3Dx11-libs/libXaw-1.0.5 >=3Dx11-libs/libXpm-3.5.7 >=3Dx11-libs/libpciaccess-0.10.3 dmx? ( >=3Dx11-libs/libdmx-1.0.2 >=3Dx11-libs/libXfixes-4.0.3 ) !minimal? ( >=3Dx11-libs/libXtst-1.0.3 >=3Dx11-libs/libXres-1.0.3 >=3Dmedia-libs/mesa-7.3_rc1[nptl=3D] ) >=3Dx11-libs/libxkbui-1.0.2 kdrive? ( sdl? ( media-libs/libsdl ) )" # Xres is dmx-dependent # Xaw is dmx-dependent # Xpm is dmx-dependent, pulls in Xt # xkbcomp is launched at startup but not checked by ./configure DEPEND=3D"${RDEPEND} !net-dialup/dtrace sys-devel/flex >=3Dx11-proto/randrproto-1.2.99.4 >=3Dx11-proto/renderproto-0.9.3 >=3Dx11-proto/fixesproto-4 >=3Dx11-proto/damageproto-1.1 >=3Dx11-proto/xextproto-7.0.4 >=3Dx11-proto/xproto-7.0.14 >=3Dx11-proto/xf86dgaproto-2.0.3 >=3Dx11-proto/xf86rushproto-1.1.2 >=3Dx11-proto/xf86vidmodeproto-2.2.2 >=3Dx11-proto/compositeproto-0.4 >=3Dx11-proto/recordproto-1.13.2 >=3Dx11-proto/resourceproto-1.0.2 >=3Dx11-proto/videoproto-2.2.2 >=3Dx11-proto/scrnsaverproto-1.1.0 >=3Dx11-proto/trapproto-3.4.3 >=3Dx11-proto/xineramaproto-1.1.2 >=3Dx11-proto/fontsproto-2.0.2 >=3Dx11-proto/kbproto-1.0.3 >=3Dx11-proto/inputproto-1.5.0 >=3Dx11-proto/bigreqsproto-1.0.2 >=3Dx11-proto/xcmiscproto-1.1.2 >=3Dx11-proto/glproto-1.4.9 dmx? ( >=3Dx11-proto/dmxproto-2.2.2 ) !minimal? ( >=3Dx11-proto/xf86driproto-2.0.4 >=3Dx11-proto/dri2proto-2.1 >=3Dx11-libs/libdrm-2.3 )" PDEPEND=3D"xorg? ( >=3Dx11-base/xorg-drivers-$(get_version_component_rang= e 1-2) )" LICENSE=3D"${LICENSE} MIT" EPATCH_FORCE=3D"yes" EPATCH_SUFFIX=3D"patch" # Local customizations, unsuitable for upstream GENTOO_PATCHES=3D( "${FILESDIR}/1.4-fpic-libxf86config.patch" "${FILESDIR}/${PV}-0001-dix-append-built-ins-to-the-font-path-in-SetDefa= ultF.patch" ) # These have been sent upstream #UPSTREAMED_PATCHES=3D( # "${WORKDIR}/patches/" # ) PATCHES=3D( "${GENTOO_PATCHES[@]}" "${UPSTREAMED_PATCHES[@]}" ) pkg_setup() { use minimal || ensure_a_server_is_building # SDL only available in kdrive build if use kdrive && use sdl; then conf_opts=3D"${conf_opts} --enable-xsdl" else conf_opts=3D"${conf_opts} --disable-xsdl" fi # localstatedir is used for the log location; we need to override the de= fault # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies # --enable-install-setuid needed because sparcs default off CONFIGURE_OPTIONS=3D" $(use_enable ipv6) $(use_enable dmx) $(use_enable kdrive) $(use_enable tslib) $(use_enable tslib xcalibrate) $(use_enable !minimal xvfb) $(use_enable !minimal xnest) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) $(use_enable !minimal install-libxf86config) $(use_enable !minimal dri) $(use_enable !minimal dri2) $(use_enable !minimal glx) $(use_enable xorg) $(use_enable nptl glx-tls) $(use_enable hal config-hal) --sysconfdir=3D/etc/X11 --localstatedir=3D/var --enable-install-setuid --with-fontdir=3D/usr/share/fonts --with-xkb-output=3D/var/lib/xkb --without-dtrace ${conf_opts}" # (#121394) Causes window corruption filter-flags -fweb # Incompatible with GCC 3.x SSP on x86, bug #244352 if use x86 ; then if [[ $(gcc-major-version) -lt 4 ]]; then filter-flags -fstack-protector fi fi OLD_IMPLEM=3D"$(eselect opengl show)" eselect opengl set --impl-headers ${OPENGL_DIR} } 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=3D"minimal" # Bug #151670 - this file is also not build if USE=3D"-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.5" ewarn "or earlier, because the ABI changed. If you cannot start X becaus= e" ewarn "of module version mismatch errors, this is your problem." echo ewarn "You can generate a list of all installed packages in the x11-driv= ers" ewarn "category 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 } 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=3D"" for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,d= ri2}*; 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() { 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 ${OLD_IMPLEM} } 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." }