Version bump, bug #385039. Fixes bug #373547 and bug #379915.
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Sun, 2 Oct 2011 00:47:55 +0000 (00:47 +0000)
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Sun, 2 Oct 2011 00:47:55 +0000 (00:47 +0000)
Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

x11-base/xorg-server/ChangeLog
x11-base/xorg-server/Manifest
x11-base/xorg-server/xorg-server-1.11.1.ebuild [new file with mode: 0644]

index 15efe484567d24025e056bc4fe1c87ba6bd87642..719a0c37a91f0aa6298ae96e98229df629b442b6 100644 (file)
@@ -1,6 +1,12 @@
 # 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.613 2011/09/21 00:26:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.614 2011/10/02 00:47:55 chithanh Exp $
+
+*xorg-server-1.11.1 (01 Oct 2011)
+
+  01 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xorg-server-1.11.1.ebuild:
+  Version bump, bug #385039. Fixes bug #373547 and bug #379915.
 
   21 Sep 2011; Jeroen Roovers <jer@gentoo.org> xorg-server-1.10.4.ebuild:
   Stable for HPPA (bug #380421).
index bdf07bfce6b18e9a041b160945c43ddd51f4a23a..04bcd3f5501a7b5254ff42ab55313bb9158d7378 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
@@ -13,20 +10,15 @@ DIST xorg-server-1.10.2.tar.bz2 5334473 RMD160 3d1ad6b236772ebe0400a69a03b9093bb
 DIST xorg-server-1.10.3.tar.bz2 5338354 RMD160 dfa59ac6d3f3f7fd059e6f92cead352845e08228 SHA1 1699be5c0edeca553cfa3ee6caa228483465136b SHA256 05ec05fbc8ec336127071db38cfb61c618e43b720edbd8d51d171c0cd359e290
 DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
 DIST xorg-server-1.11.0.tar.bz2 4984739 RMD160 add8c6cccb8dffbea2ca85685fc194feb2ee6331 SHA1 5fa0c0a190fbe1030a14e435de2d5a3259ca70be SHA256 9feb62c2972644fadaf94eda02c1d0009ec7089abd47086e5d9dcb4625338453
+DIST xorg-server-1.11.1.tar.bz2 4933664 RMD160 a26efea8fae4f52d0eae22a18b392f5eab836aa7 SHA1 ed0358b61294f1283aad42cf1e609752ceeffafd SHA256 c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6
 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.2.ebuild 7073 RMD160 2dc7bae93b5de516d6f1013128ab95ea8b6cd972 SHA1 ba0dc6c50f50aa62005b4b3446f380a4145d4767 SHA256 e56e846af8a90a1b9325ddb230780853bf5f7c0c8fb720a41741beb29e497fca
 EBUILD xorg-server-1.10.3.ebuild 7087 RMD160 6222f30b612fd3185db9c2eb3f70bb078ff3a763 SHA1 ac59a753a5eb923a0f1924bb4a258f90c8f0eee0 SHA256 f0e36155145ab64714d2cfb298ff5d837aa4b8221a7f6ef9c9a54c2e7edb5736
 EBUILD xorg-server-1.10.4.ebuild 7078 RMD160 87b787171acf6824c91cea0b77bf5320d8e3ef5e SHA1 bd76e5b4400b8615faf73118ccb06b7e48c3cf8b SHA256 3fc70f54e7302ae7d9472b3aae555005beac060de5462d0fdbebfb698772500d
 EBUILD xorg-server-1.11.0.ebuild 6632 RMD160 d37c7f4ba256b9aecb53e4bb8d5119b1945b09b0 SHA1 0ca898245a9a5fdd97f532ae7f0bc1549aaef626 SHA256 bbce960ba4d19c0777f68764a369d522205eb4a46d53591ef846116c863697b6
+EBUILD xorg-server-1.11.1.ebuild 6632 RMD160 7a231a8b9546f83713fe055d5e3922ef34776ff9 SHA1 6016b1ea8f041294d73459413e37325a63628b42 SHA256 d81ef749a89f925cad4fbdf5b86dbf52a272840d8857179c18c86d8e1caedfff
 EBUILD xorg-server-1.9.4.ebuild 7795 RMD160 2a13a293b5d7964272260034f6af5ff6fbd75f16 SHA1 c115e24b6de40381e7a1bb47ac06fdcc1cf5b1fb SHA256 af0e0e9deb3267a0d77d6f6a92c2870eb68a8681e4c8d80c1c3ee12fe9d1282c
 EBUILD xorg-server-1.9.5.ebuild 7797 RMD160 983d476a4940317cd80814152d28906d0b0697c0 SHA1 0a7c4e083d9f3c21d50415af94b65402152bd2bf SHA256 77d599c5bab11366ea7eea08dc7d13c23e920892b67deea9b9a9204f870fd333
-MISC ChangeLog 130456 RMD160 442057e3c100856e7687ee826a0187c476a8a009 SHA1 c46c06cf4ea0e557f8227a095f014463b930fbc9 SHA256 a855fb759eef4baa4f3a2494a2db799729a9a6eb7cec8c0dc50b9ed495eebd88
+MISC ChangeLog 130660 RMD160 270261015ad537a0d3f711c7b5c7fce92d39173e SHA1 308f37469a332169e3eec928c9358b200ff0ca1a SHA256 8e556bfe29e4e220015be2504c70b734cbd394fd2af9cd1ccf05cb47abe35395
 MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk55Lz0ACgkQVWmRsqeSphNSEQCdE52SPzetp4iAhhVoh6ELPcbY
-MOsAn1U9lUad/aIcwn2i9BZCKKKu49TA
-=bVHx
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.11.1.ebuild b/x11-base/xorg-server/xorg-server-1.11.1.ebuild
new file mode 100644 (file)
index 0000000..28b76b4
--- /dev/null
@@ -0,0 +1,231 @@
+# 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.11.1.ebuild,v 1.1 2011/10/02 00:47:55 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 xnest xorg xvfb"
+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.21.8
+       >=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-5.0
+               >=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 )
+       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-5.0
+       >=x11-proto/fontsproto-2.0.2
+       >=x11-proto/glproto-1.4.14
+       >=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.22
+       dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+       !minimal? (
+               >=x11-proto/xf86driproto-2.1.0
+               >=x11-proto/dri2proto-2.6
+               >=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
+)
+
+pkg_pretend() {
+       # older gcc is not supported
+       [[ $(gcc-major-version) -lt 4 ]] && \
+               die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
+}
+
+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
+       XORG_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 !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 xnest)
+               $(use_enable xorg)
+               $(use_enable xvfb)
+               $(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.
+       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"
+}
+
+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 [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
+               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/"
+               ewarn "or using sets from portage-2.2:"
+               ewarn " emerge @x11-module-rebuild"
+       fi
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+               rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+       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
+}