* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2018-05-10 21:20 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2018-05-10 21:20 UTC (permalink / raw
To: gentoo-commits
commit: fab433ae10a67af7b2932c256eea0fd1bdfbdae1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 21:19:50 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 10 21:19:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab433ae
x11-base/xorg-server: Drop old patches
...-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch | 48 ------
....99.904-xwayland-Fix-build-without-glamor.patch | 175 ---------------------
2 files changed, 223 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
deleted file mode 100644
index f0c4ed58d33..00000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 15 Apr 2018 23:37:45 -0700
-Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef
- GLAMOR_HAS_GBM
-
-Fixes a compilation error without Glamor.
-
-Bugzilla: https://bugs.gentoo.org/653288
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
----
- hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index 322ef050b..79e91f0f8 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -998,18 +998,18 @@ static Bool
- drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
- unsigned width, unsigned height, unsigned bpp)
- {
-- uint32_t format;
--
-- if (drmmode->scrn->depth == 30)
-- format = GBM_FORMAT_ARGB2101010;
-- else
-- format = GBM_FORMAT_ARGB8888;
--
- bo->width = width;
- bo->height = height;
-
- #ifdef GLAMOR_HAS_GBM
- if (drmmode->glamor) {
-+ uint32_t format;
-+
-+ if (drmmode->scrn->depth == 30)
-+ format = GBM_FORMAT_ARGB2101010;
-+ else
-+ format = GBM_FORMAT_ARGB8888;
-+
- #ifdef GBM_BO_WITH_MODIFIERS
- uint32_t num_modifiers;
- uint64_t *modifiers = NULL;
---
-2.16.1
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
deleted file mode 100644
index 312a5e05cdc..00000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From c3ae963a7b19e05b8296aae8b6354587756d48fa Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 16 Apr 2018 09:39:09 +0200
-Subject: [PATCH xserver 1/2] xwayland: Fix build without glamor
-
-Present support in Xwayland relies on glamor, make sure Xwayland can
-be built without glamor by moving references to Present code inside
-the conditional GLAMOR_HAS_GBM.
-
-Reported-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Matt Turner <mattst88@gmail.com>
-Reviewed-by: Roman Gilg <subdiff@gmail.com>
----
- hw/xwayland/Makefile.am | 4 ++--
- hw/xwayland/meson.build | 3 +--
- hw/xwayland/xwayland.c | 10 +++++++++-
- hw/xwayland/xwayland.h | 7 ++++++-
- 4 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index 0291afee7..80d3a1f19 100644
---- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -11,7 +11,6 @@ Xwayland_CFLAGS = \
-
- Xwayland_SOURCES = \
- xwayland.c \
-- xwayland-present.c \
- xwayland-input.c \
- xwayland-cursor.c \
- xwayland-shm.c \
-@@ -35,7 +34,8 @@ Xwayland_built_sources =
-
- if GLAMOR_EGL
- Xwayland_SOURCES += \
-- xwayland-glamor.c
-+ xwayland-glamor.c \
-+ xwayland-present.c
- if XV
- Xwayland_SOURCES += \
- xwayland-glamor-xv.c
-diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
-index 69a5c819a..8d178825e 100644
---- a/hw/xwayland/meson.build
-+++ b/hw/xwayland/meson.build
-@@ -1,6 +1,5 @@
- srcs = [
- 'xwayland.c',
-- 'xwayland-present.c',
- 'xwayland-input.c',
- 'xwayland-cursor.c',
- 'xwayland-shm.c',
-@@ -53,7 +52,7 @@ srcs += code.process(dmabuf_xml)
-
- xwayland_glamor = []
- if gbm_dep.found()
-- srcs += 'xwayland-glamor.c'
-+ srcs += [ 'xwayland-glamor.c', 'xwayland-present.c' ]
- if build_xv
- srcs += 'xwayland-glamor-xv.c'
- endif
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
-index dd074c341..44bbc3b18 100644
---- a/hw/xwayland/xwayland.c
-+++ b/hw/xwayland/xwayland.c
-@@ -525,6 +525,7 @@ xwl_realize_window(WindowPtr window)
- wl_region_destroy(region);
- }
-
-+#ifdef GLAMOR_HAS_GBM
- if (xwl_screen->present) {
- xwl_window->present_crtc_fake = RRCrtcCreate(xwl_screen->screen, xwl_window);
- xwl_window->present_msc = 1;
-@@ -533,6 +534,7 @@ xwl_realize_window(WindowPtr window)
- xorg_list_init(&xwl_window->present_event_list);
- xorg_list_init(&xwl_window->present_release_queue);
- }
-+#endif
-
- wl_display_flush(xwl_screen->display);
-
-@@ -599,9 +601,11 @@ xwl_unrealize_window(WindowPtr window)
-
- compUnredirectWindow(serverClient, window, CompositeRedirectManual);
-
-+#ifdef GLAMOR_HAS_GBM
- if (xwl_screen->present)
- /* Always cleanup Present (Present might have been active on child window) */
- xwl_present_cleanup(window);
-+#endif
-
- screen->UnrealizeWindow = xwl_screen->UnrealizeWindow;
- ret = (*screen->UnrealizeWindow) (window);
-@@ -621,8 +625,10 @@ xwl_unrealize_window(WindowPtr window)
- if (xwl_window->frame_callback)
- wl_callback_destroy(xwl_window->frame_callback);
-
-+#ifdef GLAMOR_HAS_GBM
- if (xwl_window->present_crtc_fake)
- RRCrtcDestroy(xwl_window->present_crtc_fake);
-+#endif
-
- free(xwl_window);
- dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
-@@ -709,9 +715,11 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen)
-
- xorg_list_for_each_entry_safe(xwl_window, next_xwl_window,
- &xwl_screen->damage_window_list, link_damage) {
-+#ifdef GLAMOR_HAS_GBM
- /* Present on the main surface. So don't commit here as well. */
- if (xwl_window->present_window)
- continue;
-+#endif
- /* If we're waiting on a frame callback from the server,
- * don't attach a new buffer. */
- if (xwl_window->frame_callback)
-@@ -1053,10 +1061,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
- ErrorF("Failed to initialize glamor, falling back to sw\n");
- xwl_screen->glamor = 0;
- }
--#endif
-
- if (xwl_screen->glamor && xwl_screen->rootless)
- xwl_screen->present = xwl_present_init(pScreen);
-+#endif
-
- if (!xwl_screen->glamor) {
- xwl_screen->CreateScreenResources = pScreen->CreateScreenResources;
-diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
-index a65559374..cf2551b99 100644
---- a/hw/xwayland/xwayland.h
-+++ b/hw/xwayland/xwayland.h
-@@ -127,7 +127,7 @@ struct xwl_window {
- struct xorg_list link_damage;
- struct wl_callback *frame_callback;
- Bool allow_commits;
--
-+#ifdef GLAMOR_HAS_GBM
- /* present */
- RRCrtcPtr present_crtc_fake;
- struct xorg_list present_link;
-@@ -143,8 +143,10 @@ struct xwl_window {
-
- struct xorg_list present_event_list;
- struct xorg_list present_release_queue;
-+#endif
- };
-
-+#ifdef GLAMOR_HAS_GBM
- struct xwl_present_event {
- uint64_t event_id;
- uint64_t target_msc;
-@@ -159,6 +161,7 @@ struct xwl_present_event {
-
- struct xorg_list list;
- };
-+#endif
-
- #define MODIFIER_META 0x01
-
-@@ -378,8 +381,10 @@ struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap,
- unsigned short height,
- Bool *created);
-
-+#ifdef GLAMOR_HAS_GBM
- Bool xwl_present_init(ScreenPtr screen);
- void xwl_present_cleanup(WindowPtr window);
-+#endif
-
- void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen);
-
---
-2.16.1
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2022-02-10 23:35 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2022-02-10 23:35 UTC (permalink / raw
To: gentoo-commits
commit: fac421f9ddc0f255a0d83898b9308fe1350343e0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 10 11:43:56 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 23:35:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac421f9
x11-base/xorg-server: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/24148
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../xorg-server-21.1.2-fix-resume-logind.patch | 148 ---------------------
1 file changed, 148 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch b/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch
deleted file mode 100644
index 1d16e132f62a..000000000000
--- a/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Merged upstream into master, this is the backport PR variant.
-
-https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/833
-https://bugs.gentoo.org/829496
-
-From: Jocelyn Falempe <jfalempe@redhat.com>
-Date: Thu, 16 Dec 2021 15:46:43 +0100
-Subject: [PATCH 1/2] xf86/logind: Fix compilation error when built without
- logind/platform bus
-
-This was introduced by commit 8eb1396d
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1269
-Fixes: da9d012a9 - xf86/logind: Fix drm_drop_master before vt_reldisp
-
-Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---- a/hw/xfree86/common/xf86Events.c
-+++ b/hw/xfree86/common/xf86Events.c
-@@ -383,14 +383,7 @@ xf86VTLeave(void)
- xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]);
-
- if (systemd_logind_controls_session()) {
-- for (i = 0; i < xf86_num_platform_devices; i++) {
-- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
-- int major, minor;
-- major = xf86_platform_odev_attributes(i)->major;
-- minor = xf86_platform_odev_attributes(i)->minor;
-- systemd_logind_drop_master(major, minor);
-- }
-- }
-+ systemd_logind_drop_master();
- }
-
- if (!xf86VTSwitchAway())
---- a/hw/xfree86/os-support/linux/systemd-logind.c
-+++ b/hw/xfree86/os-support/linux/systemd-logind.c
-@@ -308,13 +308,19 @@ cleanup:
- * and ensure the drm_drop_master is done before
- * VT_RELDISP when switching VT
- */
--void systemd_logind_drop_master(int _major, int _minor)
-+void systemd_logind_drop_master(void)
- {
-- struct systemd_logind_info *info = &logind_info;
-- dbus_int32_t major = _major;
-- dbus_int32_t minor = _minor;
-+ int i;
-+ for (i = 0; i < xf86_num_platform_devices; i++) {
-+ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) {
-+ dbus_int32_t major, minor;
-+ struct systemd_logind_info *info = &logind_info;
-
-- systemd_logind_ack_pause(info, minor, major);
-+ major = xf86_platform_odev_attributes(i)->major;
-+ minor = xf86_platform_odev_attributes(i)->minor;
-+ systemd_logind_ack_pause(info, minor, major);
-+ }
-+ }
- }
-
- static DBusHandlerResult
---- a/include/systemd-logind.h
-+++ b/include/systemd-logind.h
-@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus);
- void systemd_logind_release_fd(int major, int minor, int fd);
- int systemd_logind_controls_session(void);
- void systemd_logind_vtenter(void);
--void systemd_logind_drop_master(int major, int minor);
-+void systemd_logind_drop_master(void);
- #else
- #define systemd_logind_init()
- #define systemd_logind_fini()
-@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor);
- #define systemd_logind_release_fd(major, minor, fd) close(fd)
- #define systemd_logind_controls_session() 0
- #define systemd_logind_vtenter()
--#define systemd_logind_drop_master(major, minor)
-+#define systemd_logind_drop_master()
- #endif
-
- #endif
-GitLab
-From 66890ca569291a53ea9cdc6ec19070173e522260 Mon Sep 17 00:00:00 2001
-From: Jocelyn Falempe <jfalempe@redhat.com>
-Date: Fri, 17 Dec 2021 10:18:25 +0100
-Subject: [PATCH 2/2] xf86/logind: fix missing call to vtenter if the platform
- device is not paused
-
-If there is one platform device, which is not paused nor resumed,
-systemd_logind_vtenter() will never get called.
-This break suspend/resume, and switching to VT on system with Nvidia
-proprietary driver.
-This is a regression introduced by f5bd039633fa83
-
-So now call systemd_logind_vtenter() if there are no paused
-platform devices.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1271
-Fixes: f5bd0396 - xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume
-
-Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
-Tested-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---- a/hw/xfree86/os-support/linux/systemd-logind.c
-+++ b/hw/xfree86/os-support/linux/systemd-logind.c
-@@ -316,6 +316,7 @@ void systemd_logind_drop_master(void)
- dbus_int32_t major, minor;
- struct systemd_logind_info *info = &logind_info;
-
-+ xf86_platform_devices[i].flags |= XF86_PDEV_PAUSED;
- major = xf86_platform_odev_attributes(i)->major;
- minor = xf86_platform_odev_attributes(i)->minor;
- systemd_logind_ack_pause(info, minor, major);
-@@ -323,6 +324,16 @@ void systemd_logind_drop_master(void)
- }
- }
-
-+static Bool are_platform_devices_resumed(void) {
-+ int i;
-+ for (i = 0; i < xf86_num_platform_devices; i++) {
-+ if (xf86_platform_devices[i].flags & XF86_PDEV_PAUSED) {
-+ return FALSE;
-+ }
-+ }
-+ return TRUE;
-+}
-+
- static DBusHandlerResult
- message_filter(DBusConnection * connection, DBusMessage * message, void *data)
- {
-@@ -416,13 +427,11 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data)
-
- if (pdev) {
- pdev->flags &= ~XF86_PDEV_PAUSED;
-- systemd_logind_vtenter();
- } else
- systemd_logind_set_input_fd_for_all_devs(major, minor, fd,
- info->vt_active);
--
-- /* Always call vtenter(), only if there are only legacy video devs */
-- if (!xf86_num_platform_devices)
-+ /* Call vtenter if all platform devices are resumed, or if there are no platform device */
-+ if (are_platform_devices_resumed())
- systemd_logind_vtenter();
- }
- return DBUS_HANDLER_RESULT_HANDLED;
-GitLab
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2022-01-16 8:06 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2022-01-16 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 26da85a2cb59317b7c6593167190e5f2bb2bcfbd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 26 08:08:42 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 08:06:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26da85a2
x11-base/xorg-server: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/23519
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/xorg-server-21.1.1-DPI-revert.patch | 133 ---------------------
1 file changed, 133 deletions(-)
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 <povilas@radix.lt>
-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 <povilas@radix.lt>
---- 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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2019-07-30 1:49 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2019-07-30 1:49 UTC (permalink / raw
To: gentoo-commits
commit: 39a053a99e04391563810fe953112d2249317681
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 01:38:30 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 01:49:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a053a9
x11-base/xorg-server: Suppress meaningless errors during shutdown
Thanks to crocket for the patch.
Closes: https://bugs.gentoo.org/689936
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-base/xorg-server/files/xdm.initd-11 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11
index c9ec36746d0..7b2f992325f 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -207,7 +207,7 @@ stop() {
ebegin "Stopping ${myservice}"
- if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+ if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then
start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
${mypidfile:+--pidfile} ${mypidfile} \
${myname:+--name} ${myname}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2018-06-12 17:35 Mikle Kolyada
0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2018-06-12 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 99ae8f37250ba9b49edb66e136db93661a6dd794
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 17:34:52 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 17:35:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ae8f37
x11-base/xorg-server: modernize xdm comment a bit
Package-Manager: Portage-2.3.40, Repoman-2.3.9
x11-base/xorg-server/files/xdm.confd-4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4
index c82fece01cb..880d4635f11 100644
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -5,6 +5,6 @@
# in your /etc/inittab file so that you don't get a dead keyboard.
CHECKVT=7
-# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ]
+# What display manager do you use ? [ xdm | gdm | sddm | gpe | lightdm | entrance ]
# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
DISPLAYMANAGER="xdm"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2017-09-04 20:00 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2017-09-04 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 48518239b234989db6c1ea769bc17bc5d71e1890
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 4 18:16:02 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 4 20:00:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48518239
x11-base/xorg-server: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/5614
.../files/xorg-server-1.17-ia64-fix_inx_outx.patch | 59 ----------------------
1 file changed, 59 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch
deleted file mode 100644
index 84485c986aa..00000000000
--- a/x11-base/xorg-server/files/xorg-server-1.17-ia64-fix_inx_outx.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 1653574..fe881ee 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -286,6 +286,54 @@ extern _X_EXPORT unsigned int inl(unsigned int port);
- #include <machine/pio.h>
- #endif /* __NetBSD__ */
-
-+#elif defined(linux) && defined(__ia64__)
-+/* for Linux on ia64, we use the LIBC _inx/_outx routines */
-+/* note that the appropriate setup via "ioperm" needs to be done */
-+/* *before* any inx/outx is done. */
-+
-+extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
-+extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
-+extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
-+extern _X_EXPORT unsigned int _inb(unsigned long port);
-+extern _X_EXPORT unsigned int _inw(unsigned long port);
-+extern _X_EXPORT unsigned int _inl(unsigned long port);
-+
-+static __inline__ void
-+outb(unsigned long port, unsigned char val)
-+{
-+ _outb(val, port);
-+}
-+
-+static __inline__ void
-+outw(unsigned long port, unsigned short val)
-+{
-+ _outw(val, port);
-+}
-+
-+static __inline__ void
-+outl(unsigned long port, unsigned int val)
-+{
-+ _outl(val, port);
-+}
-+
-+static __inline__ unsigned int
-+inb(unsigned long port)
-+{
-+ return _inb(port);
-+}
-+
-+static __inline__ unsigned int
-+inw(unsigned long port)
-+{
-+ return _inw(port);
-+}
-+
-+static __inline__ unsigned int
-+inl(unsigned long port)
-+{
-+ return _inl(port);
-+}
-+
- #elif defined(__amd64__)
-
- #include <inttypes.h>
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2017-02-17 17:16 Matt Turner
0 siblings, 0 replies; 8+ messages in thread
From: Matt Turner @ 2017-02-17 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 7c3f6e371b13c28f799bbf15eb686b5c1ee9b86f
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb 17 16:31:28 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 17:16:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3f6e37
x11-base/xorg-server: remove unused patch
.../files/xorg-server-disable-acpi.patch | 31 ----------------------
1 file changed, 31 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
deleted file mode 100644
index cc80e6cef4..0000000000
--- a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
-Subject: [PATCH] Don't build the ACPI code.
-
-No good can come of this.
----
- configure.ac | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
- case $host_cpu in
- ia64*)
- linux_ia64=yes
-- linux_acpi="yes"
- ;;
- alpha*)
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
---
-1.6.1.3
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
@ 2016-05-18 6:42 Austin English
0 siblings, 0 replies; 8+ messages in thread
From: Austin English @ 2016-05-18 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 96996449d1ab625328240ca9ea8bdee25a25c42d
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:35:27 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:38:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96996449
x11-base/xorg-server: use #!/sbin/openrc-run instead of #!/sbin/runscript
x11-base/xorg-server/files/xdm-setup.initd-1 | 2 +-
x11-base/xorg-server/files/xdm.initd-11 | 2 +-
x11-base/xorg-server/files/xdm.initd-9 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
index e96a8c0..917cd12 100644
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11
index 7f0626e..70b81c0 100644
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
# $Id$
diff --git a/x11-base/xorg-server/files/xdm.initd-9 b/x11-base/xorg-server/files/xdm.initd-9
index 636d4e2..11b4f19 100644
--- a/x11-base/xorg-server/files/xdm.initd-9
+++ b/x11-base/xorg-server/files/xdm.initd-9
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
# $Id$
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-02-10 23:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-10 21:20 [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-02-10 23:35 Matt Turner
2022-01-16 8:06 Matt Turner
2019-07-30 1:49 Matt Turner
2018-06-12 17:35 Mikle Kolyada
2017-09-04 20:00 Matt Turner
2017-02-17 17:16 Matt Turner
2016-05-18 6:42 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox