From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- x11-base/Manifest.gz | Bin 1049 -> 1047 bytes x11-base/xcb-proto/Manifest | 2 +- x11-base/xcb-proto/xcb-proto-1.13.ebuild | 4 +- x11-base/xorg-drivers/Manifest | 4 +- x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild | 2 +- x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 2 - x11-base/xorg-proto/Manifest | 2 +- x11-base/xorg-proto/xorg-proto-2019.2.ebuild | 2 +- x11-base/xorg-server/Manifest | 7 +- ...ck-the-shm-dir-at-run-time-not-build-time.patch | 174 --------------- ...1.20.4-shm-Use-memfd_create-when-possible.patch | 89 -------- ...ndent-shm_tmpfile-to-follow-our-standards.patch | 72 ------- x11-base/xorg-server/xorg-server-1.20.5.ebuild | 236 --------------------- x11-base/xorg-server/xorg-server-9999.ebuild | 1 - x11-base/xorg-x11/Manifest | 4 +- x11-base/xorg-x11/metadata.xml | 1 - x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild | 2 +- 17 files changed, 12 insertions(+), 592 deletions(-) delete mode 100644 x11-base/xorg-server/files/xorg-server-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch delete mode 100644 x11-base/xorg-server/files/xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch delete mode 100644 x11-base/xorg-server/files/xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch delete mode 100644 x11-base/xorg-server/xorg-server-1.20.5.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index e6225bb6b7b3..a0a1a61c8c15 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest index f6198e6cbf84..6b8bcb04b6f7 100644 --- a/x11-base/xcb-proto/Manifest +++ b/x11-base/xcb-proto/Manifest @@ -1,3 +1,3 @@ DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 -EBUILD xcb-proto-1.13.ebuild 1573 BLAKE2B 2ca0855a4837db2325f7bb73a928ff32c4471f87df4c1f81d2c243a364292cb9080f0ad006aa1f77c9c4004b30619880e54dae14dea2ce52f4a3854b2d97a43a SHA512 efb0617aa9302233a90a93749e3f8c9e70925ad19f84bf9f01aba506742b737eba47328610cacc8f824eb8747f346c9363af56d411464af934e6673024e5af44 +EBUILD xcb-proto-1.13.ebuild 1570 BLAKE2B 9815944c3f934a4f1a8730e2c0c42f729b3c26cfc9df4715b8fdb0919b2d7318874f1f783359fba913091834beadfbdba521304fa008f3a0e6b9772403b636c8 SHA512 fa52928d5a7a2565c7049fc232bf8890ea28e8fe3fbbe4786c600c35ad7b2968829fffd7ecafafce457e6ff7fc9c2d82eec3cd560a38655ace8b2819895db6a4 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild index e39be24f18b9..04f6f40a17fb 100644 --- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) XORG_MULTILIB=yes XORG_STATIC=no @@ -15,7 +15,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" [[ ${PV} != 9999* ]] && \ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="${PYTHON_DEPS}" diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest index 540fb1d78db3..45b586046d7c 100644 --- a/x11-base/xorg-drivers/Manifest +++ b/x11-base/xorg-drivers/Manifest @@ -1,3 +1,3 @@ -EBUILD xorg-drivers-1.20-r1.ebuild 3748 BLAKE2B aebf43b92d1af28596670133bfb920232c1549aad5cd83008064bfdcb683b15593339f95a5f0914d0d4c61978696b89b5004377587052f38d32eef7a2833e153 SHA512 d9ece25de96baba65ad32318f968d9dbdb0b104f5d465c3a9cffcf3f9a62e17cb4392f9da606a4a9bc285aa2c89c39936db6d8e8cd4433a8e6233da502c6acab -EBUILD xorg-drivers-9999.ebuild 3759 BLAKE2B aa9fde534298896f69f507d23d823a6f360b5be7a5a9a0f8036f36d0dc82385cb8e0fd178d764e21c7b7e6fc26f06347d58d07509beac30cefe5d6aed8fe61b9 SHA512 4d626b5eefd15b282f482cfe6faf3fb859a36ddf4cf07046c0309c4468f409e60411bef9004e66c6a20a40df4b992eaa04b471816d275f9fb3ae06e5a927357c +EBUILD xorg-drivers-1.20-r1.ebuild 3749 BLAKE2B 2eeecec76bd0f61174ee2675ef8af0084455be2149060fc9816f1a6ea257b93fa5518475d49115828ec2f77d89e25d479823957e5c405030ec24691218abb4db SHA512 742a2b37e30cc7074fe982fc940ccbca255b74a3aea2de5534b68217ea52cc0c6cead685e858e84e730d488bb240e8bf6b71db189b102c1fab54b2fa2e006a26 +EBUILD xorg-drivers-9999.ebuild 3719 BLAKE2B 8e804d42317f788126fa2655deb97c8a24c511149fd75dcd287e187b2ff2e5409f49a699885eafceccd14bc9abcdd8eac09da9d09a1df3b6d0c57bbecf72301f SHA512 fd8155407c7cd1b1cc2a3b22d2afbc8f24673cbcf65d3cfc49dbf4a1c2e078d3561a3e79c4be5fc9b84cdc75094dc0cd0d2cfbdc2fff1616ef13b076ed4db6db MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild index e5d78880b513..19e9a8de71d0 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" if [[ ${PV} != 9999 ]]; then - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" fi IUSE_INPUT_DEVICES=" diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild index b31b55197500..3700144ad18a 100644 --- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -94,6 +94,4 @@ PDEPEND=" video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) - - ! -Date: Wed, 19 Sep 2018 13:28:06 -0700 -Subject: [PATCH xserver] shm: Pick the shm dir at run time, not build time. - -Prodding the builder's filesystem for tmp dirs doesn't necessarily -tell you anything about what the actual host's filesystem is going to -look like, so we should just try the dirs at runtime. - -Signed-off-by: Eric Anholt ---- - Xext/shm.c | 48 +++++++++++++++++++++++++---------------- - configure.ac | 43 ------------------------------------ - include/dix-config.h.in | 3 --- - include/meson.build | 5 ----- - 4 files changed, 29 insertions(+), 70 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index ed43b9202..2739a59e7 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -1194,36 +1194,46 @@ ProcShmAttachFd(ClientPtr client) - static int - shm_tmpfile(void) - { --#ifdef SHMDIR -+ const char *shmdirs[] = { -+ "/run/shm", -+ "/var/tmp", -+ "/tmp", -+ }; - int fd; -- char template[] = SHMDIR "/shmfd-XXXXXX"; -+ - #ifdef O_TMPFILE -- fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); -- if (fd >= 0) { -- DebugF ("Using O_TMPFILE\n"); -- return fd; -+ for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) { -+ fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); -+ if (fd >= 0) { -+ DebugF ("Using O_TMPFILE\n"); -+ return fd; -+ } - } - ErrorF ("Not using O_TMPFILE\n"); - #endif -+ -+ for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) { -+ char template[PATH_MAX]; -+ snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XXXXXX", shmdirs[i]); - #ifdef HAVE_MKOSTEMP -- fd = mkostemp(template, O_CLOEXEC); -+ fd = mkostemp(template, O_CLOEXEC); - #else -- fd = mkstemp(template); -+ fd = mkstemp(template); - #endif -- if (fd < 0) -- return -1; -- unlink(template); -+ if (fd < 0) -+ continue; -+ unlink(template); - #ifndef HAVE_MKOSTEMP -- int flags = fcntl(fd, F_GETFD); -- if (flags != -1) { -- flags |= FD_CLOEXEC; -- (void) fcntl(fd, F_SETFD, &flags); -- } -+ int flags = fcntl(fd, F_GETFD); -+ if (flags != -1) { -+ flags |= FD_CLOEXEC; -+ (void) fcntl(fd, F_SETFD, &flags); -+ } - #endif -- return fd; --#else -+ return fd; -+ } -+ - return -1; --#endif - } - - static int -diff --git a/configure.ac b/configure.ac -index 359b62cb5..57a233102 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1115,49 +1115,6 @@ case "$DRI2,$HAVE_DRI2PROTO" in - esac - AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) - --dnl --dnl Locate a suitable tmp file system for creating shared memeory files --dnl -- --AC_ARG_WITH(shared-memory-dir, AS_HELP_STRING([--with-shared-memory-dir=PATH], [Path to directory in a world-writable temporary directory for anonymous shared memory (default: auto)]), --[], --[with_shared_memory_dir=yes]) -- --shmdirs="/run/shm /var/tmp /tmp" -- --case x"$with_shared_memory_dir" in --xyes) -- for dir in $shmdirs; do -- case x"$with_shared_memory_dir" in -- xyes) -- echo Checking temp dir "$dir" -- if test -d "$dir"; then -- with_shared_memory_dir="$dir" -- fi -- ;; -- esac -- done -- ;; --x/*) -- ;; --xno) -- ;; --*) -- AC_MSG_ERROR([Invalid directory specified for --with-shared-memory-dir: $with_shared_memory_dir]) -- ;; --esac -- --case x"$with_shared_memory_dir" in --xyes) -- AC_MSG_ERROR([No directory found for shared memory temp files.]) -- ;; --xno) -- ;; --*) -- AC_DEFINE_UNQUOTED(SHMDIR, ["$with_shared_memory_dir"], [Directory for shared memory temp files]) -- ;; --esac -- - AC_ARG_ENABLE(xtrans-send-fds, AS_HELP_STRING([--disable-xtrans-send-fds], [Use Xtrans support for fd passing (default: auto)]), [XTRANS_SEND_FDS=$enableval], [XTRANS_SEND_FDS=auto]) - - case "x$XTRANS_SEND_FDS" in -diff --git a/include/dix-config.h.in b/include/dix-config.h.in -index f8df86608..3bd22b8bb 100644 ---- a/include/dix-config.h.in -+++ b/include/dix-config.h.in -@@ -452,9 +452,6 @@ - /* Wrap SIGBUS to catch MIT-SHM faults */ - #undef BUSFAULT - --/* Directory for shared memory temp files */ --#undef SHMDIR -- - /* Don't let Xdefs.h define 'pointer' */ - #define _XTYPEDEF_POINTER 1 - -diff --git a/include/meson.build b/include/meson.build -index 4a0c12f5a..04c41e999 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -91,11 +91,6 @@ conf_data.set('SYSTEMD_LOGIND', build_systemd_logind) - conf_data.set('NEED_DBUS', build_systemd_logind or build_hal) - conf_data.set('CONFIG_WSCONS', host_machine.system() == 'openbsd') - --# XXX: SHMDIR is weird in autoconf, probing the build system for --# various tmp directories. Could we replace it with C code at runtime --# that just uses whatever directory works? --conf_data.set_quoted('SHMDIR', '/tmp') -- - conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found()) - conf_data.set('WITH_LIBDRM', libdrm_dep.found()) - conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF', --- -2.19.2 - diff --git a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch deleted file mode 100644 index fce25944537f..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch +++ /dev/null @@ -1,89 +0,0 @@ -From f6753c117ef0f83499d5e2d6dda226fec9ddf803 Mon Sep 17 00:00:00 2001 -From: Alexander Volkov -Date: Mon, 11 Feb 2019 18:54:10 +0300 -Subject: [PATCH xserver] shm: Use memfd_create when possible - -It doesn't require shared memory dir and thus allows -to avoid cases when this dir is detected incorrectly, -as in https://bugreports.qt.io/browse/QTBUG-71440 - -Signed-off-by: Alexander Volkov ---- - Xext/shm.c | 12 ++++++++++++ - configure.ac | 2 +- - include/dix-config.h.in | 3 +++ - include/meson.build | 1 + - 4 files changed, 17 insertions(+), 1 deletion(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index 2739a59e7..506fd4df1 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -35,6 +35,9 @@ in this Software without prior written authorization from The Open Group. - #include - #include - #include -+#ifdef HAVE_MEMFD_CREATE -+#include -+#endif - #include - #include - #include -@@ -1201,6 +1204,15 @@ shm_tmpfile(void) - }; - int fd; - -+#ifdef HAVE_MEMFD_CREATE -+ fd = memfd_create("xorg", MFD_CLOEXEC|MFD_ALLOW_SEALING); -+ if (fd != -1) { -+ fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK); -+ DebugF ("Using memfd_create\n"); -+ return fd; -+ } -+#endif -+ - #ifdef O_TMPFILE - for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) { - fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); -diff --git a/configure.ac b/configure.ac -index 0ca96aeb8..79ff7fa64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -159,7 +159,7 @@ dnl Checks for library functions. - AC_CHECK_FUNCS([backtrace geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ -- walkcontext setitimer poll epoll_create1 mkostemp]) -+ walkcontext setitimer poll epoll_create1 mkostemp memfd_create]) - AC_CONFIG_LIBOBJ_DIR([os]) - AC_REPLACE_FUNCS([reallocarray strcasecmp strcasestr strlcat strlcpy strndup\ - timingsafe_memcmp]) -diff --git a/include/dix-config.h.in b/include/dix-config.h.in -index 855b3d50c..9eb1a924e 100644 ---- a/include/dix-config.h.in -+++ b/include/dix-config.h.in -@@ -128,6 +128,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LINUX_FB_H - -+/* Define to 1 if you have the `memfd_create' function. */ -+#undef HAVE_MEMFD_CREATE -+ - /* Define to 1 if you have the `mkostemp' function. */ - #undef HAVE_MKOSTEMP - -diff --git a/include/meson.build b/include/meson.build -index 04c41e999..bbd5a6690 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -141,6 +141,7 @@ conf_data.set('HAVE_GETPEEREID', cc.has_function('getpeereid')) - conf_data.set('HAVE_GETPEERUCRED', cc.has_function('getpeerucred')) - conf_data.set('HAVE_GETPROGNAME', cc.has_function('getprogname')) - conf_data.set('HAVE_GETZONEID', cc.has_function('getzoneid')) -+conf_data.set('HAVE_MEMFD_CREATE', cc.has_function('memfd_create')) - conf_data.set('HAVE_MKOSTEMP', cc.has_function('mkostemp')) - conf_data.set('HAVE_MMAP', cc.has_function('mmap')) - conf_data.set('HAVE_POLL', cc.has_function('poll')) --- -2.19.2 - diff --git a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch b/x11-base/xorg-server/files/xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch deleted file mode 100644 index 1ce9e1307943..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 804a9b4f57107fa2d0ed1ae0becda5bebaffe6e1 Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Wed, 19 Sep 2018 13:20:12 -0700 -Subject: [PATCH xserver] shm: reindent shm_tmpfile to follow our standards. - -Signed-off-by: Eric Anholt ---- - Xext/shm.c | 40 ++++++++++++++++++++-------------------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index 589ed0b4d..ed43b9202 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -1195,34 +1195,34 @@ static int - shm_tmpfile(void) - { - #ifdef SHMDIR -- int fd; -- char template[] = SHMDIR "/shmfd-XXXXXX"; -+ int fd; -+ char template[] = SHMDIR "/shmfd-XXXXXX"; - #ifdef O_TMPFILE -- fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); -- if (fd >= 0) { -- DebugF ("Using O_TMPFILE\n"); -- return fd; -- } -- ErrorF ("Not using O_TMPFILE\n"); -+ fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); -+ if (fd >= 0) { -+ DebugF ("Using O_TMPFILE\n"); -+ return fd; -+ } -+ ErrorF ("Not using O_TMPFILE\n"); - #endif - #ifdef HAVE_MKOSTEMP -- fd = mkostemp(template, O_CLOEXEC); -+ fd = mkostemp(template, O_CLOEXEC); - #else -- fd = mkstemp(template); -+ fd = mkstemp(template); - #endif -- if (fd < 0) -- return -1; -- unlink(template); -+ if (fd < 0) -+ return -1; -+ unlink(template); - #ifndef HAVE_MKOSTEMP -- int flags = fcntl(fd, F_GETFD); -- if (flags != -1) { -- flags |= FD_CLOEXEC; -- (void) fcntl(fd, F_SETFD, &flags); -- } -+ int flags = fcntl(fd, F_GETFD); -+ if (flags != -1) { -+ flags |= FD_CLOEXEC; -+ (void) fcntl(fd, F_SETFD, &flags); -+ } - #endif -- return fd; -+ return fd; - #else -- return -1; -+ return -1; - #endif - } - --- -2.19.2 - diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild deleted file mode 100644 index 8f859c2eaf57..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_EAUTORECONF="yes" -inherit xorg-3 multilib flag-o-matic -EGIT_REPO_URI="https://gitlab.freedesktop.org/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-linux ~x86-linux" -fi - -IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" - -CDEPEND="libglvnd? ( - media-libs/libglvnd - !app-eselect/eselect-opengl - ) - !libglvnd? ( >=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 - ) - 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-18[X(+),egl,gbm] - media-libs/libepoxy[X,egl(+)] - ) - udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - media-libs/libepoxy[egl(+)] - >=dev-libs/wayland-protocols-1.1 - ) - >=x11-apps/xinit-1.3.3-r1 - systemd? ( - sys-apps/dbus - sys-apps/systemd - ) - elogind? ( - sys-apps/dbus - sys-auth/elogind - sys-auth/pambase[elogind] - ) - " - -DEPEND="${CDEPEND} - sys-devel/flex - >=x11-base/xorg-proto-2018.4 - 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-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd ) - minimal? ( !wayland ) - xephyr? ( kdrive )" - -UPSTREAMED_PATCHES=( - "${FILESDIR}"/${PN}-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch - "${FILESDIR}"/${PN}-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch - "${FILESDIR}"/${PN}-1.20.4-shm-Use-memfd_create-when-possible.patch -) - -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_setup() { - if use wayland && use minimal; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - ewarn "Build with USE=-minimal to enable glamor." - fi - - # 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 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 dri3) - $(use_enable !minimal glamor) - $(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) - $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') - $(use_with systemd systemd-daemon) - $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') - $(usex suid $(use_enable !systemd install-setuid) '--disable-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 - ) -} - -src_prepare() { - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - default - eautoreconf -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/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 - - find "${ED}"/var -type d -empty -delete || die -} - -pkg_postinst() { - if ! use minimal; then - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - if ! use libglvnd; then - eselect opengl set xorg-x11 --use-old - fi - fi -} - -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-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 061fe06600d4..d15e74b78b8d 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -104,7 +104,6 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-xserver ) - !x11-drivers/xf86-video-modesetting " PDEPEND=" diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 82b9227a306e..dec47a3c3b69 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,2 +1,2 @@ -EBUILD xorg-x11-7.4-r3.ebuild 3317 BLAKE2B 741edf393b2b23f182fdd749639814f849fcb3c2507a1c316ac8698093a848ca3cc0ef69de4215d98562429bbf9616883aa6ca1b44c8881c942d7fd8616ced55 SHA512 00950b04a2c10f304f15cc13ac01020b07b3ac7210a0a1150f4f57c0d62ef187c3503413bab9736d16f04a635fa6d7388d05779d0f80ba9d4929a26fb1e21dd0 -MISC metadata.xml 369 BLAKE2B 36a4c5573e4280020ac40830cae3056197c2eda56c3161265c163a82d18337da4a2efbfaf7dbd08c76f6231c40a19669e1785b84ce6c89ab5bbc2fbb9b2a1970 SHA512 d0aadbeb8260987c487e28e74ec895b5012c23b8422a12d629444ee54afbe8c266ccba1286e5b1b21366a97b4255ae8724148dcf58eefc3e966fdb382e11d467 +EBUILD xorg-x11-7.4-r3.ebuild 3318 BLAKE2B 0cd50ba794d03cfe11a717b437932c224668ccd5f27b6004eba05b1544f82f73e0e00787682ddceaac0d227f6a8cb46377d8f5cf92fba747358e42ef8e1f0bca SHA512 f81675e86bdbd719e65597fc6873021211b220b5420b59d32d873d404a1c7afb49b30aff8f618089b7b1cf62a81d7f9e5e0d866673962c8461662908bd721500 +MISC metadata.xml 295 BLAKE2B bf8cdcd84763dacb5bc31355ca5050d30c6808e4aff370c709f07269cf4c3e62a1e107350cf5e6a9cbf0d0ca1ad2e3b57393674595e44dc023b0320dd6f32e47 SHA512 66ad6bd339be8ab149a01cf9039eea3ef06058de715c700ba5e1f511c957ef71ffded1209dab1594f7c899db0d77876bcfec48ba0d43a296704fb8dc33946be7 diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml index a0d9b5f6d24d..dfdafac06170 100644 --- a/x11-base/xorg-x11/metadata.xml +++ b/x11-base/xorg-x11/metadata.xml @@ -5,7 +5,6 @@ x11@gentoo.org X11 -X11 implementation by X.Org Foundation Install fonts from X.Org diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild index 0e11f2cf8f4e..d6c4f92de38f 100644 --- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/" LICENSE="metapackage" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86" IUSE="+fonts" # Server -- cgit v1.2.3