From ee8ca5a7c50b4301bd506c8f8165097443be96c2 Mon Sep 17 00:00:00 2001 From: Valko Laszlo Date: Sun, 29 Oct 2017 17:19:26 +0100 Subject: [PATCH] Added xorg-serer 1.19.5 --- x11-base/xorg-server/Manifest | 2 + .../xorg-server/xorg-server-1.19.5.ebuild | 252 ++++++++++++++++++ 2 files changed, 254 insertions(+) create mode 100644 x11-base/xorg-server/xorg-server-1.19.5.ebuild diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index e1f9ab6..f937c32 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -24,6 +24,7 @@ DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f DIST xorg-server-1.19.2.tar.bz2 5969543 SHA256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb SHA512 258c5d615efda28170bf0fd4a19e24fd2cefe086d5ef1aada7a407b8dc2ddaa7d74ad0245e0b13155a3e6d30c65fedf054326e191b6dfe800aae881664d63f16 WHIRLPOOL 6ffca7dc695d9551efecbf9061e40862a187f16afba113467640a506c7becdb2e37d7fe042cbfe08af8ba9f2e8f538fd50460ef46a34452796436de15fa463fd DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 WHIRLPOOL acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad745555416e6be89575523285e1ca3954f9e60a5cf079 +DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c WHIRLPOOL 01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e EBUILD xorg-server-1.15.2-r1.ebuild 7306 SHA256 900b01e559de92ed035d6d84eeedf517b1cbf71ea201c0278ddb00a5814a3f4f SHA512 113928dc790ce476ad8f23566682c6f400e9e7d223b66bf0bdf2b16019a854effead8224d2563f4a9decb182a66bdb3a0d8fd73d385ec1e597a6f19b2c98bf28 WHIRLPOOL 5d30f2f880b116fa3556204121169fffd3e308ca5a2fc91651f430ce3caf4b239ebf7930abfa6ee701192f59dff3d7b059b07bc2b007043b25bd1c3f4406b926 EBUILD xorg-server-1.15.2-r2.ebuild 7344 SHA256 8070230d3896f85c3b3d1f72fcbb89b1a4cb90914699efcac6c33c3011101399 SHA512 5423b886fc6e325c17af1f6f63520be40e686eceaa9fd82ad989fbdac7df6c37877d81b486dd80a70556b5edfd42b459c8555e09cefabbbdcba5aa5684bfb809 WHIRLPOOL 1bd56d89cbc0b3f05c6d3b271d15dafc42756fbe5991d7f70d0fc4193846dc90f48e41c9c158c078e776cce2d198460f809bfca898cd6acaf6bea865eaa3fc6f EBUILD xorg-server-1.16.4-r4.ebuild 6255 SHA256 7f9c44e14547729d6fa63823731b1c597ded0f75d5d852d5c1bde9e653a6fea8 SHA512 22bee04399c3daa7b91a684e488c1fa0d323b9befba80cf2bdfbf30e02d2c074ee8a4b7d2cf6995b523479ab181eeb1213c80241886d4e74eed81384bf22f3b7 WHIRLPOOL 516c62c1bccea0e834879c90b9b275b69497c73fe1709ec3e5e48443174399f52d35928338f8aec9a81c21359219029fbbc4cfb0479fd1aa5dc5a13791a4fa74 @@ -33,3 +34,4 @@ EBUILD xorg-server-1.17.4.ebuild 6436 SHA256 72de26e4e32e6507c74a14516333280e214 EBUILD xorg-server-1.18.4.ebuild 6284 SHA256 989ac95b42663776f3405439c6b230c4ecb3a89b494fb2aec8ac45982dea6c34 SHA512 a84b833ff3f2bf1f3861c9c8fc549e40a4ebea99d35ba721c61ba358fb4ae21ce55e2aea9689daf2392dfcff48dac38c4155f3213506bb567cacfefadd06b76f WHIRLPOOL 98e8660f21c36547697fcaffe4a5dd19d878c38fc964e395e076795f0db308fbcf850d0c2eaabfd4be67529078ea13e480bbcce6fef015705c29adeead89c7c8 EBUILD xorg-server-1.19.2.ebuild 6575 SHA256 7a0a0f064b64d79ccc17bf67bcd231e5f67d299ebc3c163ef962578b73e21c93 SHA512 b96c07920f7318abbf6e2009e010151d73830e6090ab8a354c567dc4472d0e9fcfcf75e7d6532813827492b722576311adb3e1dbc4cfdf1bccf6059626f45f1a WHIRLPOOL 72f4924576f722492e395b5c6768c27492da711450e46c2b4b6f8faf0b3148fb10eeef8e3ecaab755b63468f8e5a55a83ee6a4805d9452efd42e5a1beeb40f7a EBUILD xorg-server-1.19.3.ebuild 6561 SHA256 a3bf348711f563e7ba898795a43cf4310a80737cfc33382a0af3a8e051710523 SHA512 4dc0fee4ad01340c46542ba09fd647f8d1abd901e62a069886adde33dccb3f882e138e95c4425173b961c2440859ba31c546f130cb92e5a53fe381b594b6bcde WHIRLPOOL d679f0b37a9c9511993425111a07d1800af33c3fe53549d6bff3c42bd1cd41ed0544aa52a271625db6f96d66ed510986aa7bf9b419017f9437cdee3f583d0c35 +EBUILD xorg-server-1.19.5.ebuild 6599 SHA256 b2631d6d62a8246e400c3163d5187e0ec9437044207e3f904df0c5205c25638f SHA512 5529440d62c8fb892c87cdaaeae60ca75b4e16b65c7f46d9988de231151ab8ffdb0cf453cdc352b5133d4c31e073c90a1e332fb24aadef0287c76f8c33252b18 WHIRLPOOL bfdd96f92ce59e66302dfc1edc6324194c05e5d96c5e857f7691aac127e23c6b96f2a177111ead16ad83c90b03ae1afa73e5352f0ec32df75105ff36dbf66bca diff --git a/x11-base/xorg-server/xorg-server-1.19.5.ebuild b/x11-base/xorg-server/xorg-server-1.19.5.ebuild new file mode 100644 index 0000000..807787d --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.19.5.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +inherit xorg-2 multilib versionator flag-o-matic +EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + >=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.46 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-libs/xtrans-1.3.5 + >=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[X] + >=media-libs/mesa-10.3.4-r1[egl,gbm] + !x11-libs/glamor + ) + kdrive? ( + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + ) + xephyr? ( + x11-libs/libxcb[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-10.3.4-r1 + ) + tslib? ( >=x11-libs/tslib-1.0 ) + udev? ( >=virtual/udev-150 ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + media-libs/libepoxy + >=dev-libs/wayland-protocols-1.1 + ) + >=x11-apps/xinit-1.3.3-r1 + 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.3 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/randrproto-1.5.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.31 + >=x11-proto/presentproto-1.0 + >=x11-proto/dri2proto-2.8 + >=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 + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + xephyr? ( kdrive )" + +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +#) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + "${FILESDIR}"/${PN}-1.19-randr-Account-for-panning-and-transforms-when-constr.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 +) + +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." +} + +pkg_setup() { + if use wayland && ! use glamor; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + fi +} + +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 debug) + $(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 dri) + $(use_enable !minimal dri2) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(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 +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +} + +server_based_install() { + if ! use xorg; then + rm "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x + fi +}