From 0f5386ce3ea1e465b08687160c5818614a94a62f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 8 Dec 2014 09:17:13 +0000 Subject: [PATCH] Update to work with new eselect-opengl, bug #531842. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- x11-base/xorg-server/ChangeLog | 7 +- x11-base/xorg-server/Manifest | 21 +- .../xorg-server/xorg-server-1.16.2-r1.ebuild | 245 ++++++++++++++++++ 3 files changed, 268 insertions(+), 5 deletions(-) create mode 100644 x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 88e9001591b4..b6d765a94c1a 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.803 2014/11/15 11:27:09 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.804 2014/12/08 09:17:11 mgorny Exp $ + +*xorg-server-1.16.2-r1 (08 Dec 2014) + + 08 Dec 2014; Michał Górny +xorg-server-1.16.2-r1.ebuild: + Update to work with new eselect-opengl, bug #531842. *xorg-server-1.16.2 (15 Nov 2014) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 6368f5dec92d..6713ea48576e 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -47,15 +47,28 @@ EBUILD xorg-server-1.15.1.ebuild 7076 SHA256 7d5505d9cfb8fb0de119f04f96d903fd43b EBUILD xorg-server-1.15.2.ebuild 7076 SHA256 7c8e019fc390eb1a5422f09b5660dd76c89cacae09c21163b0f3b73a847b8153 SHA512 16990e0a57dbb6bbad070f9e667c8462008f26027877925ab9190a161317da29bd1a569d03704ee7cd27ec2d39d1dfdf0354df6c1902f6dc3fdf5f4040a37299 WHIRLPOOL 7d88840be1a90d5cb3bda1bfc21e99565d9231e1eeeaaddb75d64bbba805214dff4dbf858ab56ec98ab27b64cb716d28e371bf6b8dfcecb725a5bffe570dbc49 EBUILD xorg-server-1.16.0.ebuild 7623 SHA256 d1886ea3eda84940156dfa9f10d38a9f774e18a0cdbe79efe37a5b2236fcc615 SHA512 694e60a8564593ea1b5ad879a25b1b75b0b2ea1595046ea9c0b6a741620c4685304b793aa1ebaf6330614a6bf605bd99deda5f5892c5ee8e5040a507f6fe39f8 WHIRLPOOL 7068fa81114bf173e14d2af015a05b6155c01747dc83289ae2ec746f9553aa0359a543472a5a605c6126bd4ee03fd7202ad053271baa6ec074b53a777260d5a1 EBUILD xorg-server-1.16.1.ebuild 7623 SHA256 91b59692c7147cf2df2e0723c26dbedba66e0e46452866be9a5e61e3fbb547c8 SHA512 a7f899d824576bebcef44d83c2a0a74b937ab96f7d6b28069b69b2b17c2715609bb4141396fdb5d2fac7527558df883db2f0a2768c75658d0f88f3958918418e WHIRLPOOL 3d43bfebc1feb5b8301bc6de3a74c6b91fd27b452529284ce828336bf9c6c22b56d398715fe2d044f77e344940041f137b8857f602841b75dd7a979700a149d6 +EBUILD xorg-server-1.16.2-r1.ebuild 6759 SHA256 fa3d88d746b78773ee8d5a82b99bb9dd2666d492e3581ef7321302c7629a56f2 SHA512 8804cbde2d11e5f789eedcad27e6f7306ca7b01dfb3c5dff8f60f3710469f5740092bfd1af9712053c522ac477637d68667281418601593dc3f78146084ce91a WHIRLPOOL 097dce295829e7d20ff0cd0b51a5b305f03290882ea8ea810a900da17de66b6185ba2b5d9a3028a4a6499fbe51a4475c0a5fd7416d8d850a435da9f75476c27d EBUILD xorg-server-1.16.2.ebuild 7623 SHA256 dfb188091397b2dac45d341684b2196d3993fe028f30eba103e4eda57e985b78 SHA512 2fce63f6ec884d334b17e208b90b33fd1600f90fcbcb5d56ec75e12dd8594d464217e3d774ec2721779c08fe1757d00bf660dea56825fc6c1650efadbc9df265 WHIRLPOOL 7766927c3fceecc0cc76665ee09ee35ccda3c573c925ec80ff280152c16420ad229580039be205f63db09b1a9cb376e32ca8cc1a4431dd546040bcac02841ae2 EBUILD xorg-server-1.9.5-r3.ebuild 7967 SHA256 74e6a536de6c99f4c3081ca6f4b65c653e6b54d72ba17963b2186be0b031a3a6 SHA512 bb5b4f17f6fbd07cc1501019464b7b944599256e5ca0021d5481e6c194fd19fdb0e5029351b999b1efa621c61c1c7256970d431f99b3c31a659859649a09a63d WHIRLPOOL 4ff73d879f6a8c3c69d2f8f7414eb08d873187e3cbd6b4f1453d53398a3b13a93da4e3847a62c87e6b26f30fffb2fb7153b2e3da3a8bd0eaffc4eeb870701cb8 -MISC ChangeLog 58095 SHA256 0ecd87c2a600966b8ba27a9b10858d9260b9ea9aefbfb52879656c3ad25a3b94 SHA512 e4ce8500260885d1e6475ae040a77e64aa98a77358a75f7c21c97244b837b78d08e5d2388b034c39fbcf15157a55cfff533e45b5d7dec15c5b874c75a685a822 WHIRLPOOL 0a49294e6e601753b7a5198ff7892b3e3bf387d3903b2aeaa73c91a282aa725c089a54fe94368743b6d35d59daf9d385306612d5c3a6b8425974b721fe37ac37 +MISC ChangeLog 58272 SHA256 2a9051dd469f1887fb294eebdcc5189ab74a26c0d8aee85c41594bee3eb9a9b7 SHA512 a9e3162501b2146eaef053190a446c619c2391fb6d7e7da77a56d67549e4301bd08b72daa11c5f82cc96450ea45b1e32123d0c802035d70268d2cf6a5cea8b40 WHIRLPOOL dd330b64dbbd95766ceb66fb3f961fd5cf4309020fc9e9695a61c5289ba45c98944edfd0311185d50667ece5d4b456c787887c24c6c270b5f951d20f03403fc4 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece MISC metadata.xml 751 SHA256 02f470045d13e4baad4089f1cbc7cafd4dd1ab1b1799eeb2c0fb7864e956df80 SHA512 a58ad7f347519d7ba3bd710f1eab0f67925645961bcfa97fd9f106d5ea81400da79eebe95037ee4589b19c462fbdf6948949818f31210995ec9a930eaef78b26 WHIRLPOOL 67b3f0584a5c1d9e6da206761fc34a82caae36a4d9544c5512a95cdef800417c0f3f03a49606ebef72aa61522f097bf448fa0bdf651b5dd3b04554dcc86aaf5f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRnOJcACgkQfUU/I5AasIqefgCfS8e0iA++yOZAnz4IzYa3EsuR -kEcAoLPeeODeEIu2h+wGOzGNKrZ+9r3y -=W9Gd +iQJ8BAEBCABmBQJUhWyZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+9YQANcBHJQmg2aWPMXHi/T/fKHx +3+FedkIdPzdSi7jH2FVkXc2t7saMzKknHUlY0wtJ80e1JfA2/e4xksLTbP8cBTbu +wxkNb8ui6mKknhd2ENNXMsqlweIT03b2oIlCxS0oPZw8kAX4eFKApG1QX14aVjep +VtsjEf9C1XCPuGcyxnVA/JBAHJ0jy85ym9FJV6UFqafAWClzGwhfPbKNR7K8xzZI +IXiWXz5Er4sjxW4nCK1Y1rK+vqsodvXCoMF371idVFPbhU8AqMwzziDe41PsdSyf +Wf9d3KnNFaV6fCowIte0rSjUY9gBij30W4XctjBTXOd9WfZtq5v0WamEbvtBw92W +t4fLH6Aa3TfY+lwItaMcW7wIpA3LZM3kdEahSAC1quFMcu1qTn8TFuXlVimiUZp1 +K935MPebaZMXbPTPGpv7VXwNixhT/plA3GTdKBFGE6i5WPvcYmnUW+UyTPRI4Psl +dBFEU+/PKbQxTzS1cP/impcBQDhz8mY1NUhMBaFoGgX5rt+FcLsrrzJ7wZgcmpfx +5zJPkuBXYP3SXjD/npkAqnY4rZWrPv2nmUgqtxs1s8e8rtzzt1DmdzxqCcT4Codq +tAlKiWjqY+P0zbirATRGxyDcwa+tp96OwsD9rhhWpToPKri8w7pefbNMOyzZzris +4v+Fk8rnyggmD8VsHxJ4 +=i9Co -----END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild new file mode 100644 index 000000000000..a30b3a935ad5 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2014 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.16.2-r1.ebuild,v 1.1 2014/12/08 09:17:11 mgorny Exp $ + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" + +DESCRIPTION="X.Org X servers" +SLOT="0/1.16.1" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive xnest xorg xvfb" +IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland" + +CDEPEND=">=app-admin/eselect-opengl-1.3.0 + 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/libdrm-2.4.20 + >=x11-libs/libpciaccess-0.12.901 + >=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/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.3 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + 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/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + glamor? ( + media-libs/libepoxy + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + 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-10.3.4-r1[nptl=] + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + ) + >=x11-apps/xinit-1.3 + systemd? ( + sys-apps/dbus + sys-apps/systemd + )" + +DEPEND="${CDEPEND} + 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.1.3 + >=x11-proto/glproto-1.4.17-r1 + >=x11-proto/inputproto-2.2.99.1 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.4.0 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/renderproto-0.11 + >=x11-proto/resourceproto-1.2.0 + >=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.2.99.901 + >=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.26 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri3proto-1.0 + dmx? ( + >=x11-proto/dmxproto-2.2.99.1 + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.8 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) +" + +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}-1.12-ia64-fix_inx_outx.patch + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch +) + +pkg_pretend() { + # older gcc is not supported + [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ + die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." +} + +src_configure() { + # 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 + # 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 glamor) + $(use_enable kdrive) + $(use_enable kdrive kdrive-kbd) + $(use_enable kdrive kdrive-mouse) + $(use_enable kdrive kdrive-evdev) + $(use_enable suid install-setuid) + $(use_enable tslib) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(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) + $(use_with systemd systemd-daemon) + $(use_enable systemd systemd-logind) + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) + + xorg-2_src_configure +} + +src_install() { + xorg-2_src_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-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 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 + 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