From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- x11-base/xorg-server/Manifest | 7 +- .../files/xorg-server-21.1.1-DPI-revert.patch | 133 +++++++++++++++ x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild | 2 +- x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild | 180 +++++++++++++++++++++ x11-base/xorg-server/xorg-server-9999.ebuild | 34 ++-- 5 files changed, 339 insertions(+), 17 deletions(-) create mode 100644 x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch create mode 100644 x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild (limited to 'x11-base/xorg-server') diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index da0f48fd4308..7c19f6e3e982 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,7 +1,10 @@ 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-21.1.1-DPI-revert.patch 5333 BLAKE2B 65a32a38bc08660d0b77c3d95a0ffdf36945a46d873f908e16aa93fdc2f48cdcbbd06ec754077d3690be1b17707da8f4bc4fbdb4e833281167769d4453487535 SHA512 20dfdd57e6038aac931ac4b3cc322dcfb594a9ba8b58786e95c442891ec4f12c16b238672dc41983eb68c0ad0f7be4c0bf5479d99b9f64f8f7a9578250f48c1d AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 -EBUILD xorg-server-1.20.13-r1.ebuild 5255 BLAKE2B 3b300201176f3d0a83991d48ac1a33aec5f68f25db717ab23bebed74b2c8402385508bf0f6dcfac86158970149ade4f815218d86141ba6582d9c269bf53ce1ff SHA512 794b98725fe94e07f133f42aaf757887881f4a5fb37d8a0a92f77ee7dcbff31d041af380898982dab2996749aa65c399c434d2eaa6f59a68b6d952abfe97e0f0 -EBUILD xorg-server-9999.ebuild 4222 BLAKE2B 44ea47cbcb8f1e0d9f94c95b9f5809fe71726e342412dfd674b7de71295e0ca8334399e8616c3c9789abdc6b6f9a3880abbb1430460f1680990b207acd1131d4 SHA512 574fddb0803dd75730c80d81b73ba711098fd4fa28546ac83ca4a8e2cb821ffa32ab2a35900315a5a6631d018d7e592b486a429aca4d935e9108c7962a87624f +DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d +EBUILD xorg-server-1.20.13-r1.ebuild 5233 BLAKE2B ba5938c842d7c4688907b62de72e7f8aeacd1657f3e0dff6de81fb6d3eb234f7c1a6e628d29d332fbfa2809f90e19bfdef9a66d34f6fe0ce478352fbbabb54f5 SHA512 17de9e4c9a8639a750210eeb5c751fd365a088d9e4aefb5b80447d0a6246a8d5312e36ee26d612bcefc4492d2d16d8136e969db443a8ec00f7d95c7b03c3d123 +EBUILD xorg-server-21.1.1-r2.ebuild 4382 BLAKE2B 856d6fd11d78ef9421ee8bb55ee1100cf61b1f6750983f6719f673b12f4f8205f344d481b0b245840ced1eb0121e01cc5d0c69af52fbb0d7f4e1775e750fbe4e SHA512 734cadb72e5a28fc818f10e7563a7c311a092cd7658d29f60579d7d626b5fe09720771324d6e49cd0bc64b0b63152175e7941e19beba5c6b5a4a73deb4b31cd0 +EBUILD xorg-server-9999.ebuild 4364 BLAKE2B 5046f3e7a18c3a641800aba984219f35b35b1f09b2a500b40682665ae4001756e5ec8820b704d05c80b3b57212e7de0478edd731d4b9aafbba0868b90b13421b SHA512 9589abe381e82610c0f9865d0c025f5764c08d659dea94c41e14f251d05d0ae314c54360fafe57ba235f64a337521050570aadc29ed204ab4d302d454e94e3f8 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch b/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch new file mode 100644 index 000000000000..89d8e2653a28 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch @@ -0,0 +1,133 @@ +https://gitlab.freedesktop.org/xorg/xserver/-/commit/35af1299e73483eaf93d913a960e1d1738bc7de6 + +From: Povilas Kanapickas +Date: Sat, 13 Nov 2021 17:23:54 +0200 +Subject: [PATCH] Revert "hw/xfree86: Propagate physical dimensions from DRM + connector" + +Quite a lot of applications currently expect the screen DPI exposed by +the X server to be 96 even when the real display DPI is different. +Additionally, currently Xwayland completely ignores any hardware +information and sets the DPI to 96. Accordingly the new behavior, even +if it fixes a bug, should not be enabled automatically to all users. + +A better solution would be to make the default DPI stay as is and enable +the correct behavior with a command line option (maybe -dpi auto, or +similar). For now let's just revert the bug fix. + +This reverts commit 05b3c681ea2f478c0cb941c2f8279919cf78de6d. + +Signed-off-by: Povilas Kanapickas +--- a/hw/xfree86/common/xf86Helper.c ++++ b/hw/xfree86/common/xf86Helper.c +@@ -55,7 +55,6 @@ + #include "xf86Xinput.h" + #include "xf86InPriv.h" + #include "mivalidate.h" +-#include "xf86Crtc.h" + + /* For xf86GetClocks */ + #if defined(CSRG_BASED) || defined(__GNU__) +@@ -852,9 +851,8 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + { + MessageType from = X_DEFAULT; + xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC); +- int probedWidthmm, probedHeightmm; ++ int ddcWidthmm, ddcHeightmm; + int widthErr, heightErr; +- xf86OutputPtr compat = xf86CompatOutput(pScrn); + + /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */ + pScrn->widthmm = pScrn->monitor->widthmm; +@@ -864,15 +862,11 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + /* DDC gives display size in mm for individual modes, + * but cm for monitor + */ +- probedWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */ +- probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */ +- } +- else if (compat && compat->mm_width > 0 && compat->mm_height > 0) { +- probedWidthmm = compat->mm_width; +- probedHeightmm = compat->mm_height; ++ ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */ ++ ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */ + } + else { +- probedWidthmm = probedHeightmm = 0; ++ ddcWidthmm = ddcHeightmm = 0; + } + + if (monitorResolution > 0) { +@@ -898,15 +892,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + pScrn->widthmm, pScrn->heightmm); + + /* Warn if config and probe disagree about display size */ +- if (probedWidthmm && probedHeightmm) { ++ if (ddcWidthmm && ddcHeightmm) { + if (pScrn->widthmm > 0) { +- widthErr = abs(probedWidthmm - pScrn->widthmm); ++ widthErr = abs(ddcWidthmm - pScrn->widthmm); + } + else { + widthErr = 0; + } + if (pScrn->heightmm > 0) { +- heightErr = abs(probedHeightmm - pScrn->heightmm); ++ heightErr = abs(ddcHeightmm - pScrn->heightmm); + } + else { + heightErr = 0; +@@ -915,17 +909,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + /* Should include config file name for monitor here */ + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n", +- probedWidthmm, probedHeightmm, pScrn->widthmm, ++ ddcWidthmm, ddcHeightmm, pScrn->widthmm, + pScrn->heightmm); + } + } + } +- else if (probedWidthmm && probedHeightmm) { ++ else if (ddcWidthmm && ddcHeightmm) { + from = X_PROBED; + xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n", +- probedWidthmm, probedHeightmm); +- pScrn->widthmm = probedWidthmm; +- pScrn->heightmm = probedHeightmm; ++ ddcWidthmm, ddcHeightmm); ++ pScrn->widthmm = ddcWidthmm; ++ pScrn->heightmm = ddcHeightmm; + if (pScrn->widthmm > 0) { + pScrn->xDpi = + (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm); +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -3256,10 +3256,8 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon) + free(output->MonInfo); + + output->MonInfo = edid_mon; +- if (edid_mon) { +- output->mm_width = 0; +- output->mm_height = 0; +- } ++ output->mm_width = 0; ++ output->mm_height = 0; + + if (debug_modes) { + xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n", +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -806,12 +806,6 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen) + mmWidth = output->conf_monitor->mon_width; + mmHeight = output->conf_monitor->mon_height; + } +- else if (output && +- (output->mm_width > 0 && +- output->mm_height > 0)) { +- mmWidth = output->mm_width; +- mmHeight = output->mm_height; +- } + else { + /* + * Otherwise, just set the screen to DEFAULT_DPI +GitLab diff --git a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild index d6d1f45f1b26..70f50b24ca30 100644 --- a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 multilib flag-o-matic toolchain-funcs +inherit xorg-3 toolchain-funcs EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" diff --git a/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild new file mode 100644 index 000000000000..9e885eb74813 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit xorg-3 meson +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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + dev-libs/openssl: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/libxcvt-0.1.0 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + >=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-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind ) + >=x11-apps/xinit-1.3.3-r1 + selinux? ( sys-libs/libselinux ) + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind[pam] + sys-auth/pambase[elogind] + ) + !!x11-drivers/nvidia-drivers[-libglvnd(+)] +" +DEPEND="${CDEPEND} + >=x11-base/xorg-proto-2021.4.99.2 + >=x11-libs/xtrans-1.3.5 + doc? ( + x11-base/xorg-sgml-doctools + ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) +" +BDEPEND=" + sys-devel/flex +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd )" + +UPSTREAMED_PATCHES=( + "${FILESDIR}"/${P}-DPI-revert.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 +) + +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 + + local emesonargs=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use doc docs) + $(meson_use !minimal dri1) + $(meson_use !minimal dri2) + $(meson_use !minimal dri3) + $(meson_use !minimal glamor) + $(meson_use !minimal glx) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + -Ddefault_font_path="${EPREFIX}"/usr/share/fonts + -Ddrm=true + -Ddtrace=false + -Dipv6=true + -Dhal=false + -Dlinux_acpi=false + -Dlinux_apm=false + -Dsha1=libcrypto + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + ) + + if use systemd || use elogind; then + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) + ) + else + emesonargs+=( + -Dsystemd_logind=false + $(meson_use suid suid_wrapper) + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + #The new meson build system do not leave X symlink + ln -s Xorg "${ED}"/usr/bin/X + + if ! use xorg; then + rm -f "${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 || die + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +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 +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 27d63ee09fb5..2fb9a72911bc 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -5,9 +5,9 @@ EAPI=7 XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" inherit xorg-3 meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" -XORG_EAUTORECONF="no" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" @@ -16,7 +16,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" RESTRICT="!test? ( test )" CDEPEND=" @@ -56,6 +56,7 @@ CDEPEND=" udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 + selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -70,6 +71,9 @@ CDEPEND=" DEPEND="${CDEPEND} >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 + doc? ( + x11-base/xorg-sgml-doctools + ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -107,30 +111,32 @@ src_configure() { local emesonargs=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11" - $(meson_use ipv6) - $(meson_use debug) - $(meson_use unwind libunwind) - $(meson_use !minimal dri) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use doc docs) + $(meson_use !minimal dri1) $(meson_use !minimal dri2) $(meson_use !minimal dri3) - $(meson_use !minimal glx) $(meson_use !minimal glamor) + $(meson_use !minimal glx) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use unwind libunwind) $(meson_use xcsecurity) $(meson_use xephyr) $(meson_use xnest) $(meson_use xorg) $(meson_use xvfb) - $(meson_use udev) - $(meson_use udev udev_kms) - $(meson_use doc docs) + -Ddefault_font_path="${EPREFIX}"/usr/share/fonts -Ddrm=true - -Dxwayland=false - -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + -Ddtrace=false + -Dipv6=true -Dhal=false -Dlinux_acpi=false - -Ddtrace=false + -Dlinux_apm=false -Dsha1=libcrypto - -Ddefault_font_path="${EPREFIX}"/usr/share/fonts + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + -Dxwayland=false ) if use systemd || use elogind; then -- cgit v1.2.3