From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- x11-base/xorg-server/Manifest | 1 - .../files/xorg-server-21.1.1-DPI-revert.patch | 133 --------------------- 2 files changed, 134 deletions(-) delete mode 100644 x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch (limited to 'x11-base/xorg-server') diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index fa6b1205800c..9e3ef4fc5769 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,6 +1,5 @@ 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-server-21.1.2-fix-resume-logind.patch 5634 BLAKE2B 15528bd26a26a701b374110f1505cd1ed75872ad6bb74e53a6c897e7edd15a074e3abd3bcca08a31cdc5d368e3fa71915ff970c427563cfb5443167b11fd4bd6 SHA512 39033c81d24ffcdb4e6b7eb5d6bcdb0083a4b6940e1ee5f256bc9f0e917a6dd821304b84b2a8752c4a4597aa72730d1f44a67079527842dd01faeebedead5b63 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 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 deleted file mode 100644 index 89d8e2653a28..000000000000 --- a/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch +++ /dev/null @@ -1,133 +0,0 @@ -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 -- cgit v1.2.3