diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /x11-base | |
parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) |
gentoo resync : 22.01.2019
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/Manifest.gz | bin | 1053 -> 1048 bytes | |||
-rw-r--r-- | x11-base/xorg-drivers/Manifest | 3 | ||||
-rw-r--r-- | x11-base/xorg-drivers/xorg-drivers-1.19.ebuild | 135 | ||||
-rw-r--r-- | x11-base/xorg-drivers/xorg-drivers-1.20.ebuild | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 8 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch | 36 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch | 39 | ||||
-rw-r--r-- | x11-base/xorg-server/metadata.xml | 1 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild | 224 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.3.ebuild | 4 |
10 files changed, 7 insertions, 447 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz Binary files differindex eb6b77cb3e56..eb2a41e33302 100644 --- a/x11-base/Manifest.gz +++ b/x11-base/Manifest.gz 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 - - !<x11-drivers/xf86-input-evdev-2.10.4 - !<x11-drivers/xf86-input-joystick-1.6.3 - !<x11-drivers/xf86-input-libinput-0.20.0 - !<x11-drivers/xf86-input-wacom-0.34.0 - !<x11-drivers/xf86-video-amdgpu-1.2.0 - !<x11-drivers/xf86-video-ati-7.8.0 - !<x11-drivers/xf86-video-chips-1.2.7 - !<x11-drivers/xf86-video-glint-1.2.9 - !<x11-drivers/xf86-video-i740-1.3.6 - !<x11-drivers/xf86-video-intel-2.99.917_p20160122 - !<x11-drivers/xf86-video-mga-1.6.5 - !<x11-drivers/xf86-video-nouveau-1.0.13 - !<x11-drivers/xf86-video-nv-2.1.21 - !<x11-drivers/xf86-video-omap-0.4.5 - !<x11-drivers/xf86-video-r128-6.10.2 - !<x11-drivers/xf86-video-savage-2.3.9 - !<x11-drivers/xf86-video-siliconmotion-1.7.9 - !<x11-drivers/xf86-video-sis-0.10.9 - !<x11-drivers/xf86-video-sisusb-0.9.7 - !<x11-drivers/xf86-video-sunleo-1.2.2 - !<x11-drivers/xf86-video-tdfx-1.4.7 - !<x11-drivers/xf86-video-trident-1.3.8 - !<x11-drivers/xf86-video-vmware-13.2.1 -" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild index 9bc5e23cf767..f3be4b3055c7 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-1.20.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=7 @@ -9,7 +9,7 @@ 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" +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 diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 9d310769cc7c..c3a79a302d31 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -3,12 +3,8 @@ AUX xdm.confd-4 573 BLAKE2B 0c2a282acc851b95f925715c31915be469ef3758bbaa800d5fc5 AUX xdm.initd-11 6021 BLAKE2B 75b0ae0adb0a96324d6cd7be98686e3806ea87dada2cdd8ecb128e59e18add456a55ecd30080ab9ff5fb96ae972c05625913a333b5e42a7c8fed19ed8698f154 SHA512 c599d41e2476239ee3ba704ca2493f2d976c5de660ca05393580ca6387eba91156a00a1aa919da2b0d4a5f943eb858f801dc8d3cd907d1abd487fe4fe69bd321 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 -AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168 -AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch 1555 BLAKE2B ef0a52b2341939f254bdce6b705f0591d0888c8043e5c0da1c4c4e97cdac632c56b27392ac2d7ac63653c7dfe1d381edd619a5e0c1c78f3bf255348c99c30f24 SHA512 66cd27608019557029f15aa81cf1a067e124ec0f854af9e732fef8b12bade4f1797481c86de2437b63ec5364fbeb1e3e05a39aa08df71ad08df79cd7d244e280 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.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba -EBUILD xorg-server-1.19.5-r2.ebuild 5766 BLAKE2B 87a961606f85b4c83d9eaebc9cac3ab8d650bf27a204a74f847459996c6cd51c28b94f5ee91bcee549e06a07aa260bf132609a60be733ddc5b51759d111aef4b SHA512 d63b8c99b046240476c93559fb9b672f0214db117c82e05130413b1751e57a43babdc366c7ec9ff0d9db9d08a3b1aa7493da7a6e3e9a73d531722374067b6dd6 -EBUILD xorg-server-1.20.3.ebuild 5682 BLAKE2B b29f9c2022b27289aa7440483904b2fa8f4f28538d7bec3c55f40bf530edc3959073cc687f4b3f1bea92925ebb1ca4722ea894658e66db5722b0c2b7d570d524 SHA512 f06a707df40b90623cb6335c3e4d31b94518f9a022c90a530bd811c0dd9379c5b90e917a7cab012d453471deebdab407ecb05a6a209c8cd3425d041bcb78471e +EBUILD xorg-server-1.20.3.ebuild 5681 BLAKE2B a1088fde11b98f2b99ed3285b1227faf6f43b0e7c4d962027cbfeb2dbb2993323e975a4961c329c000c694243a6bb566f7a91c0932a678bcb85046a3b55d0976 SHA512 4631c5cc8b66959b00f550d7492eb3be466178b032083d393cd4dd69410e53d8535760f522a13b44ede8c488ce477c8159d2dc04629f51584890944cf66edf26 EBUILD xorg-server-9999.ebuild 5692 BLAKE2B 9c1e868d44693b9ceaa5d2f51711c162d8b4c1d3d1b4fcaffc005d0d4fa341a86b293bdbb4a0d9d9a0349dafe4da138fefdca8528af2f4dfb8c09d3954dfb1b8 SHA512 48d73f4bc95aaf354fbd36171c419d1c919ab46b21002271d94b8a3e2993764e08199b5062fd534b85102a4d5122d8512792340c37da0dcd1ce033119dd8d636 -MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac +MISC metadata.xml 858 BLAKE2B 0264739bcd577241b649d094bf9252fa46350ecf27f2685586b3d20f8d85656729c224483dc09ac2f6abcdf0c1e2a2fd67aa5c86e02cdf754becb5cb5d5080a0 SHA512 12f4a444557ad2deb04e230c6b52faacd5d670184e928f89f949411cc3888b1a97aae88589381ca75d2b7e1c88f1b5f30e2256a700fd00ba145c87f21a701edd diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch deleted file mode 100644 index 8a3cb7692922..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Wed, 11 Oct 2017 16:11:49 +0300 -Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor - functions for new glibc - -Commits d732c36597fa and 84e3b96b5313 added the include to some files, but -missed config/udev.c, where the major and minor functions are used as well. -This should be Linux-only, so we don't need the sys/mkdev.h case here for -Solaris. - -Signed-off-by: Mart Raudsepp <leio@gentoo.org> ---- -https://bugs.gentoo.org/633530 -https://patchwork.freedesktop.org/patch/181800/ - - config/udev.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/config/udev.c b/config/udev.c -index 932f230..b3b8d0f 100644 ---- a/config/udev.c -+++ b/config/udev.c -@@ -30,6 +30,9 @@ - #include <libudev.h> - #include <ctype.h> - #include <unistd.h> -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> -+#endif - - #include "input.h" - #include "inputstr.h" --- -2.10.2 - diff --git a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch b/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch deleted file mode 100644 index d7e5e511e5d7..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c2954b16c8730c7ed8441fd8dba25900f3aed265 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com> -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 <ajax@redhat.com> -Signed-off-by: Tapani Pälli <tapani.palli@intel.com> -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 @@ <flag name="dmx">Build the Distributed Multiheaded X server</flag> <flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag> <flag name="kdrive">Build the kdrive X servers</flag> - <flag name="tslib">Build with tslib support for touchscreen devices</flag> <flag name="unwind">Enable libunwind usage for backtraces</flag> <flag name="xcsecurity">Build Security extension</flag> <flag name="xnest">Build the Xnest server</flag> 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" |