From 09351e78166b5e864197c4456ebae3f89dd0bed9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Jan 2019 10:09:44 +0000 Subject: gentoo resync : 22.01.2019 --- x11-base/Manifest.gz | Bin 1053 -> 1048 bytes x11-base/xorg-drivers/Manifest | 3 +- x11-base/xorg-drivers/xorg-drivers-1.19.ebuild | 135 ------------- x11-base/xorg-drivers/xorg-drivers-1.20.ebuild | 4 +- x11-base/xorg-server/Manifest | 8 +- .../files/xorg-server-1.19.4-sysmacros.patch | 36 ---- ...t-pick-sRGB-config-for-32-bit-RGBA-visual.patch | 39 ---- x11-base/xorg-server/metadata.xml | 1 - x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 224 --------------------- x11-base/xorg-server/xorg-server-1.20.3.ebuild | 4 +- 10 files changed, 7 insertions(+), 447 deletions(-) delete mode 100644 x11-base/xorg-drivers/xorg-drivers-1.19.ebuild delete mode 100644 x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch delete mode 100644 x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch delete mode 100644 x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index eb6b77cb3e56..eb2a41e33302 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest index f0923c917771..977934b38007 100644 --- a/x11-base/xorg-drivers/Manifest +++ b/x11-base/xorg-drivers/Manifest @@ -1,4 +1,3 @@ -EBUILD xorg-drivers-1.19.ebuild 4918 BLAKE2B 75a6d1d4afb14ce58486cc262da6307dbd88a80916e575cbbfed83d4c6db247d50c97a8d81d33ba5c9f27441262bb8e80081df285a7198c17a0375471f68a884 SHA512 ed316c3aba6d8da1585833d838ee781726a5dd3daddcfe1471b90a6a865cce582174159edea117f54bfd8b46c87be77596848842c230a76da861ad5123ba0c4d -EBUILD xorg-drivers-1.20.ebuild 4801 BLAKE2B 4dab63c0a74c7a383f7ec7b5d87d68de84f4ef5638350e18815958bee4b8a040d7141ad1bf1605371987caed9c1208256d3f264b0c0470cef9353c33e6a865ce SHA512 6bbac0970d77ad3facac548c80524e965410baf8b0fa45527f3e6d2e4d09bad08c7ac9ce0d6f2985ce170e2a25fb150e44b231dce41940c17d30735d829abc88 +EBUILD xorg-drivers-1.20.ebuild 4800 BLAKE2B 25013cba2fb049dc27063e1b4c434faa8e27e5b3f59114dda01874350e7b8d0dd913fdb96aa8df8d18f1879d1b12094c9f17987c338f4d95035afb901d76ec0f SHA512 aedc3aa524dd51b92bbfcfb06bee8552467eda796ecebc4aa24cf4c5f97cd9551eabe2df967d8ddf5d94d346e1d95004a1158617bbd8b61eec7e286cc6c2c79d EBUILD xorg-drivers-9999.ebuild 4688 BLAKE2B a1b0c49cb6a2251dff00ef02551a8a88413bb1503b23dd90078c82857ee3ad4c76bd6754e2eb03956f7a8465ddec3e9c6be97ac464d22f8077786505da2aeb92 SHA512 cd411d892ab07626ab6f7de87eafc057385ebee38dfb3d3f18ff228f6deabf9d8f9eee361dfadab393a07837564486f15ebc29f6ead422bdf83e41d4fc701f1e MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild deleted file mode 100644 index 9f6935c15fd6..000000000000 --- a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Meta package containing deps on all xorg drivers" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -IUSE_INPUT_DEVICES=" - input_devices_elographics - input_devices_evdev - input_devices_joystick - input_devices_keyboard - input_devices_libinput - input_devices_mouse - input_devices_vmmouse - input_devices_void - input_devices_synaptics - input_devices_wacom -" -IUSE_VIDEO_CARDS=" - video_cards_amdgpu - video_cards_ast - video_cards_dummy - video_cards_fbdev - video_cards_freedreno - video_cards_geode - video_cards_glint - video_cards_i915 - video_cards_i965 - video_cards_intel - video_cards_mga - video_cards_newport - video_cards_nouveau - video_cards_nv - video_cards_omap - video_cards_qxl - video_cards_r128 - video_cards_radeon - video_cards_radeonsi - video_cards_siliconmotion - video_cards_tdfx - video_cards_tegra - video_cards_vesa - video_cards_via - video_cards_vc4 - video_cards_virtualbox - video_cards_vmware - video_cards_voodoo - video_cards_nvidia -" - -IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" - -PDEPEND=" - input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) - input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) - input_devices_libinput? ( x11-drivers/xf86-input-libinput ) - input_devices_mouse? ( x11-drivers/xf86-input-mouse ) - input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) - input_devices_void? ( x11-drivers/xf86-input-void ) - input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) - input_devices_wacom? ( x11-drivers/xf86-input-wacom ) - - video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu ) - video_cards_ast? ( x11-drivers/xf86-video-ast ) - video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) - video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( x11-drivers/xf86-video-glint ) - video_cards_i915? ( x11-drivers/xf86-video-intel ) - video_cards_i965? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_intel? ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_newport? ( x11-drivers/xf86-video-newport ) - video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_omap? ( x11-drivers/xf86-video-omap ) - video_cards_qxl? ( x11-drivers/xf86-video-qxl ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers ) - video_cards_r128? ( x11-drivers/xf86-video-r128 ) - video_cards_radeon? ( x11-drivers/xf86-video-ati ) - video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] ) - video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) - video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) - video_cards_tegra? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] ) - video_cards_vesa? ( x11-drivers/xf86-video-vesa ) - video_cards_via? ( x11-drivers/xf86-video-openchrome ) - video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) - video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) - - !x11-drivers/xf86-input-citron - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-ivtv - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-sunbw2 - - !<=x11-drivers/xf86-video-ark-0.7.5 - !<=x11-drivers/xf86-video-newport-0.2.4 - - ! -Date: Tue, 28 Nov 2017 09:23:29 +0200 -Subject: [PATCH] glx: do not pick sRGB config for 32-bit RGBA visual -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes blending issues seen with kwin and gnome-shell when -32bit visual has sRGB capability set. - -Reviewed-by: Adam Jackson -Signed-off-by: Tapani Pälli -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699 -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646 -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655 ---- - glx/glxscreens.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/glx/glxscreens.c b/glx/glxscreens.c -index 73444152a..596d972e0 100644 ---- a/glx/glxscreens.c -+++ b/glx/glxscreens.c -@@ -271,6 +271,11 @@ pickFBConfig(__GLXscreen * pGlxScreen, VisualPtr visual) - /* If it's the 32-bit RGBA visual, demand a 32-bit fbconfig. */ - if (visual->nplanes == 32 && config->rgbBits != 32) - continue; -+ /* If it's the 32-bit RGBA visual, do not pick sRGB capable config. -+ * This can cause issues with compositors that are not sRGB aware. -+ */ -+ if (visual->nplanes == 32 && config->sRGBCapable == GL_TRUE) -+ continue; - /* Can't use the same FBconfig for multiple X visuals. I think. */ - if (config->visualID != 0) - continue; --- -2.17.0 - diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index 8c8c243082ed..74e52195b253 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -9,7 +9,6 @@ Build the Distributed Multiheaded X server Enable Glamor OpenGL 2D acceleration Build the kdrive X servers - Build with tslib support for touchscreen devices Enable libunwind usage for backtraces Build Security extension Build the Xnest server 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 deleted file mode 100644 index 26685badc18e..000000000000 --- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# 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}" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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: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.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-base/xorg-proto - 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=( -# "${WORKDIR}/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 - "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 - "${FILESDIR}"/${PN}-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch #653688 -) - -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 -} diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild index 17a32edb7e32..45a9266a6104 100644 --- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ 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 ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -- cgit v1.2.3