diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-29 08:19:28 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-29 08:19:28 +0000 |
commit | 93fc5552c693775b2058b52dbf1d283a6ef148e0 (patch) | |
tree | d1109f78939fb55ecd8e408249de35c8094aa2a3 /x11-base | |
parent | Depend on dev-libs/libxslt, app-text/docbook-xsl-stylesheets (#368909), app-t... (diff) | |
download | historical-93fc5552c693775b2058b52dbf1d283a6ef148e0.tar.gz historical-93fc5552c693775b2058b52dbf1d283a6ef148e0.tar.bz2 historical-93fc5552c693775b2058b52dbf1d283a6ef148e0.zip |
Version bump to release. Drop older.
Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 9 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 14 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.10.1.ebuild | 250 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.10.2.ebuild (renamed from x11-base/xorg-server/xorg-server-1.10.1.902.ebuild) | 2 |
4 files changed, 15 insertions, 260 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index f97b50b69a6d..4d63be866ffe 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.589 2011/05/21 18:01:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.590 2011/05/29 08:19:28 scarabeus Exp $ + +*xorg-server-1.10.2 (29 May 2011) + + 29 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.10.1.ebuild, -xorg-server-1.10.1.902.ebuild, + +xorg-server-1.10.2.ebuild: + Version bump to release. Drop older. *xorg-server-1.10.1.902 (21 May 2011) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index f3e31d33cdb1..0b5069372b1f 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -9,20 +9,18 @@ AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 AUX xorg-server-glapi_c.patch 2215 RMD160 2df0b6ef296744b0c6951f4ba76bfeeb09196d62 SHA1 5bb85cef608bd75eca7a091fb581c0243cb36598 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c -DIST xorg-server-1.10.1.902.tar.bz2 5334056 RMD160 c692fec6db273fd2353ba262581e1009726854b0 SHA1 54b00d2f490705d6fa6061b5dea33a09850409a9 SHA256 06d9d25cde3c943709adb24dc44426df58f4a8774a048e422ce9543c34e37dbc -DIST xorg-server-1.10.1.tar.bz2 5344169 RMD160 f0333f67f8226c21bfad395bb3ee72e6d10784f6 SHA1 59ada4c9a59f7f1eb4b68c359e9cd58272aa4809 SHA256 143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d +DIST xorg-server-1.10.2.tar.bz2 5334473 RMD160 3d1ad6b236772ebe0400a69a03b9093bb210fd4b SHA1 fd831b3c6297d1a68830c602d767752d87b9ca54 SHA256 65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc -EBUILD xorg-server-1.10.1.902.ebuild 6900 RMD160 8f61d711682725cbdc258257d25f80d9d9b8a414 SHA1 d96a96a36a7b547fae22893de15094578bd65e2b SHA256 8918655761083cf7b0babe4b02e37a9cc1b7e8026fa5653c468f184d87792c7d -EBUILD xorg-server-1.10.1.ebuild 7285 RMD160 be4ef109bc4283fc1eb95fddfb91470c7cca3a16 SHA1 5c1e089c125930a977f78bb9510ec8522e421f05 SHA256 d359e216185b19e56de4338b5ae2b7bd5d5936dac594f035694f3b95a122a287 +EBUILD xorg-server-1.10.2.ebuild 6896 RMD160 b8a6071206480dcf45a65a880628673b56ef7891 SHA1 7a8369b906e7000c287d77549ebdf93229b306f2 SHA256 add339100aa3bc97224c6786e5ce34fc84db842101dee1f5bcaf76a80a6144d3 EBUILD xorg-server-1.9.4.ebuild 7804 RMD160 be63938727e77f858c9de4ed6892809b21abadd3 SHA1 d5d35ea11f5840459af5e001a1a86701f4ca7192 SHA256 bab747527e1ec78239d0894c08d49178739ea75ffc5afb29b9b4daf07adaf295 EBUILD xorg-server-1.9.5.ebuild 7803 RMD160 a15a33dcc85ed07dc52a27dfe98adf6516adbbef SHA1 1ad7aacafffc0837b6e6f2994126ecfb77e68df1 SHA256 f1047666519bd144edc72f18346cb19b8685c3237a9b491725cc6fe994f6216b -MISC ChangeLog 126988 RMD160 f2ae1c57102ccee9b16dce4ccfd47cac0faf8df3 SHA1 c39f56e28a0b6d62b2634a11d74e9e5446ce968e SHA256 6acd20bd203eed83b73c9946d1f967a989ff75181e77c14786b95cc872fba03e +MISC ChangeLog 127210 RMD160 f6990d5af83d45ccbc229eb9a0679b2dce638125 SHA1 2f6650a9b6cf3ad996b47f20af4f215cfa8fc9aa SHA256 d19d522f27940e557bd9e92d701bd18e8703ed733406f394df0f0f734374e9ec MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3X/fwACgkQHB6c3gNBRYfDwACggFZpiQqxIWKkvCLl1vEuelul -Bi4An1KMHK0RIcQNMSVnsf0ikIizL2l6 -=8lpe +iEYEARECAAYFAk3iAZUACgkQHB6c3gNBRYegKgCeKc+584SIRJb7ulBIHfgubnVS +RQAAoJFyBXDkhzkIBSjXXqMAKMjWSvtp +=lxK1 -----END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/xorg-server-1.10.1.ebuild b/x11-base/xorg-server/xorg-server-1.10.1.ebuild deleted file mode 100644 index 2a041a111b74..000000000000 --- a/x11-base/xorg-server/xorg-server-1.10.1.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2011 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.10.1.ebuild,v 1.2 2011/04/20 21:28:25 chithanh Exp $ - -EAPI=4 - -XORG_DOC=doc -inherit xorg-2 multilib versionator -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -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} ipv6 minimal nptl tslib +udev" - -RDEPEND=">=app-admin/eselect-opengl-1.0.8 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libpciaccess-0.10.3 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/pixman-0.15.20 - >=x11-libs/xtrans-1.2.2 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 - 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.99.4 - >=x11-libs/libXfixes-4.0.3 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-7.8_rc[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - udev? ( >=sys-fs/udev-150 ) - >=x11-apps/xinit-1.3" - -DEPEND="${RDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-4.1 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/glproto-1.4.11 - >=x11-proto/inputproto-1.9.99.902 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.2.99.3 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.1.99 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.17 - dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.3 - >=x11-libs/libdrm-2.4.20 - )" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-disable-acpi.patch - "${FILESDIR}"/${PN}-1.9-nouveau-default.patch - "${FILESDIR}"/${PN}-glapi_c.patch - ) - -pkg_setup() { - xorg-2_pkg_setup - - # 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 - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(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 udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontrootdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --disable-config-hal - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - " - - # Xorg-server requires includes from OS mesa which are not visible for - # users of binary drivers. - # Due to the limitations of CONFIGURE_OPTIONS, we have to export this - mkdir -p "${T}/mesa-symlinks/GL" - for i in gl glx glxmd glxproto glxtokens; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - for i in glext glxext; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - append-cppflags "-I${T}/mesa-symlinks" - - # 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 - - # Incompatible with GCC 3.x CPP, bug #314615 - if [[ $(gcc-major-version) -lt 4 ]]; then - ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x" - ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)" - fi - - # detect if we should inform user about ebuild breakage - if ! has_version "x11-base/xorg-server" || - has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then - INFO="yes" - fi -} - -src_install() { - xorg-2_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-3 xdm - newconfd "${FILESDIR}"/xdm.confd-3 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old - - if [[ ${INFO} = yes ]]; then - elog "You should consider reading upgrade guide for this release:" - elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" - echo - ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" - ewarn "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/" - fi -} - -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/xorg-x11/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/xorg-x11/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 -} diff --git a/x11-base/xorg-server/xorg-server-1.10.1.902.ebuild b/x11-base/xorg-server/xorg-server-1.10.2.ebuild index c81679aba860..2f365d4f2a1c 100644 --- a/x11-base/xorg-server/xorg-server-1.10.1.902.ebuild +++ b/x11-base/xorg-server/xorg-server-1.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.10.1.902.ebuild,v 1.1 2011/05/21 18:01:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild,v 1.1 2011/05/29 08:19:28 scarabeus Exp $ EAPI=4 |