diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-08 14:01:34 +0100 |
commit | 4645b6f17f0da81e9fe84081fb126a37102ba153 (patch) | |
tree | e6c48cf3db2213af38cf528a5364fffd5c74c6d6 /x11-base/xorg-server | |
parent | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (diff) |
gentoo resync : 08.05.2018
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 2 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.99.905.ebuild | 219 |
3 files changed, 223 insertions, 2 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index e4196aad5001..4f111e88646a 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -10,8 +10,10 @@ AUX xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch 5560 BLAKE2B AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c DIST xorg-server-1.19.99.904.tar.bz2 6083787 BLAKE2B 7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479 SHA512 b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e +DIST xorg-server-1.19.99.905.tar.bz2 6088508 BLAKE2B 592404aebb0e1ee1e6c20a36e08a788331467875f304117711583b892442d4e0cbdd91a999b38ec1d2487f33904cd0913c2cfef37f2e49f6ef5ec9f4725372ab SHA512 9a6f173835989f7562debfbadae0077d75e35bfad5be1f78931fe46ac43df20591162950b27e2c813fd857114f98247be28d357566e45e5d3ac6b60873d94466 EBUILD xorg-server-1.19.5-r1.ebuild 6484 BLAKE2B a8188fbf1974531bfb2aae98e7e43a2c66a70e02456f08e7daf04fdeb2a37d0445d0ab1857be0e560be716634d77c7ef18e932a510bd5c6b781ad5c72fa239bb SHA512 219dd0b969e99d1e96ce61b45c836be8be1050fd02eb7cdbdb42afa78973845df160c9b30bc034b4c15170dc4943775f72170b1a3eb487cd07b8b6c4788eb20d -EBUILD xorg-server-1.19.5-r2.ebuild 6586 BLAKE2B 6ff96f68d9abfebd6425397ad5e8f6ef230a76bc100bb9ae6f99b7ada0c41f9c6546fefbd3e90120080e0001e234357b44d3d62727ad3602f40f66954f2d01f2 SHA512 fd4054d86e9674e4c7e595cb743d3fd99f382d66e6b86e010843e1f5bedadc4290ce703e8b995dc179b548e6da05e4ef09cb4bd11875f255d1d58f7a749b13a1 +EBUILD xorg-server-1.19.5-r2.ebuild 6579 BLAKE2B 98c6ead1d974cad84f88423b17809b21573ef54170526f23e92a034a1ee6b36767523790e17dd7134eff74d89142b2a692d0fcf41c92393bc8db87ea51450eb5 SHA512 8d6762b1b200f58a732ddb9ff0c862a32623a8f449d4ef42eaaa3341e572518457362f045a22491467efc982e2bdaf19156b23f629fd54ff017f3c85ec98bd94 EBUILD xorg-server-1.19.99.904.ebuild 5793 BLAKE2B 76f42a062c63390d74d36576682786bfc090ba9d297b1aa0ed004f65a04bc6bc89f73a495ef521b973aa4a9b3c145b123a6b3b3c88c3a0c1b9fe92d1d27610ea SHA512 73089210bebaead51c05833149f14681bf37677aeec612757105902b49c85eb64dd08a2788faad2b2cc8bc26e79238596667051cafe3014acbcaa23be43833eb +EBUILD xorg-server-1.19.99.905.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2 EBUILD xorg-server-9999.ebuild 5553 BLAKE2B 2b29cb7d785839c40f1357671c07bf8ea2685862ac8375f36ba9888fabd27258745e54b6ef1b126098eda8e155415a816f73b9331881ff975b327216948489b6 SHA512 9d8f5af8959c2635d40b8c9bc75947a1c5765032751a2169fac84af529e82168d111856586b00447704bd46835e1a817527788460e4e8dee6d2d8c9fc0804b1e MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild index 4b366b21c800..528a7dc43d37 100644 --- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild @@ -9,7 +9,7 @@ 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" +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" diff --git a/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild new file mode 100644 index 000000000000..fc971faa6315 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2018 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}" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +fi + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" + +CDEPEND=">=app-eselect/eselect-opengl-1.3.0 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + >=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.89 + >=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 + ) + 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-base/xorg-proto-2018.3 + dmx? ( + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + )" + +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=( +) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.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." +} + +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 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) + $(use_enable systemd suid-wrapper) + $(use_enable !systemd install-setuid) + --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 +} |