From: Chí-Thanh Christopher Nguyễn Date: Mon, 15 Mar 2010 13:01:30 +0000 (+0000) Subject: x11-base/xorg-server-1.7.5.902 version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e01f84ac3e06e8b4e7eaf9cf1e73930564573c1;p=gentoo.git x11-base/xorg-server-1.7.5.902 version bump Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index f7e189f81e5c..d7e060285e2c 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.489 2010/03/07 19:07:16 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.490 2010/03/15 13:01:30 chithanh Exp $ + +*xorg-server-1.7.5.902 (15 Mar 2010) + + 15 Mar 2010; Chí-Thanh Christopher Nguyễn + +xorg-server-1.7.5.902.ebuild: + version bump *xorg-server-1.7.5.901 (07 Mar 2010) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 1c3018e771ac..cc127a0a2d79 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -7,10 +7,12 @@ DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea449981002 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce DIST xorg-server-1.7.5.901.tar.bz2 4925825 RMD160 e0ccff20b20214b087582472a474d16850944477 SHA1 0ac7b037f511938cc4da32fc71de7e81617790cd SHA256 9530e1515642657d226c406cfd18bb80c03a698a7f0e2000b2057de81a742d40 +DIST xorg-server-1.7.5.902.tar.bz2 4927875 RMD160 04bfcbe4b13e3c9272504ad26cc16d7ae9dc7dd4 SHA1 27addf007c55294b2bf319c6cfe38228806357c5 SHA256 bf9fd44e1b11e0405f2831bf2ba5be64cb0f3502f88d95982e14e3feb0873f96 DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 ea73fe68637ed109806a567347e5dbbecc56b793 SHA1 2765155c3e03a7b1cf6a7509c78264147ef15552 SHA256 2da2a9575319fee5f1d95e1b9cb458be4da148470f72c4bca85659f466b4f813 EBUILD xorg-server-1.7.5.901.ebuild 6855 RMD160 f89a256b138c3890ade4faea6c1ad7354a03f76f SHA1 741cc130a7cd487f0dbd52d6572ab01503a02423 SHA256 7887444a3ccbdd51b57f6ab425fb021ee55a5c306484567f6d4fc29e542ffadf +EBUILD xorg-server-1.7.5.902.ebuild 7011 RMD160 56fa5aad98efe3c1c223ceff85a367c2596cd385 SHA1 58e45704cb5c6600346e7a2f58f5a49fb7a44243 SHA256 81b2500539d81c406769262a45bae13ede37bc998db3083662adcc5efa0c09ec EBUILD xorg-server-1.7.5.ebuild 7008 RMD160 f8c34443971a9e54e1923497232fe748a5f951e0 SHA1 b1b00b9f1b833fcd9d433e26391008d5371e9450 SHA256 8c4feccc4f43d3f70bd5e08a2471dd4bd718ba90dd9cc4a599907fbd80d4d545 -MISC ChangeLog 110596 RMD160 9ac4020d87b831ca34a8a52e66ef6bc391881ced SHA1 ffc96708ecb5cd34a2875acbaa358dd0e0bc2525 SHA256 d3f4bc60153a0fa78b1cade25fe194584da4bb9f98f024d6e3372e2c963d5b16 +MISC ChangeLog 110752 RMD160 ddb90dbaec9014c16c8a92e4a4b1d963bb26a1ad SHA1 09a5276caf5017d5f846a654bcd3056393b4d472 SHA256 ae693ec9d792708d47590f0d48d8934a7cc2c76c80c4325dfabb20667ede2596 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b diff --git a/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild new file mode 100644 index 000000000000..a17408762c65 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.7.5.902.ebuild @@ -0,0 +1,264 @@ +# Copyright 1999-2010 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.7.5.902.ebuild,v 1.1 2010/03/15 13:01:30 chithanh Exp $ + +EAPI="2" + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular multilib versionator + +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +OPENGL_DIR="xorg-x11" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xorg" +IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" +RDEPEND="hal? ( sys-apps/hal ) + tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) + dev-libs/openssl + >=x11-libs/libXfont-1.3.3 + >=x11-libs/xtrans-1.2.2 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libpciaccess-0.10.3 + >=x11-libs/pixman-0.15.20 + media-libs/freetype + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-1.4 + x11-apps/xkbcomp + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + >=x11-apps/xinit-1.0.8-r3 + >=app-admin/eselect-opengl-1.0.8 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.5 + >=x11-libs/libXfixes-4.0.3 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + >=x11-libs/libXtst-1.0.3 + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=x11-libs/libXres-1.0.3 + >=media-libs/mesa-7.4[nptl=] + ) + >=x11-libs/libxkbui-1.0.2 + kdrive? ( + >=x11-libs/libXext-1.0.5 + 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 + +## Deps that don't have a version in configure.ac but do here: +# x11-proto/resourceproto +# x11-proto/fontsproto +# x11-libs/libXau +# x11-libs/libXfont +# x11-libs/libXdmcp +# x11-libs/libXext +# x11-libs/libX11 +# x11-libs/libXrender +# x11-libs/libXmu +# x11-libs/libXfixes +# x11-libs/libXtst +# x11-proto/xineramaproto +# x11-proto/dmxproto +## Deps that are larger here than in configure.ac +# x11-libs/libpciaccess-0.8.0 +# + +DEPEND="${RDEPEND} + !!net-dialup/dtrace + sys-devel/flex + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/renderproto-0.11 + >=x11-proto/fixesproto-4.1 + >=x11-proto/damageproto-1.1 + >=x11-proto/xextproto-7.0.99.3 + >=x11-proto/xproto-7.0.13 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/compositeproto-0.4 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/inputproto-1.9.99.902 + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/glproto-1.4.9 + dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.1 + >=x11-libs/libdrm-2.3.0 + )" + +PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +EPATCH_FORCE="yes" +EPATCH_SUFFIX="patch" + +# These have been sent upstream +UPSTREAMED_PATCHES=( + #"${WORKDIR}/patches/" + + # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400 + "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch" + ) + +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="${conf_opts} --enable-xsdl" + else + conf_opts="${conf_opts} --disable-xsdl" + 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 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=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontdir=/usr/share/fonts + --with-xkb-output=/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="$(eselect opengl show)" + eselect opengl set ${OPENGL_DIR} +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example (see bugs #151421 and #151670) + insinto /etc/X11 + doins hw/xfree86/xorg.conf.example \ + || die "couldn't install xorg.conf.example" + fi +} + +pkg_postinst() { + switch_opengl_implem + + echo + ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6" + ewarn "or earlier, because the ABI changed. If you cannot start X because" + ewarn "of module version mismatch errors, this is your problem." + + echo + ewarn "You can generate a list of all installed packages in the x11-drivers" + 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="" + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; 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." +}