diff --git a/SOURCES/0001-Always-install-vbe-and-int10-sdk-headers.patch b/SOURCES/0001-Always-install-vbe-and-int10-sdk-headers.patch index fa7f836..c613eb8 100644 --- a/SOURCES/0001-Always-install-vbe-and-int10-sdk-headers.patch +++ b/SOURCES/0001-Always-install-vbe-and-int10-sdk-headers.patch @@ -28,7 +28,7 @@ index b876b79..a170b58 100644 +SUBDIRS = common ddc x86emu int10 os-support parser \ ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ - $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ -+ $(DRI2_SUBDIR) . vbe i2c dixmods \ ++ $(DRI2_SUBDIR) . vbe i2c dixmods xkb \ fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ $(GLAMOR_EGL_SUBDIR) drivers diff --git a/SOURCES/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch b/SOURCES/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch new file mode 100644 index 0000000..9355ad2 --- /dev/null +++ b/SOURCES/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch @@ -0,0 +1,41 @@ +From 38ae53c94a88c7bd5877c72a12582b60865e07ff Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 17 Apr 2014 15:50:44 +0200 +Subject: [PATCH] Fedora hack: Make the suid-root wrapper start the server with + root rights + +Do NOT upstream. + +Since most display managers are not ready yet to start Xorg in way which will +keep it working without root-rights, see: +https://fedoraproject.org/wiki/Changes/XorgWithoutRootRights + +Just keep starting X as root for now, but do it through the wrapper, by +overriding the needs_root_rights = -1 (auto) default and setting it to 1. + +We set a special environment variable when starting X in a way where root +rights are not needed (from gdm and startx) and keep the upstream +needs_root_rights = -1 (auto) default in that case. + +Signed-off-by: Hans de Goede +--- + hw/xfree86/xorg-wrapper.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c +index 4c37cfc..ae5d27f 100644 +--- a/hw/xfree86/xorg-wrapper.c ++++ b/hw/xfree86/xorg-wrapper.c +@@ -198,6 +198,9 @@ int main(int argc, char *argv[]) + int needs_root_rights = -1; + char *const empty_envp[1] = { NULL, }; + ++ if (getenv("XORG_RUN_AS_USER_OK") == NULL) ++ needs_root_rights = 1; ++ + progname = argv[0]; + + parse_config(&allowed, &needs_root_rights); +-- +2.4.3 + diff --git a/SOURCES/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/SOURCES/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch index 30554b9..1ed02f4 100644 --- a/SOURCES/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch +++ b/SOURCES/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch @@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da03d..dadbac6c8f 100644 +index cef47da03..dadbac6c8 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -289,7 +289,7 @@ xf86platformProbe(void) @@ -27,5 +27,5 @@ index cef47da03d..dadbac6c8f 100644 } -- -2.21.0 +2.14.4 diff --git a/SOURCES/0001-autobind-GPUs-to-the-screen.patch b/SOURCES/0001-autobind-GPUs-to-the-screen.patch index a4a99fd..86b96a2 100644 --- a/SOURCES/0001-autobind-GPUs-to-the-screen.patch +++ b/SOURCES/0001-autobind-GPUs-to-the-screen.patch @@ -34,7 +34,6 @@ xorg.conf snippet. Signed-off-by: Dave Airlie [hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] Signed-off-by: Hans de Goede -[paper over crash in RRProviderAutoConfigGpuScreen - ajax] --- hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++ hw/xfree86/common/xf86Globals.c | 2 ++ @@ -274,7 +273,7 @@ index e4bc2bf..e04c18f 100644 + rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); + rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen); + RRProviderPtr provider = pScrPriv->provider; -+ RRProviderPtr master_provider = masterPriv ? masterPriv->provider : 0; ++ RRProviderPtr master_provider = masterPriv->provider; + + if (!provider || !master_provider) + return; diff --git a/SOURCES/0001-link-with-z-now.patch b/SOURCES/0001-link-with-z-now.patch index aae9147..a497006 100644 --- a/SOURCES/0001-link-with-z-now.patch +++ b/SOURCES/0001-link-with-z-now.patch @@ -1,17 +1,70 @@ -From 15a6d58414b85867f39237518f2b3bac7bba6a20 Mon Sep 17 00:00:00 2001 +From e84d6f25015d36202fd524b8b8d85d2324348ddb Mon Sep 17 00:00:00 2001 From: Adam Jackson -Date: Tue, 29 May 2018 15:11:54 -0400 +Date: Mon, 19 Nov 2018 11:27:09 -0500 Subject: [PATCH] link with -z now +Signed-off-by: Adam Jackson --- - hw/xfree86/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + hw/dmx/Makefile.am | 2 +- + hw/kdrive/ephyr/Makefile.am | 2 +- + hw/vfb/Makefile.am | 2 +- + hw/xfree86/Makefile.am | 3 ++- + hw/xfree86/dixmods/Makefile.am | 6 +++--- + hw/xfree86/exa/Makefile.am | 2 +- + hw/xfree86/fbdevhw/Makefile.am | 2 +- + hw/xfree86/int10/Makefile.am | 2 +- + hw/xfree86/shadowfb/Makefile.am | 2 +- + hw/xfree86/utils/cvt/Makefile.am | 1 + + hw/xfree86/utils/gtf/Makefile.am | 1 + + hw/xfree86/vgahw/Makefile.am | 2 +- + hw/xnest/Makefile.am | 2 +- + hw/xwayland/Makefile.am | 2 +- + 14 files changed, 17 insertions(+), 14 deletions(-) +diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am +index eef84cb..9ab20cc 100644 +--- a/hw/dmx/Makefile.am ++++ b/hw/dmx/Makefile.am +@@ -78,7 +78,7 @@ XDMX_LIBS = \ + input/libdmxinput.a \ + config/libdmxconfig.a + +-Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-z,now -pie + Xdmx_DEPENDENCIES= $(XDMX_LIBS) + Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS) + +diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am +index d12559b..cc37add 100644 +--- a/hw/kdrive/ephyr/Makefile.am ++++ b/hw/kdrive/ephyr/Makefile.am +@@ -78,7 +78,7 @@ Xephyr_LDADD = \ + + Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ $(XEPHYR_GLAMOR_LIB) + +-Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -W,-z,now -pie + + relink: + $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) +diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am +index 7033397..c09a9c9 100644 +--- a/hw/vfb/Makefile.am ++++ b/hw/vfb/Makefile.am +@@ -20,7 +20,7 @@ XVFB_LIBS = \ + + Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) + Xvfb_DEPENDENCIES = $(XVFB_LIBS) +-Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-z,now -pie + + relink: + $(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am -index a7a1be2..197701d 100644 +index 32f98b5..5955148 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am -@@ -78,7 +78,7 @@ Xorg_LDADD = \ +@@ -78,12 +78,13 @@ Xorg_LDADD = \ $(XSERVER_SYS_LIBS) Xorg_DEPENDENCIES = $(LOCAL_LIBS) @@ -20,6 +73,142 @@ index a7a1be2..197701d 100644 if SUID_WRAPPER wrapexecdir = $(SUID_WRAPPER_DIR) + wrapexec_PROGRAMS = Xorg.wrap + Xorg_wrap_SOURCES = xorg-wrapper.c ++Xorg_wrap_LDFLAGS = -Wl,-z,now -pie + endif + + BUILT_SOURCES = xorg.conf.example +diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am +index 856659f..6ab101b 100644 +--- a/hw/xfree86/dixmods/Makefile.am ++++ b/hw/xfree86/dixmods/Makefile.am +@@ -17,17 +17,17 @@ AM_CPPFLAGS = @XORG_INCS@ \ + -I$(top_srcdir)/miext/shadow \ + -I$(top_srcdir)/glx + +-libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) ++libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -Wl,-z,now + libfb_la_LIBADD = $(top_builddir)/fb/libfb.la + libfb_la_SOURCES = fbmodule.c + libfb_la_CFLAGS = $(AM_CFLAGS) + +-libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) ++libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -Wl,-z,now + libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la + libwfb_la_SOURCES = fbmodule.c + libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER + +-libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) ++libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -Wl,-z,now + libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS) + if DRI2 + libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la +diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am +index ccbb305..7bf7137 100644 +--- a/hw/xfree86/exa/Makefile.am ++++ b/hw/xfree86/exa/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = man + + module_LTLIBRARIES = libexa.la + +-libexa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) ++libexa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -Wl,-z,now + + AM_CPPFLAGS = \ + $(XORG_INCS) \ +diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am +index 37cd88c..895cfab 100644 +--- a/hw/xfree86/fbdevhw/Makefile.am ++++ b/hw/xfree86/fbdevhw/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = man + + module_LTLIBRARIES = libfbdevhw.la + +-libfbdevhw_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) ++libfbdevhw_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -Wl,-z,now + + if FBDEVHW + libfbdevhw_la_SOURCES = fbdevhw.c +diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am +index 66cb14d..aad47a1 100644 +--- a/hw/xfree86/int10/Makefile.am ++++ b/hw/xfree86/int10/Makefile.am +@@ -4,7 +4,7 @@ sdk_HEADERS = xf86int10.h + + EXTRA_CFLAGS = + +-libint10_la_LDFLAGS = -avoid-version ++libint10_la_LDFLAGS = -avoid-version -Wl,-z,now + libint10_la_LIBADD = $(PCIACCESS_LIBS) + + COMMON_SOURCES = \ +diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am +index 67fb2e4..a8c2d59 100644 +--- a/hw/xfree86/shadowfb/Makefile.am ++++ b/hw/xfree86/shadowfb/Makefile.am +@@ -1,5 +1,5 @@ + module_LTLIBRARIES = libshadowfb.la +-libshadowfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) ++libshadowfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -Wl,-z,now + libshadowfb_la_SOURCES = sfbmodule.c shadowfb.c + libshadowfb_la_LIBADD = $(PIXMAN_LIBS) + +diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am +index 26abeb4..19b0eba 100644 +--- a/hw/xfree86/utils/cvt/Makefile.am ++++ b/hw/xfree86/utils/cvt/Makefile.am +@@ -33,3 +33,4 @@ cvt_SOURCES = cvt.c \ + $(top_srcdir)/os/xprintf.c + + cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) ++cvt_LDFLAGS = -Wl,-z,now -pie +diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am +index f77bf60..f520fb9 100644 +--- a/hw/xfree86/utils/gtf/Makefile.am ++++ b/hw/xfree86/utils/gtf/Makefile.am +@@ -25,3 +25,4 @@ bin_PROGRAMS = gtf + gtf_SOURCES = gtf.c + gtf_CFLAGS = $(XORG_CFLAGS) + gtf_LDADD = -lm ++gtf_LDFLAGS = -Wl,-z,now -pie +diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am +index b8196a6..37ac499 100644 +--- a/hw/xfree86/vgahw/Makefile.am ++++ b/hw/xfree86/vgahw/Makefile.am +@@ -1,5 +1,5 @@ + module_LTLIBRARIES = libvgahw.la +-libvgahw_la_LDFLAGS = -avoid-version ++libvgahw_la_LDFLAGS = -avoid-version -Wl,-z,now + libvgahw_la_LIBADD = $(PCIACCESS_LIBS) + libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c + AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c +diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am +index c77da64..185803c 100644 +--- a/hw/xnest/Makefile.am ++++ b/hw/xnest/Makefile.am +@@ -51,7 +51,7 @@ Xnest_SOURCES = $(SRCS) + + Xnest_DEPENDENCIES = $(XNEST_LIBS) + Xnest_LDADD = $(XNEST_LIBS) $(XNEST_SYS_LIBS) $(XSERVER_SYS_LIBS) +-Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-z,now -pie + + EXTRA_DIST = icon \ + screensaver +diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am +index bc1cb85..2f70cd1 100644 +--- a/hw/xwayland/Makefile.am ++++ b/hw/xwayland/Makefile.am +@@ -28,7 +28,7 @@ Xwayland_LDADD = \ + $(XWAYLAND_SYS_LIBS) \ + $(top_builddir)/Xext/libXvidmode.la \ + $(XSERVER_SYS_LIBS) +-Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-z,now -pie + + Xwayland_built_sources = + -- -2.17.0 +2.19.1 diff --git a/SOURCES/0001-linux-Make-platform-device-probe-less-fragile.patch b/SOURCES/0001-linux-Make-platform-device-probe-less-fragile.patch index 38bf933..7be4258 100644 --- a/SOURCES/0001-linux-Make-platform-device-probe-less-fragile.patch +++ b/SOURCES/0001-linux-Make-platform-device-probe-less-fragile.patch @@ -1,4 +1,4 @@ -From 0816e8fca6194dfb4cc94c3a7fcb2c7f2a921386 Mon Sep 17 00:00:00 2001 +From 28320833d61af76dc3b77b985c69706f3e021836 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 18 Sep 2018 14:37:51 -0400 Subject: [PATCH xserver] linux: Make platform device probe less fragile @@ -14,12 +14,11 @@ Fortunately we know the format of the busid string, and it happens to almost be the same as the ID_PATH variable from udev. Use that instead and stop calling drmSetInterfaceVersion. -Reviewed-by: Peter Hutterer Signed-off-by: Adam Jackson --- config/udev.c | 17 ++++++++++++----- - hw/xfree86/os-support/linux/lnx_platform.c | 20 ++------------------ - 2 files changed, 14 insertions(+), 23 deletions(-) + hw/xfree86/os-support/linux/lnx_platform.c | 13 ++----------- + 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/config/udev.c b/config/udev.c index 3a73189e25..8c6c4b6665 100644 @@ -88,17 +87,10 @@ index 3a73189e25..8c6c4b6665 100644 no_probe: udev_device_unref(udev_device); diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/linux/lnx_platform.c -index 70374ace88..e623062192 100644 +index 70374ace88..0eb6d22875 100644 --- a/hw/xfree86/os-support/linux/lnx_platform.c +++ b/hw/xfree86/os-support/linux/lnx_platform.c -@@ -23,13 +23,13 @@ - static Bool - get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) - { -- drmSetVersion sv; - drmVersionPtr v; -- char *buf; - int fd; +@@ -30,6 +30,8 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) int err = 0; Bool paused, server_fd = FALSE; @@ -107,15 +99,10 @@ index 70374ace88..e623062192 100644 fd = systemd_logind_take_fd(attribs->major, attribs->minor, path, &paused); if (fd != -1) { if (paused) { -@@ -48,18 +48,6 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) - if (fd == -1) - return FALSE; +@@ -53,13 +55,6 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) + sv.drm_dd_major = -1; /* Don't care */ + sv.drm_dd_minor = -1; /* Don't care */ -- sv.drm_di_major = 1; -- sv.drm_di_minor = 4; -- sv.drm_dd_major = -1; /* Don't care */ -- sv.drm_dd_minor = -1; /* Don't care */ -- - err = drmSetInterfaceVersion(fd, &sv); - if (err) { - xf86Msg(X_ERROR, "%s: failed to set DRM interface version 1.4: %s\n", @@ -126,7 +113,7 @@ index 70374ace88..e623062192 100644 /* for a delayed probe we've already added the device */ if (delayed_index == -1) { xf86_add_platform_device(attribs, FALSE); -@@ -69,10 +57,6 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) +@@ -69,10 +64,6 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index) if (server_fd) xf86_platform_devices[delayed_index].flags |= XF86_PDEV_SERVER_FD; @@ -138,5 +125,5 @@ index 70374ace88..e623062192 100644 if (!v) { xf86Msg(X_ERROR, "%s: failed to query DRM version\n", path); -- -2.21.0 +2.19.0 diff --git a/SOURCES/0001-modesetting-Reduce-glamor-initialization-failed-mess.patch b/SOURCES/0001-modesetting-Reduce-glamor-initialization-failed-mess.patch new file mode 100644 index 0000000..75f47b1 --- /dev/null +++ b/SOURCES/0001-modesetting-Reduce-glamor-initialization-failed-mess.patch @@ -0,0 +1,37 @@ +From 41e265988a0b6ec456ddd562253e0f82a7c2ede2 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Fri, 27 Sep 2019 11:43:52 -0400 +Subject: [PATCH xserver] modesetting: Reduce "glamor initialization failed" + message to X_INFO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This might be an error or not, for example refusing to work on llvmpipe +is normal and expected. glamor_egl_init() will print X_ERROR messages if +appropriate, so we don't need to here. + +Reviewed-by: Michel Dänzer + +(cherry picked from commit cbdde938cbaf604741cd057fac743859ada342ec) +Signed-off-by: Michel Dänzer +--- + hw/xfree86/drivers/modesetting/driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c +index 2aaea5f7d..783d53eaa 100644 +--- a/hw/xfree86/drivers/modesetting/driver.c ++++ b/hw/xfree86/drivers/modesetting/driver.c +@@ -772,7 +772,7 @@ try_enable_glamor(ScrnInfoPtr pScrn) + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "glamor initialized\n"); + ms->drmmode.glamor = TRUE; + } else { +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "glamor initialization failed\n"); + } + } else { +-- +2.26.2 + diff --git a/SOURCES/0001-mustard-Add-DRI2-fallback-driver-mappings-for-i965-a.patch b/SOURCES/0001-mustard-Add-DRI2-fallback-driver-mappings-for-i965-a.patch new file mode 100644 index 0000000..395096c --- /dev/null +++ b/SOURCES/0001-mustard-Add-DRI2-fallback-driver-mappings-for-i965-a.patch @@ -0,0 +1,28 @@ +From efb4bc5b3da511d128144840d7eb3cf3c7cfa0ae Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 3 Sep 2019 12:10:37 -0400 +Subject: [PATCH] mustard: Add DRI2 fallback driver mappings for i965 and + radeonsi + +--- + hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +index 689a570..3825f52 100644 +--- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h ++++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +@@ -45,8 +45,10 @@ static const struct { + int num_chips_ids; + } driver_map[] = { + { 0x8086, "i965", "va_gl", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, ++ { 0x8086, "i965", "va_gl", NULL, -1 }, + { 0x1002, "r600","r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, + { 0x1002, "radeonsi", "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, ++ { 0x1002, "radeonsi", "radeonsi", NULL, -1 }, + { 0x10de, "nouveau", "nouveau", NULL, -1 }, + { 0x1af4, "virtio_gpu", "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) }, + { 0x15ad, "vmwgfx", "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, +-- +2.23.0 + diff --git a/SOURCES/0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL8.patch b/SOURCES/0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL8.patch new file mode 100644 index 0000000..67bcbce --- /dev/null +++ b/SOURCES/0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL8.patch @@ -0,0 +1,278 @@ +From b6e50ece375b6b1fbe053b30b52fc40dde5c682b Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 13 Nov 2018 10:11:36 -0500 +Subject: [PATCH] mustard: Don't probe for drivers not shipped in RHEL8 + +As with RHEL7, this is mostly to keep spurious probe messages out of the +X log and prevent questions like "why isn't it loading mga on my +G200SE" or "why isn't it loading radeon_dri.so on my RN50". +--- + hw/xfree86/common/xf86pciBus.c | 162 -------------------- + hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 32 ---- + 2 files changed, 194 deletions(-) + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index b7f9999..398ed45 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1074,107 +1074,12 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md) + const char *driverList[5] = { NULL, NULL, NULL, NULL, NULL }; + + switch (dev->vendor_id) { +- /* AMD Geode LX */ +- case 0x1022: +- if (dev->device_id == 0x2081) +- driverList[0] = "geode"; +- break; +- /* older Geode products acquired by AMD still carry an NSC vendor_id */ +- case 0x100b: +- if (dev->device_id == 0x0030) { +- /* NSC Geode GX2 specifically */ +- driverList[0] = "geode"; +- /* GX2 support started its life in the NSC tree and was later +- forked by AMD for GEODE so we keep it as a backup */ +- driverList[1] = "nsc"; +- } +- else +- /* other NSC variant e.g. 0x0104 (SC1400), 0x0504 (SCx200) */ +- driverList[0] = "nsc"; +- break; +- /* Cyrix Geode GX1 */ +- case 0x1078: +- if (dev->device_id == 0x0104) +- driverList[0] = "cyrix"; +- break; +- case 0x1142: +- driverList[0] = "apm"; +- break; +- case 0xedd8: +- driverList[0] = "ark"; +- break; +- case 0x1a03: +- driverList[0] = "ast"; +- break; + case 0x1002: + driverList[0] = "ati"; + break; +- case 0x102c: +- driverList[0] = "chips"; +- break; +- case 0x1013: +- driverList[0] = "cirrus"; +- break; +- case 0x3d3d: +- driverList[0] = "glint"; +- break; +- case 0x105d: +- driverList[0] = "i128"; +- break; + case 0x8086: + switch (dev->device_id) + { +- /* Intel i740 */ +- case 0x00d1: +- case 0x7800: +- driverList[0] = "i740"; +- break; +- /* GMA500/Poulsbo */ +- case 0x8108: +- case 0x8109: +- /* Try psb driver on Poulsbo - if available */ +- driverList[0] = "psb"; +- driverList[1] = "psb_drv"; +- break; +- /* GMA600/Oaktrail */ +- case 0x4100: +- case 0x4101: +- case 0x4102: +- case 0x4103: +- case 0x4104: +- case 0x4105: +- case 0x4106: +- case 0x4107: +- /* Atom E620/Oaktrail */ +- case 0x4108: +- /* Medfield */ +- case 0x0130: +- case 0x0131: +- case 0x0132: +- case 0x0133: +- case 0x0134: +- case 0x0135: +- case 0x0136: +- case 0x0137: +- /* GMA 3600/CDV */ +- case 0x0be0: +- case 0x0be1: +- case 0x0be2: +- case 0x0be3: +- case 0x0be4: +- case 0x0be5: +- case 0x0be6: +- case 0x0be7: +- case 0x0be8: +- case 0x0be9: +- case 0x0bea: +- case 0x0beb: +- case 0x0bec: +- case 0x0bed: +- case 0x0bee: +- case 0x0bef: +- /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ +- break; + /* Default to intel only on pre-gen4 chips */ + case 0x3577: + case 0x2562: +@@ -1196,14 +1101,7 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md) + break; + } + break; +- case 0x102b: +- driverList[0] = "mga"; +- break; +- case 0x10c8: +- driverList[0] = "neomagic"; +- break; + case 0x10de: +- case 0x12d2: + { + int idx = 0; + +@@ -1229,77 +1127,17 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md) + + driverList[idx++] = "nouveau"; + #endif +- driverList[idx++] = "nv"; + break; + } +- case 0x1106: +- driverList[0] = "openchrome"; +- break; + case 0x1b36: + driverList[0] = "qxl"; + break; +- case 0x1163: +- driverList[0] = "rendition"; +- break; +- case 0x5333: +- switch (dev->device_id) { +- case 0x88d0: +- case 0x88d1: +- case 0x88f0: +- case 0x8811: +- case 0x8812: +- case 0x8814: +- case 0x8901: +- driverList[0] = "s3"; +- break; +- case 0x5631: +- case 0x883d: +- case 0x8a01: +- case 0x8a10: +- case 0x8c01: +- case 0x8c03: +- case 0x8904: +- case 0x8a13: +- driverList[0] = "s3virge"; +- break; +- default: +- driverList[0] = "savage"; +- break; +- } +- break; +- case 0x1039: +- driverList[0] = "sis"; +- break; +- case 0x126f: +- driverList[0] = "siliconmotion"; +- break; +- case 0x121a: +- if (dev->device_id < 0x0003) +- driverList[0] = "voodoo"; +- else +- driverList[0] = "tdfx"; +- break; +- case 0x1011: +- driverList[0] = "tga"; +- break; +- case 0x1023: +- driverList[0] = "trident"; +- break; +- case 0x100c: +- driverList[0] = "tseng"; +- break; + case 0x80ee: + driverList[0] = "vboxvideo"; + break; + case 0x15ad: + driverList[0] = "vmware"; + break; +- case 0x18ca: +- if (dev->device_id == 0x47) +- driverList[0] = "xgixp"; +- else +- driverList[0] = "xgi"; +- break; + default: + break; + } +diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +index 7036d10..689a570 100644 +--- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h ++++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +@@ -7,38 +7,12 @@ + #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + #endif + +-static const int i915_chip_ids[] = { +-#define CHIPSET(chip, desc, name) chip, +-#include "pci_ids/i915_pci_ids.h" +-#undef CHIPSET +-}; +- + static const int i965_chip_ids[] = { + #define CHIPSET(chip, family, name) chip, + #include "pci_ids/i965_pci_ids.h" + #undef CHIPSET + }; + +-#ifndef DRIVER_MAP_GALLIUM_ONLY +-static const int r100_chip_ids[] = { +-#define CHIPSET(chip, name, family) chip, +-#include "pci_ids/radeon_pci_ids.h" +-#undef CHIPSET +-}; +- +-static const int r200_chip_ids[] = { +-#define CHIPSET(chip, name, family) chip, +-#include "pci_ids/r200_pci_ids.h" +-#undef CHIPSET +-}; +-#endif +- +-static const int r300_chip_ids[] = { +-#define CHIPSET(chip, name, family) chip, +-#include "pci_ids/r300_pci_ids.h" +-#undef CHIPSET +-}; +- + static const int r600_chip_ids[] = { + #define CHIPSET(chip, name, family) chip, + #include "pci_ids/r600_pci_ids.h" +@@ -70,13 +44,7 @@ static const struct { + const int *chip_ids; + int num_chips_ids; + } driver_map[] = { +- { 0x8086, "i915", "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, + { 0x8086, "i965", "va_gl", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, +-#ifndef DRIVER_MAP_GALLIUM_ONLY +- { 0x1002, "radeon", "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) }, +- { 0x1002, "r200", "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) }, +-#endif +- { 0x1002, "r300", "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) }, + { 0x1002, "r600","r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, + { 0x1002, "radeonsi", "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, + { 0x10de, "nouveau", "nouveau", NULL, -1 }, +-- +2.19.1 + diff --git a/SOURCES/0001-mustard-Work-around-broken-fbdev-headers.patch b/SOURCES/0001-mustard-Work-around-broken-fbdev-headers.patch new file mode 100644 index 0000000..fd4e2e2 --- /dev/null +++ b/SOURCES/0001-mustard-Work-around-broken-fbdev-headers.patch @@ -0,0 +1,34 @@ +From a4fc2f3a55776018eda20e09c11b3710f8f0e542 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Fri, 26 Oct 2018 14:16:17 -0400 +Subject: [PATCH xserver] mustard: Work around broken fbdev headers + +This configure check is somewhat pointless as we have our own copy of +the fbdev ioctl declarations. There's also a bug in the version of the +kernel headers I happen to want to build against, where an IS_ENABLED() +escaped into uapi like it oughtn't. + +Nerf the test so we build the right fbdevhw code. + +Signed-off-by: Adam Jackson +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 57a2331024..2b8477ed61 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -197,8 +197,7 @@ AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes) + AM_CONDITIONAL(AGP, [test "x$AGP" = xyes]) + + dnl fbdev header +-AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes) +-AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes]) ++AM_CONDITIONAL(FBDEVHW, true) + + dnl FreeBSD kldload support (sys/linker.h) + AC_CHECK_HEADERS([sys/linker.h], +-- +2.19.1 + diff --git a/SOURCES/0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch b/SOURCES/0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch new file mode 100644 index 0000000..cce0348 --- /dev/null +++ b/SOURCES/0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch @@ -0,0 +1,152 @@ +From acf5a0100c98a040e5e07a79ecf4a83627da770e Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 23 Mar 2017 12:54:07 +0100 +Subject: [PATCH xserver] xf86: dri2: Use va_gl as vdpau_driver for Intel i965 + GPUs + +The modesetting driver (which now often is used with Intel GPUs), +relies on dri2_probe_driver_name() to get the dri and vdpau driver +names, before this commit it would always assign the same name to +the 2 names. But the vdpau driver for i965 GPUs should be va_gl +(i915 does not support vdpau at all). + +This commit modifies the used lookup table and dri2_probe_driver_name() +to set the vdpau_driver to va_gl for i965 GPUs, it leaves the 2 +names the same for all other GPUs. + +Note this commit adds a FIXME comment for a memory leak in +dri2_probe_driver_name(), that leak was already present and fixing +it falls outside of the scope of this commit. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1413733 +Cc: kwizart@gmail.com +Signed-off-by: Hans de Goede +--- + hw/xfree86/dri2/dri2.c | 31 +++++++++++++-------- + hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 21 +++++++------- + 2 files changed, 31 insertions(+), 21 deletions(-) + +diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c +index 6619e3aa7..1f8ad14bc 100644 +--- a/hw/xfree86/dri2/dri2.c ++++ b/hw/xfree86/dri2/dri2.c +@@ -1437,14 +1437,18 @@ get_prime_id(void) + + #include "pci_ids/pci_id_driver_map.h" + +-static char * +-dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info) ++static void ++dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info, ++ const char **dri_driver_ret, ++ const char **vdpau_driver_ret) + { + #ifdef WITH_LIBDRM + int i, j; +- char *driver = NULL; + drmDevicePtr dev; + ++ *dri_driver_ret = NULL; ++ *vdpau_driver_ret = NULL; ++ + /* For non-PCI devices and drmGetDevice fail, just assume that + * the 3D driver is named the same as the kernel driver. This is + * currently true for vc4 and msm (freedreno). +@@ -1456,12 +1460,14 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info) + xf86DrvMsg(pScreen->myNum, X_ERROR, + "[DRI2] Couldn't drmGetVersion() on non-PCI device, " + "no driver name found.\n"); +- return NULL; ++ return; + } + +- driver = strndup(version->name, version->name_len); ++ /* FIXME this gets leaked */ ++ *dri_driver_ret = strndup(version->name, version->name_len); ++ *vdpau_driver_ret = *dri_driver_ret; + drmFreeVersion(version); +- return driver; ++ return; + } + + for (i = 0; driver_map[i].driver; i++) { +@@ -1469,13 +1475,15 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info) + continue; + + if (driver_map[i].num_chips_ids == -1) { +- driver = strdup(driver_map[i].driver); ++ *dri_driver_ret = driver_map[i].driver; ++ *vdpau_driver_ret = driver_map[i].vdpau_driver; + goto out; + } + + for (j = 0; j < driver_map[i].num_chips_ids; j++) { + if (driver_map[i].chip_ids[j] == dev->deviceinfo.pci->device_id) { +- driver = strdup(driver_map[i].driver); ++ *dri_driver_ret = driver_map[i].driver; ++ *vdpau_driver_ret = driver_map[i].vdpau_driver; + goto out; + } + } +@@ -1487,9 +1495,9 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info) + dev->deviceinfo.pci->vendor_id, dev->deviceinfo.pci->device_id); + out: + drmFreeDevice(&dev); +- return driver; + #else +- return NULL; ++ *dri_driver_ret = NULL; ++ *vdpau_driver_ret = NULL; + #endif + } + +@@ -1610,7 +1618,8 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) + if (info->driverName) { + ds->driverNames[0] = info->driverName; + } else { +- ds->driverNames[0] = ds->driverNames[1] = dri2_probe_driver_name(pScreen, info); ++ dri2_probe_driver_name(pScreen, info, ++ &ds->driverNames[0], &ds->driverNames[1]); + if (!ds->driverNames[0]) + return FALSE; + } +diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +index da7ea1c1e..7036d1003 100644 +--- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h ++++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h +@@ -66,21 +66,22 @@ static const int vmwgfx_chip_ids[] = { + static const struct { + int vendor_id; + const char *driver; ++ const char *vdpau_driver; + const int *chip_ids; + int num_chips_ids; + } driver_map[] = { +- { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, +- { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, ++ { 0x8086, "i915", "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, ++ { 0x8086, "i965", "va_gl", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, + #ifndef DRIVER_MAP_GALLIUM_ONLY +- { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) }, +- { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) }, ++ { 0x1002, "radeon", "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) }, ++ { 0x1002, "r200", "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) }, + #endif +- { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) }, +- { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, +- { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, +- { 0x10de, "nouveau", NULL, -1 }, +- { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) }, +- { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, ++ { 0x1002, "r300", "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) }, ++ { 0x1002, "r600","r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, ++ { 0x1002, "radeonsi", "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, ++ { 0x10de, "nouveau", "nouveau", NULL, -1 }, ++ { 0x1af4, "virtio_gpu", "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) }, ++ { 0x15ad, "vmwgfx", "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, + { 0x0000, NULL, NULL, 0 }, + }; + +-- +2.19.0 + diff --git a/SOURCES/0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch b/SOURCES/0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch index e5d4c07..b7d333d 100644 --- a/SOURCES/0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch +++ b/SOURCES/0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch @@ -1,4 +1,4 @@ -From 13118f3052e870c3cef6260235b489a288df5a59 Mon Sep 17 00:00:00 2001 +From 1070ffa0953e9200688fc8fae11e3ab0680b86f2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 9 Oct 2018 12:28:48 -0400 Subject: [PATCH xserver] xfree86: LeaveVT from xf86CrtcCloseScreen @@ -10,7 +10,7 @@ Signed-off-by: Olivier Fourdan 1 file changed, 2 insertions(+) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 686cb51..710a41d 100644 +index 37a45bb3af..45d325f4d2 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -776,6 +776,8 @@ xf86CrtcCloseScreen(ScreenPtr screen) @@ -23,5 +23,5 @@ index 686cb51..710a41d 100644 xf86RotateCloseScreen(screen); -- -2.19.1 +2.19.0 diff --git a/SOURCES/0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch b/SOURCES/0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch index 1e0768b..aeed6f6 100644 --- a/SOURCES/0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch +++ b/SOURCES/0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch @@ -132,5 +132,5 @@ index 039dc4a4d..358d89f0f 100644 xf86Info.vtno = -1; return 0; -- -2.21.0 +2.18.4 diff --git a/SOURCES/0001-xfree86-ensure-the-readlink-buffer-is-null-terminate.patch b/SOURCES/0001-xfree86-ensure-the-readlink-buffer-is-null-terminate.patch new file mode 100644 index 0000000..3645d6c --- /dev/null +++ b/SOURCES/0001-xfree86-ensure-the-readlink-buffer-is-null-terminate.patch @@ -0,0 +1,34 @@ +From 71703e4e8bd00719eefad53c2ed6c604079f87ea Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 17 Oct 2018 09:00:59 +1000 +Subject: [PATCH xserver] xfree86: ensure the readlink buffer is + null-terminated + +Signed-off-by: Peter Hutterer +Reviewed-by: Dave Airlie +--- + hw/xfree86/fbdevhw/fbdevhw.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c +index 95089515c..f146ff4a4 100644 +--- a/hw/xfree86/fbdevhw/fbdevhw.c ++++ b/hw/xfree86/fbdevhw/fbdevhw.c +@@ -331,12 +331,12 @@ fbdev_open(int scrnIndex, const char *dev, char **namep) + + /* only touch non-PCI devices on this path */ + { +- char buf[PATH_MAX]; ++ char buf[PATH_MAX] = {0}; + char *sysfs_path = NULL; + char *node = strrchr(dev, '/') + 1; + + if (asprintf(&sysfs_path, "/sys/class/graphics/%s", node) < 0 || +- readlink(sysfs_path, buf, sizeof(buf)) < 0 || ++ readlink(sysfs_path, buf, sizeof(buf) - 1) < 0 || + strstr(buf, "devices/pci")) { + free(sysfs_path); + close(fd); +-- +2.19.1 + diff --git a/SOURCES/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch b/SOURCES/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch index 5ed3a37..be83429 100644 --- a/SOURCES/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch +++ b/SOURCES/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch @@ -1,16 +1,16 @@ -From f374410a00145d1703633547e90f10d43b3ded9f Mon Sep 17 00:00:00 2001 +From aa2f34d80ef3118eae0cce73b610c36cdcb978fe Mon Sep 17 00:00:00 2001 From: Ben Skeggs -Date: Thu, 27 Apr 2017 10:52:24 +1000 -Subject: [PATCH] xfree86: use modesetting driver by default on GeForce 8 and - newer +Date: Sat, 22 Apr 2017 02:26:28 +1000 +Subject: [PATCH xserver] xfree86: use modesetting driver by default on GeForce + 8 and newer Signed-off-by: Ben Skeggs --- - hw/xfree86/common/xf86pciBus.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) + hw/xfree86/common/xf86pciBus.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 682e723..2c36a3d 100644 +index 8158c2b62..78d1c947d 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -37,6 +37,7 @@ @@ -21,11 +21,10 @@ index 682e723..2c36a3d 100644 #include "os.h" #include "Pci.h" #include "xf86.h" -@@ -1146,8 +1147,29 @@ xf86VideoPtrToDriverList(struct pci_device *dev, - break; - case 0x10de: - case 0x12d2: -+ { +@@ -1190,6 +1191,25 @@ xf86VideoPtrToDriverList(struct pci_device *dev, + int idx = 0; + + #if defined(__linux__) || defined(__NetBSD__) + char busid[32]; + int fd; + @@ -45,12 +44,9 @@ index 682e723..2c36a3d 100644 + } + } + - driverList[0] = "nouveau"; - break; -+ } - case 0x1106: - driverList[0] = "openchrome"; - break; + driverList[idx++] = "nouveau"; + #endif + driverList[idx++] = "nv"; -- -1.8.3.1 +2.12.2 diff --git a/SOURCES/10-quirks.conf b/SOURCES/10-quirks.conf index c9b823c..47907d8 100644 --- a/SOURCES/10-quirks.conf +++ b/SOURCES/10-quirks.conf @@ -19,22 +19,6 @@ Section "InputClass" Option "IgnoreRelativeAxes" "off" EndSection -# https://bugzilla.redhat.com/show_bug.cgi?id=612140 -# please make Evoluent VerticalMouse 3 work out of the box -# Button mapping on this mouse is quirky -Section "InputClass" - Identifier "Evoluent VerticalMouse 3" - MatchProduct "Evoluent VerticalMouse 3" - # Sets following configuration: - # top button: left - # middle button: middle - # bottom button: right - # wheel click: middle - # thumb button: 8 (back) - Option "ButtonMapping" "1 2 2 4 5 6 7 3 8" -EndSection - - # https://bugs.freedesktop.org/show_bug.cgi?id=55867 # Bug 55867 - Doesn't know how to tag XI_TRACKBALL Section "InputClass" diff --git a/SOURCES/driver-abi-rebuild.sh b/SOURCES/driver-abi-rebuild.sh old mode 100755 new mode 100644 index cf0d065..693297b --- a/SOURCES/driver-abi-rebuild.sh +++ b/SOURCES/driver-abi-rebuild.sh @@ -5,10 +5,10 @@ builddir="abi-rebuild" -#if [ -e "$builddir" ]; then -# echo "Path '$builddir' exists. Move out of the way first" -# exit 1 -#fi +if [ -e "$builddir" ]; then + echo "Path '$builddir' exists. Move out of the way first" + exit 1 +fi mkdir -p $builddir pushd $builddir @@ -31,7 +31,7 @@ driverlist=$(grep ^Requires *.spec | awk '{ print $2 }') popd # Things not in -drivers for whatever reason... -extradrivers="xorg-x11-glamor xorg-x11-drv-ivtv" +extradrivers="xorg-x11-drv-ivtv" rm -rf xorg-x11-drivers echo $driverlist $extradrivers | xargs -n1 $pkg co $branch @@ -46,10 +46,6 @@ for i in xorg-x11-drv-*/ ; do #mockchain -r fedora-20-x86_64 -l $OLDPWD #mockchain -r rhel-7.0-candidate-x86_64 -l $OLDPWD - if [ $i = "xorg-x11-glamor" ]; then - koji wait-repo f21-build --build $($pkg verrel) - fi - popd done diff --git a/SOURCES/xserver-sdk-abi-requires.git b/SOURCES/xserver-sdk-abi-requires.git old mode 100755 new mode 100644 diff --git a/SOURCES/xserver-sdk-abi-requires.release b/SOURCES/xserver-sdk-abi-requires.release old mode 100755 new mode 100644 diff --git a/SOURCES/xvfb-run.sh b/SOURCES/xvfb-run.sh index 473688c..9d088c1 100644 --- a/SOURCES/xvfb-run.sh +++ b/SOURCES/xvfb-run.sh @@ -31,7 +31,7 @@ SERVERNUM=99 AUTHFILE= ERRORFILE=/dev/null STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" +XVFBARGS="-screen 0 640x480x24" LISTENTCP="-nolisten tcp" XAUTHPROTO=. @@ -142,7 +142,7 @@ if [ -z "$*" ]; then exit 2 fi -if ! which xauth >/dev/null; then +if ! type xauth >/dev/null; then error "xauth command not found" exit 3 fi diff --git a/SPECS/xorg-x11-server.spec b/SPECS/xorg-x11-server.spec index c63a4af..66ad4aa 100644 --- a/SPECS/xorg-x11-server.spec +++ b/SPECS/xorg-x11-server.spec @@ -8,7 +8,11 @@ # format, and add a PatchN: line. If you want to push something upstream, # check out the master branch, pull, cherry-pick, and push. -#global gitdate 20131118 +# X.org requires lazy relocations to work. +%undefine _hardened_build +%undefine _strict_symbol_defs_build + +#global gitdate 20161026 %global stable_abi 1 %if !0%{?gitdate} || %{stable_abi} @@ -17,7 +21,7 @@ %global ansic_major 0 %global ansic_minor 4 %global videodrv_major 24 -%global videodrv_minor 0 +%global videodrv_minor 1 %global xinput_major 24 %global xinput_minor 1 %global extension_major 10 @@ -41,8 +45,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.20.4 -Release: 10%{?gitdate:.%{gitdate}}%{?dist} +Version: 1.20.10 +Release: 1%{?gitdate:.%{gitdate}}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -51,8 +55,8 @@ Group: User Interface/X %if 0%{?gitdate} # git snapshot. to recreate, run: # ./make-git-snapshot.sh `cat commitid` -#Source0: xorg-server-%{gitdate}.tar.xz -Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 +Source0: xorg-server-%{gitdate}.tar.xz +#Source0: http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else @@ -74,96 +78,47 @@ Source31: xserver-sdk-abi-requires.git # maintainer convenience script Source40: driver-abi-rebuild.sh -# Sync with RHEL6.6 -Patch01: 0001-dix-Fix-GrabPointer-to-not-wrongly-succeed-on-redire.patch -Patch02: 0001-Enable-PAM-support.patch -Patch07: 0001-xf86AddBusDeviceToConfigure-Store-device-in-DevToCon.patch -Patch09: 0001-xfree86-Allow-mixed-fbdev-and-pci-setups.patch - -# RHEL-specific mustard -Patch100: 0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL7.patch -Patch101: 0001-Always-install-vbe-and-int10-sdk-headers.patch -Patch102: 0001-mustard-Enable-indirect-GLX-by-default.patch -Patch103: 06_use-intel-only-on-pre-gen4.diff -Patch104: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch -Patch105: 0001-xfree86-Don-t-autoconfigure-vesa-or-fbdev.patch - -# Trivial things to never merge upstream ever: -# This really could be done prettier. -Patch5004: 0001-autobind-GPUs-to-the-screen.patch -Patch5005: 0001-link-with-z-now.patch - -# Bug 1166989 - Tcl/tk Canvas draw error -Patch9423: RFC-mi-reduce-missing-segments-on-large-ellipse.patch -# Patch9504: 0001-rpath-hack.patch -Patch9710: 0001-modesetting-software-cursor-hack.patch - -# Bug 1599885 - RFE: enable backing store's Always mode -Patch9750: 0001-composite-Implement-backing-store-Always.patch -Patch9751: 0001-dix-Optimize-setting-backing-store-state.patch -Patch9752: 0001-composite-Remove-excess-compUnredirectWindow.patch -Patch9753: 0001-composite-Additional-paranoia-in-compDestroyDamage.patch - -#Patch9751: 0001-glamor_egl-Don-t-initialize-on-llvmpipe.patch -#Patch9752: 0001-xwayland-Don-t-initialize-glamor-on-llvmpipe.patch -#Patch9753: 0001-linux-Make-platform-device-probe-less-fragile.patch -Patch9754: 0001-xfree86-try-harder-to-span-on-multihead.patch -Patch9755: 0001-modesetting-Hide-atomic-behind-Option-Atomic-boolean.patch -Patch9756: 0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch -#Patch9757: 0001-Disable-logfile-and-modulepath-when-running-with-ele.patch - -# Startx will have segment fault with hyper-V environment -Patch9759: 0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch -Patch9760: 0001-linux-Make-platform-device-probe-less-fragile.patch -# ... which also needs https://gitlab.freedesktop.org/xorg/xserver/merge_requests/217 -Patch9761: 0001-linux-Fix-platform-device-PCI-detection-for-complex-.patch - -# Bug 1640207 - Qt5 scroll misbehaving after XTest button event -Patch9770: 0001-dix-leave-last.valuators-alone-on-slave-switch.patch - -# Bug 1612924 - upstream backport for allow monitors to be enabled connected -Patch9800: 0001-xf86-set-status-to-connected-for-monitors-enabled-in.patch - -# Bug 1680120 - upstream backport to fix user switching -Patch9900: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch - -# Bug 1763001 - Xorg.#.log show "(EE) modeset(0): [DRI2] No driver mapping found..." -Patch9910: 0001-dri2-Set-fallback-driver-names-for-Intel-and-AMD-chi.patch - -%global moduledir %{_libdir}/xorg/modules -%global drimoduledir %{_libdir}/dri -%global sdkdir %{_includedir}/xorg - -%ifarch s390 s390x -%global with_hw_servers 0 -%else -%global with_hw_servers 1 -%endif - -%if %{with_hw_servers} -%global enable_xorg --enable-xorg -%else -%global enable_xorg --disable-xorg -%endif +# From Debian use intel ddx driver only for gen4 and older chipsets +Patch1: 06_use-intel-only-on-pre-gen4.diff +# Default to xf86-video-modesetting on GeForce 8 and newer +Patch2: 0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch +Patch3: 0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch +Patch4: 0001-Always-install-vbe-and-int10-sdk-headers.patch +# Submitted upstream, but not going anywhere +Patch5: 0001-autobind-GPUs-to-the-screen.patch +# because the display-managers are not ready yet, do not upstream +Patch6: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch + +# RHEL mustard +Patch10: 0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL8.patch +Patch11: 0001-mustard-Add-DRI2-fallback-driver-mappings-for-i965-a.patch +#Patch11: 0001-Enable-PAM-support.patch +Patch12: 0001-link-with-z-now.patch +Patch14: 0001-xfree86-Don-t-autoconfigure-vesa-or-fbdev.patch +Patch15: 0001-xfree86-LeaveVT-from-xf86CrtcCloseScreen.patch +Patch16: 0001-xfree86-try-harder-to-span-on-multihead.patch +Patch18: 0001-mustard-Work-around-broken-fbdev-headers.patch + +# fix to be upstreamed +Patch100: 0001-linux-Make-platform-device-probe-less-fragile.patch +Patch102: 0001-xfree86-ensure-the-readlink-buffer-is-null-terminate.patch + +# fix already upstream +Patch200: 0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch +Patch201: 0001-linux-Fix-platform-device-PCI-detection-for-complex-.patch +Patch202: 0001-modesetting-Reduce-glamor-initialization-failed-mess.patch +Patch203: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch -%ifnarch %{ix86} x86_64 -%global no_int10 --disable-vbe --disable-int10-module -%endif - -%global kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev -%global xservers --enable-xvfb --enable-xnest --enable-dmx %{kdrive} %{enable_xorg} -%global wayland --enable-xwayland - -BuildRequires: pam-devel BuildRequires: systemtap-sdt-devel -BuildRequires: git-core +BuildRequires: git BuildRequires: automake autoconf libtool pkgconfig BuildRequires: xorg-x11-util-macros >= 1.17 -BuildRequires: xorg-x11-proto-devel >= 7.7-13 +BuildRequires: xorg-x11-proto-devel >= 7.7-10 BuildRequires: xorg-x11-font-utils >= 7.2-11 -BuildRequires: libepoxy-devel libxshmfence-devel -BuildRequires: xorg-x11-xtrans-devel >= 1.3.5 + +BuildRequires: dbus-devel libepoxy-devel systemd-devel +BuildRequires: xorg-x11-xtrans-devel >= 1.3.2 BuildRequires: libXfont2-devel libXau-devel libxkbfile-devel libXres-devel BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel BuildRequires: libX11-devel libXext-devel @@ -174,21 +129,25 @@ BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel BuildRequires: wayland-devel -BuildRequires: wayland-protocols-devel >= 1.5 +BuildRequires: wayland-protocols-devel +BuildRequires: pkgconfig(wayland-eglstream-protocols) BuildRequires: pkgconfig(wayland-client) >= 1.3.0 BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(xshmfence) >= 1.1 BuildRequires: libXv-devel BuildRequires: pixman-devel >= 0.30.0 -BuildRequires: libpciaccess-devel >= 0.13.1 openssl-devel byacc flex -BuildRequires: pkgconfig(libglvnd) pkgconfig(gl) pkgconfig(gbm) pkgconfig(egl) +BuildRequires: libpciaccess-devel >= 0.13.1 openssl-devel bison flex flex-devel +BuildRequires: mesa-libGL-devel >= 9.2 +BuildRequires: mesa-libEGL-devel +BuildRequires: mesa-libgbm-devel # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 kernel-headers - +BuildRequires: pam-devel BuildRequires: audit-libs-devel libselinux-devel >= 2.0.86-1 BuildRequires: libudev-devel -%if !0%{?rhel} # libunwind is Exclusive for the following arches %ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64 +%if !0%{?rhel} BuildRequires: libunwind-devel %endif %endif @@ -196,13 +155,10 @@ BuildRequires: libunwind-devel BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) -# All server subpackages have a virtual provide for the name of the server -# they deliver. The Xorg one is versioned, the others are intentionally -# unversioned. - %description X.Org X11 X server + %package common Summary: Xorg server common files Group: User Interface/X @@ -212,12 +168,15 @@ Requires: xkeyboard-config xkbcomp %description common Common files shared among all X servers. -%if %{with_hw_servers} + %package Xorg Summary: Xorg X server Group: User Interface/X Provides: Xorg = %{version}-%{release} Provides: Xserver +# HdG: This should be moved to the wrapper package once the wrapper gets +# its own sub-package: +Provides: xorg-x11-server-wrapper = %{version}-%{release} %if !0%{?gitdate} || %{stable_abi} Provides: xserver-abi(ansic-%{ansic_major}) = %{ansic_minor} Provides: xserver-abi(videodrv-%{videodrv_major}) = %{videodrv_minor} @@ -234,25 +193,29 @@ Obsoletes: xorg-x11-glamor < %{version}-%{release} Provides: xorg-x11-glamor = %{version}-%{release} Obsoletes: xorg-x11-drv-modesetting < %{version}-%{release} Provides: xorg-x11-drv-modesetting = %{version}-%{release} +# Dropped from F25 +Obsoletes: xorg-x11-drv-vmmouse < 13.1.0-4 Requires: xorg-x11-server-common >= %{version}-%{release} Requires: system-setup-keyboard - -%if 0%{?rhel} >= 7 -# 10-evdev.conf moved here in 7.4 -Conflicts: xorg-x11-drv-evdev < 2.10.5-1 +Requires: xorg-x11-drv-libinput +%ifnarch s390 s390x +Requires: xorg-x11-drv-fbdev +%ifarch x86_64 +Requires: xorg-x11-drv-vesa +%endif %endif +Requires: libEGL %description Xorg X.org X11 is an open source implementation of the X Window System. It provides the basic low level functionality which full fledged graphical user interfaces (GUIs) such as GNOME and KDE are designed upon. -%endif %package Xnest -Summary: A nested server. +Summary: A nested server Group: User Interface/X Requires: xorg-x11-server-common >= %{version}-%{release} Provides: Xnest @@ -264,6 +227,7 @@ but it is an X server itself in which you can run other software. It is a very useful tool for developers who wish to test their applications without running them on their real X server. + %package Xdmx Summary: Distributed Multihead X Server and utilities Group: User Interface/X @@ -280,8 +244,9 @@ each of which has a single display device attached to it. A complex application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays (each attached to one of 16 computers) into a unified 5120x4096 display. + %package Xvfb -Summary: A X Windows System virtual framebuffer X server. +Summary: A X Windows System virtual framebuffer X server Group: User Interface/X # xvfb-run is GPLv2, rest is MIT License: MIT and GPLv2 @@ -299,7 +264,7 @@ is normally used for testing servers. %package Xephyr -Summary: A nested server. +Summary: A nested server Group: User Interface/X Requires: xorg-x11-server-common >= %{version}-%{release} Provides: Xephyr @@ -319,29 +284,29 @@ Render and Composite. Summary: Wayland X Server Group: User Interface/X Requires: xorg-x11-server-common >= %{version}-%{release} +Requires: libEGL %description Xwayland Xwayland is an X server for running X clients under Wayland. -%if %{with_hw_servers} %package devel Summary: SDK for X server driver module development Group: User Interface/X Requires: xorg-x11-util-macros Requires: xorg-x11-proto-devel +Requires: libXfont2-devel Requires: pkgconfig pixman-devel libpciaccess-devel Provides: xorg-x11-server-static Obsoletes: xorg-x11-glamor-devel < %{version}-%{release} Provides: xorg-x11-glamor-devel = %{version}-%{release} - %description devel The SDK package provides the developmental files which are necessary for developing X server driver modules, and for compiling driver modules outside of the standard X11 source code tree. Developers writing video drivers, input drivers, or other X modules should install this package. -%endif + %package source Summary: Xserver source code required to build VNC server (Xvnc) @@ -351,6 +316,7 @@ BuildArch: noarch %description source Xserver source code needed to build VNC server (Xvnc) + %prep %autosetup -N -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} rm -rf .git @@ -360,7 +326,7 @@ cp %{SOURCE1} .gitignore %{expand:%__scm_setup_git -q} %autopatch -%if %{with_hw_servers} && 0%{?stable_abi} +%if 0%{?stable_abi} # check the ABI in the source against what we expect. getmajor() { grep -i ^#define.ABI.$1_VERSION hw/xfree86/common/xf86Module.h | @@ -383,67 +349,58 @@ test `getminor extension` == %{extension_minor} %endif -sed -i 's/MAXSCREENS\t16/MAXSCREENS\t32/g' include/misc.h -sed -i 's/MAXGPUSCREENS\t16/MAXGPUSCREENS\t32/g' include/misc.h -sed -i 's/MAXCLIENTS\t2048/MAXCLIENTS\t4096/g' include/misc.h -sed -i 's/LIMITCLIENTS\t256/LIMITCLIENTS\t1024/g' include/misc.h - %build -%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins" +export CFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1" +export CXXFLAGS="$RPM_OPT_FLAGS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1" +export LDFLAGS="$RPM_LD_FLAGS -specs=/usr/lib/rpm/redhat/redhat-hardened-ld" -%if %{with_hw_servers} -%global dri_flags --with-dri-driver-path=%{drimoduledir} --enable-dri --enable-dri2 --enable-dri3 --enable-glamor --enable-xshmfence -%else -# this is mostly for s390's sake, and should be unnecessary, but who wants to -# try fixing configure.ac? nobody, that's who. -%global dri_flags --disable-dri --disable-dri2 --disable-dri3 --disable-glamor +%ifnarch %{ix86} x86_64 +%global no_int10 --disable-vbe --disable-int10-module %endif -# ick -# sed -i 's/WAYLAND_SCANNER_RULES.*//g' configure.ac +%global kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev +%global xservers --enable-xvfb --enable-xnest %{kdrive} --enable-xorg +%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins" +%global dri_flags --enable-dri --enable-dri2 %{?!rhel:--enable-dri3} --enable-suid-wrapper --enable-glamor -# --with-pie ? autoreconf -f -v --install || exit 1 -# export CFLAGS="${RPM_OPT_FLAGS}" -# XXX without dtrace -%configure --enable-maintainer-mode %{xservers} \ - --enable-listen-tcp \ +%configure %{xservers} \ + --enable-dependency-tracking \ + --enable-xwayland-eglstream \ --disable-static \ --with-pic \ %{?no_int10} --with-int10=x86emu \ --with-default-font-path=%{default_font_path} \ - --with-module-dir=%{moduledir} \ + --with-module-dir=%{_libdir}/xorg/modules \ --with-builderstring="Build ID: %{name} %{version}-%{release}" \ --with-os-name="$(hostname -s) $(uname -r)" \ --with-xkb-output=%{_localstatedir}/lib/xkb \ - --with-fallback-input-driver=evdev \ --without-dtrace \ --disable-linux-acpi --disable-linux-apm \ --enable-xselinux --enable-record --enable-present \ - --enable-xcsecurity \ + --enable-xcsecurity \ --enable-config-udev \ --disable-unit-tests \ - %{?wayland} \ + --enable-dmx \ + --enable-xwayland \ %{dri_flags} %{?bodhi_flags} \ ${CONFIGURE} - + make V=1 %{?_smp_mflags} + %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir} +%make_install -%if %{with_hw_servers} -rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/multimedia/ mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input} -# yay pam mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d -install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps -touch $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/xserver +install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver +# restore this if/when restoring the PAM patch +#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps +#touch $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/xserver mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d @@ -452,8 +409,6 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d # relies on it more or less. mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d -mkdir -p $RPM_BUILD_ROOT%{_bindir} - %if %{stable_abi} install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires %else @@ -462,11 +417,12 @@ sed -e s/@MAJOR@/%{gitdate}/g -e s/@MINOR@/%{minor_serial}/g %{SOURCE31} > \ chmod 755 $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires %endif -%endif +install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run # Make the source package %global xserver_source_dir %{_datadir}/xorg-x11-server-source %global inst_srcdir %{buildroot}/%{xserver_source_dir} + mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}} mkdir -p %{inst_srcdir}/{hw/dmx/doc,man,doc,hw/dmx/doxygen} cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in @@ -478,34 +434,20 @@ cp {,%{inst_srcdir}/}hw/xfree86/Xorg.sh.in cp xkb/README.compiled %{inst_srcdir}/xkb cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86 -install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run - find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' | xargs tar cf - | (cd %{inst_srcdir} && tar xf -) -# SLEDGEHAMMER find %{inst_srcdir}/hw/xfree86 -name \*.c -delete -find %{inst_srcdir}/hw/xwayland -name \*.[ch] -delete # Remove unwanted files/dirs { find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : -%if !%{with_hw_servers} - rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc - rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4 - rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/xorg-server -%endif -# wtf %ifnarch %{ix86} x86_64 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/lib{int10,vbe}.so %endif } -%clean -rm -rf $RPM_BUILD_ROOT - %files common -%defattr(-,root,root,-) %doc COPYING %{_mandir}/man1/Xserver.1* %{_libdir}/xorg/protocol.txt @@ -519,13 +461,14 @@ rm -rf $RPM_BUILD_ROOT %global Xorgperms %attr(0711,root,root) %caps(cap_sys_admin,cap_sys_rawio,cap_dac_override=pe) %endif -%if %{with_hw_servers} +# restore the missingok one if/when restoring the PAM patch %files Xorg -%defattr(-,root,root,-) %config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver -%config(missingok) /etc/security/console.apps/xserver +#config(missingok) /etc/security/console.apps/xserver %{_bindir}/X -%{Xorgperms} %{_bindir}/Xorg +%{_bindir}/Xorg +%{_libexecdir}/Xorg +%{Xorgperms} %{_libexecdir}/Xorg.wrap %{_bindir}/cvt %{_bindir}/gtf %dir %{_libdir}/xorg @@ -549,24 +492,23 @@ rm -rf $RPM_BUILD_ROOT %endif %{_mandir}/man1/gtf.1* %{_mandir}/man1/Xorg.1* +%{_mandir}/man1/Xorg.wrap.1* %{_mandir}/man1/cvt.1* %{_mandir}/man4/fbdevhw.4* %{_mandir}/man4/exa.4* %{_mandir}/man4/modesetting.4* +%{_mandir}/man5/Xwrapper.config.5* %{_mandir}/man5/xorg.conf.5* %{_mandir}/man5/xorg.conf.d.5* %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_datadir}/X11/xorg.conf.d %{_datadir}/X11/xorg.conf.d/10-quirks.conf -%endif %files Xnest -%defattr(-,root,root,-) %{_bindir}/Xnest %{_mandir}/man1/Xnest.1* %files Xdmx -%defattr(-,root,root,-) %{_bindir}/Xdmx %{_bindir}/dmxaddinput %{_bindir}/dmxaddscreen @@ -585,823 +527,294 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xdmxconfig.1* %files Xvfb -%defattr(-,root,root,-) %{_bindir}/Xvfb %{_bindir}/xvfb-run %{_mandir}/man1/Xvfb.1* %files Xephyr -%defattr(-,root,root,-) %{_bindir}/Xephyr %{_mandir}/man1/Xephyr.1* %files Xwayland -%defattr(-,root,root,-) %{_bindir}/Xwayland -%if %{with_hw_servers} %files devel %doc COPYING -%defattr(-,root,root,-) #{_docdir}/xorg-server %{_bindir}/xserver-sdk-abi-requires %{_libdir}/pkgconfig/xorg-server.pc %dir %{_includedir}/xorg -%{sdkdir}/*.h +%{_includedir}/xorg/*.h %{_datadir}/aclocal/xorg-server.m4 -%endif %files source -%defattr(-, root, root, -) %{xserver_source_dir} -%changelog -* Wed Jan 08 2020 Adam Jackson - 1.20.4-10 -- Set fallback DRI2 driver names for Intel and AMD - -* Tue Aug 13 2019 Adam Jackson - 1.20.4-9 -- Fix a crash when destroying a redirected window with backing store - -* Wed Jun 19 2019 Adam Jackson - 1.20.4-8 -- Fix platform device PCI detection with complex bus topologies - -* Tue May 28 2019 Adam Jackson - 1.20.4-7 -- Fix a segfault with non-PCI platform devices (and other cases) - -* Mon May 06 2019 Ray Strode - 1.20.4-6 -- Stop VT switching when inactive server dies - Resolves: #1680120 - -* Thu Apr 25 2019 Adam Jackson - 1.20.4-5 -- Fix a crash in RRProviderAutoConfigGpuScreen -* Wed Apr 03 2019 Dave Airlie - 1.20.4-3 -- Backport fix for 1612924 - enabled monitors - -* Tue Apr 02 2019 Peter Hutterer 1.20.4-2 -- Don't reset last.valuators on slave device switch (#1640207) - -* Tue Mar 05 2019 Adam Jackson - 1.20.4-1 -- xserver 1.20.4 - -* Tue Feb 12 2019 Adam Jackson - 1.20.1-7 -- Sync platform probe patch with upstream - -* Fri Nov 23 2018 Olivier Fourdan - 1.20.1-6 -- Move LeaveVT after resetting randr pointers in xf86CrtcCloseScreen - -* Mon Oct 22 2018 Adam Jackson - 1.20.1-5.1 -- CVE-2018-14665: Disable -logfile and -modulepath when running with elevated - privileges - -* Tue Oct 09 2018 Adam Jackson - 1.20.1-5 -- Call LeaveVT from xf86CrtcCloseScreen - -* Fri Oct 05 2018 Adam Jackson - 1.20.1-4 -- Hide the modesetting driver's atomic ioctl support behind Option "Atomic" - -* Mon Sep 24 2018 Adam Jackson - 1.20.1-3 -- Try harder to come up with an initial spanning configuration - -* Wed Sep 19 2018 Adam Jackson - 1.20.1-2 -- Make platform device probe a bit less fragile -- Disable glamor on llvmpipe - -* Thu Aug 09 2018 Adam Jackson - 1.20.1-1 -- xserver 1.20.1 -- Enable backing store's Always mode - -* Thu Jul 19 2018 Peter Hutterer 1.20.0-2 -- Fix glx vendor hash table key size -- Fix memory corruption during PanoramiX setup (#1601742) - -* Tue Jul 10 2018 Adam Jackson - 1.20.0-1 -- Fix 16bpp with modesetting driver - -* Wed Jun 27 2018 Lyude Paul - 1.20.0-0.3 -- Add patches for bz1591978 - -* Wed Jun 27 2018 Lyude Paul - 1.20.0-0.2 -- Add patches for bz1585252 - -* Tue May 29 2018 Adam Jackson - 1.20.0-0.1 -- Initial 1.20 rebuild - -* Tue Feb 13 2018 Adam Jackson - 1.19.5-5 -- Fix fetching animated cursor images with the XFIXES extension - -* Mon Feb 12 2018 Olivier Fourdan - 1.19.5-4 -- Fix cursor issue with Xwayland and tablet. - -* Wed Feb 7 2018 Olivier Fourdan - 1.19.5-3 -- Fix "xvfb-run --auto-display" not working with xserver-1.19 - -* Mon Oct 23 2017 Adam Jackson - 1.19.5-2 -- Don't attempt to probe vesa or fbdev in X -configure +%changelog +* Thu Dec 10 2020 Adam Jackson - 1.20.10-1 +- xserver 1.20.10 + Resolves: #1891871 -* Thu Oct 12 2017 Adam Jackson - 1.19.5-1 -- xserver 1.19.5 +* Wed Dec 9 2020 Michel Dänzer - 1.20.8-10 +- modesetting: keep going if a modeset fails on EnterVT + Resolves: #1838392 -* Thu Oct 05 2017 Adam Jackson - 1.19.4-1 -- xserver 1.19.4 +* Mon Nov 16 2020 Adam Jackson - 1.20.8-9 +- CVE fix for: CVE-2020-14347 (#1862320) -* Thu Sep 28 2017 Olivier Fourdan - 1.19.3-13 -- Enable dri3 and Xwayland, backport Xwayland and glamor fixes +* Thu Oct 29 2020 Michel Dänzer - 1.20.8-8 +- CVE fixes for: CVE-2020-14345 (#1872391), CVE-2020-14346 (#1872395), + CVE-2020-14361 (#1872402), CVE-2020-14362 (#1872409) -* Fri Aug 25 2017 Adam Jackson - 1.19.3-12 +* Tue Oct 27 2020 Adam Jackson - 1.20.8-7 - Enable XC-SECURITY + Resolves: #1863142 -* Mon Jun 26 2017 Adam Jackson - 1.19.3-11 -- Fix off-by-one in X -configure - -* Mon Jun 26 2017 Adam Jackson - 1.19.3-10 -- Fix modesetting initialization on non-zero PCI domains - -* Mon Jun 19 2017 Adam Jackson - 1.19.3-9 -- Remove clients from input and output ready queues after closing - -* Mon Jun 19 2017 Adam Jackson - 1.19.3-8 -- Validate RANDR output property atoms +* Thu Aug 20 2020 Michel Dänzer - 1.20.8-6 +- xfree86: add drm modes on non-GTF panels + Resolves: #1823461 -* Mon Jun 12 2017 Adam Jackson - 1.19.3-7 -- Fix a crash in FixesGetCursor* +* Tue Aug 4 2020 Michel Dänzer - 1.20.8-5 +- xwayland: Hold a pixmap reference in struct xwl_present_event + Related: #1728684 +- glamor: Fix glamor_poly_fill_rect_gl xRectangle::width/height handling + Resolves: #1740250 -* Fri Jun 09 2017 Dave Airlie - 1.19.3-6 -- Don't crash on NULL cursor in modesetting driver (#1458361) +* Fri Jul 10 2020 Ray Strode - 1.20.8-4 +- Don't switch VTs in the exit path, if killed on inactive VT + Related: #1618481 -* Tue May 09 2017 Adam Jackson - 1.19.3-5 -- Fix software cursor fallback for the modesetting driver on server GPUs +* Fri Jun 26 2020 Michel Dänzer - 1.20.8-3 +- Downgrade modesetting "glamor initialization failed" X_ERROR → X_INFO + Resolves: #1724573 +- Xwayland / Present leak fixes for #1728684 -* Tue May 09 2017 Adam Jackson - 1.19.3-4 -- Fix performance problem in dashed arc drawing +* Wed Jun 10 2020 Michel Dänzer - 1.20.8-2 +- Re-enable Xwayland Present support + Resolves: #1728684, #1715676 +- Remove unused patch -* Thu Apr 27 2017 Ben Skeggs - 1.19.3-3 -- Default to modesetting driver on NVIDIA GeForce 8 and newer +* Tue May 26 2020 Adam Jackson - 1.20.8-1 +- xserver 1.20.8 -* Fri Apr 07 2017 Adam Jackson - 1.19.3-2 -- Fix Xephyr on servers with no XVideo extension +* Tue Feb 11 2020 Michel Dänzer - 1.20.6-3 +- Add fix for crash with Option "Rotate" in xorg.conf + Resolves: #1795328 -* Wed Mar 15 2017 Adam Jackson - 1.19.3-1 -- xserver 1.19.3 - -* Wed Mar 01 2017 Adam Jackson - 1.19.1-0.6 -- Default to modesetting driver on Intel gen4 and up - -* Mon Feb 20 2017 Adam Jackson - 1.19.1-0.5 -- Enable DRI3 -- Restore indirect GLX by default - -* Wed Feb 08 2017 Olivier Fourdan - 1.19.1-0.3 -- Reduce rounding errors in miComputeEllipseSpans() with large radius - Resolves: rhbz#1166989 - -* Tue Feb 07 2017 Adam Jackson - 1.19.1-0.2 -- Set default input driver to evdev - -* Wed Feb 01 2017 Adam Jackson - 1.19.1-0.1 -- xserver 1.19.1 - -* Mon Aug 8 2016 Hans de Goede - 1.17.2-22 -- Replace modesetting-Claim-PCI-devices-as-PCI-not-platform with a new patch - for the same issue, which also works properly with prime setups -- Resolves: rhbz#1353505 - -* Thu Aug 4 2016 Hans de Goede - 1.17.2-21 -- Add missing modesetting-Claim-PCI-devices-as-PCI-not-platform changes to - really allow prime and slave output support with the modesetting driver -- Resolves: rhbz#1353505 - -* Thu Aug 4 2016 Hans de Goede - 1.17.2-20 -- Add Prime and Reverse Prime support to the modesetting driver -- Resolves: rhbz#1353505 - -* Thu Jul 21 2016 Adam Jackson - 1.17.2-19 -- Fix Xephyr initialization against servers without XVideo extension - -* Thu Jul 14 2016 Adam Jackson - 1.17.2-18 -- Link GLX against Mesa's libGL explicitly -- Fix fallback driver sort order in X -configure - -* Tue Jun 28 2016 Peter Hutterer 1.17.2-17 -- Fix segfault after indicator update (#1083642) +* Wed Dec 11 2019 Michel Dänzer - 1.20.6-2 +- Add fixes for intermittent modesetting artifacts + Resolves: #1738670 -* Wed Jun 01 2016 Adam Jackson - 1.17.2-16 -- Enable IGLX by default and add xorg.conf option +* Mon Dec 9 2019 Olivier Fourdan - 1.20.6-1 +- xserver 1.20.6 -* Thu May 05 2016 Peter Hutterer 1.17.2-15 -- Force indicator update after layout change (#1083642) +* Tue Sep 03 2019 Adam Jackson - 1.20.3-11 +- Add DRI2 fallback driver mappings for i965 and radeonsi -* Fri Apr 29 2016 Peter Hutterer 1.17.2-14 -- Fix SlowKeys beep behavior (#1271089) +* Mon Aug 19 2019 Adam Jackson - 1.20.3-10 +- Backport glvnd vendor selection for prime render offloading -* Wed Apr 27 2016 Adam Jackson - 1.17.2-13 -- Fix memory leak in modesetting double-shadowfb code +* Fri Jul 12 2019 Adam Jackson - 1.20.3-8 +- Fix platform device PCI detection for complex bus topologies -* Thu Apr 21 2016 Adam Jackson 1.17.2-12 -- Fix missing symbol export +* Wed Apr 10 2019 Adam Jackson - 1.20.3-7 +- Don't require fbdev on s390x, where it doesn't exist -* Tue Mar 22 2016 Olivier Fourdan 1.17.2-11 -- Configurable number of clients (#1300957) +* Wed Apr 03 2019 Adam Jackson - 1.20.3-6 +- Add Requires: fbdev (and on x86_64, vesa) to Xorg subpackage -* Thu Oct 08 2015 Adam Jackson 1.17.2-10 -- Make -devel Prov/Obs xorg-x11-glamor-devel +* Mon Jan 14 2019 Ben Crocker - 1.20.3-5 +- Add Eric Anholt's patch e50c85f4ebf559 from upstream: +- Fix segfault on probing a non-PCI platform device on a system with PCI +- NOTE: also pertains on a system with no PCI, e.g. s390x. + Resolves: #1652013 -* Thu Oct 01 2015 Adam Jackson 1.17.2-9 -- Fix X -configure with the modesetting driver - -* Thu Aug 20 2015 Adam Jackson 1.17.2-8 -- Add 32->24bpp downconversion and tile-based double buffering to the - shadow framebuffer support in modesetting - -* Tue Aug 11 2015 Adam Jackson 1.17.2-7 -- Fix initial cursor setup's fallback to software cursor - -* Mon Aug 10 2015 Adam Jackson 1.17.2-6 -- Fix glamor crash in software fallback on prime systems - -* Tue Aug 04 2015 Ray Strode 1.17.2-5 -- Unconditionally enable GLX_MESA_copy_sub_buffer - -* Wed Jul 29 2015 Adam Jackson 1.17.2-4 -- Fix GLX extension setup with swrast - -* Tue Jul 21 2015 Adam Jackson 1.17.2-3 -- xserver 1.17.2 - -* Tue Jun 02 2015 Dave Airlie 1.17.1-0.6 -- fix overlapping glamor composite operations - -* Thu May 28 2015 Adam Jackson 1.17.1-0.5 -- Restore RHEL7 listen-on-tcp defaults - -* Mon May 18 2015 Olivier Fourdan 1.17.1-0.4 -- Add a new command line option "--auto-display" to xvfb-run to take - advantage of the XServer's "-displayfd" option to get the display - number directly from Xfvb - -* Wed May 06 2015 Olivier Fourdan 1.17.1-0.3 -- Add missing hw/xfree86/Xorg.sh.in to xorg-x11-server-source package. - This is needed to build packages depending on xorg-x11-server-source - (e.g. tigervnc), otherwise the build will fail. - -* Wed Apr 15 2015 Adam Jackson 1.17.1-0.2 -- Sync with F22 - -* Wed Mar 25 2015 Adam Jackson 1.17.1-0.1 -- xserver 1.17.1 - -* Fri Feb 06 2015 Peter Hutterer 1.15.0-33 -- CVE fixes for CVE-2015-0255 +* Mon Jan 07 2019 Olivier Fourdan - 1.20.3-4 +- Move LeaveVT after resetting randr pointers in xf86CrtcCloseScreen -* Wed Jan 21 2015 Adam Jackson 1.15.0-32 -- Fix fallback driver probe order -- Fix a crash in X -configure +* Mon Nov 19 2018 Adam Jackson - 1.20.3-3 +- Apply even more -z now and -pie -* Mon Jan 05 2015 Adam Jackson 1.15.0-31 -- Amend the CVE-2014-8092-3 patch to be legal C++, fixes tigervnc build +* Mon Nov 19 2018 Ray Strode - 1.20.3-2 +- Fix crash in Xephyr on server reset + Resolves: #1650168 -* Mon Dec 08 2014 Dave Airlie 1.15.0-30 -- Fix a lot of CVEs all over the X server. +* Tue Nov 13 2018 Adam Jackson - 1.20.3-1 +- xserver 1.20.3 +- Also forget about DRI driver names for drivers we're not shipping -* Mon Oct 06 2014 Dave Airlie 1.15.0-29 -- dri2 fixes backport - part of the fix for prime not working with SNA +* Fri Oct 26 2018 Adam Jackson - 1.20.2-5 +- Work around broken fbdev headers -* Thu Sep 25 2014 Adam Jackson 1.15.0-28 -- Fix graphics-exposure generation on CopyArea from window to pixmap with - Xinerama active +* Mon Oct 22 2018 Adam Jackson - 1.20.2-4 +- Back out the PAM patch, may not be necessary in 8 -* Wed Sep 17 2014 Adam Jackson 1.15.0-27 -- Link Xorg as a PIE +* Wed Oct 17 2018 Peter Hutterer 1.20.2-3 +- Backport fix for readlink call from master -* Wed Sep 17 2014 Adam Jackson 1.15.0-26 -- In the PCI probe logic, don't try to load drivers RHEL7 doesn't ship. +* Tue Oct 16 2018 Adam Jackson - 1.20.2-2 +- Avoid drmSetInterfaceVersion in platform device probe +- Backport a misparenthesis fix from master -* Thu Sep 11 2014 Dave Airlie 1.15.0-25 -- backport ppc64le arch fix. +* Mon Oct 15 2018 Adam Jackson - 1.20.2-1 +- xserver 1.20.2 -* Wed Sep 10 2014 Adam Jackson 1.15.0-24 -- Fix PAM magic in %%install +* Mon Oct 15 2018 Olivier Fourdan > - 1.20.1-4 +- Some more RHEL mustard: + - Disable Present support in Xwayland (rhbz#1638463) -* Tue Sep 09 2014 Adam Jackson 1.15.0-23 -- Drop vestigial xwayland patch series -- Sync with RHEL6.6: - - Fix GrabPointer to not wrongly succeed on redirected windows +* Fri Oct 12 2018 Adam Jackson - 1.20.1-3 +- Assorted RHEL mustard: + - Don't probe for drivers we're not shipping - Enable PAM - - Xephyr fixes for hardware cursor, 8bpp emulation, and initial size - - Xorg fixes for X -configure and mixed pci/fbdev setups - - Remove invalid bug checks - - Emit DeviceChanged after grab deactivation -- Rediff some things to match the above -- Inflate Release to be ahead of RHEL 6.6 + - Link Xorg with -z now + - Nerf modesetting's atomic ioctl support + - Don't autoconfigure vesa or fbdev from X -configure + - Call LeaveVT on RANDR's CloseScreen path so we drop drm master + - Try harder to get initial spanning desktop if the output's + preferred mode was filtered away +- Sync va_gl/vdpau patch from F29 -* Thu Aug 07 2014 Peter Hutterer 1.15.0-8 -- Push the XKB locked state to the attached slaves to keep keyboard LEDs in - sync (#1047921) -- Discard events from disabled devices to prevent crash on VT-switch or - shutdown (#1095964) +* Thu Sep 13 2018 Dave Airlie - 1.20.1-2 +- build with PIE flags -* Thu Feb 27 2014 Jérôme Glisse 1.15.0-7 -- Do not open tty on non seat0 (#1053063) - -* Tue Feb 25 2014 Adam Jackson 1.15.0-6 -- Fix dist tag -- Link Xorg with -z now - -* Sat Feb 22 2014 Dave Airlie 1.15.0-5 -- fix slave outputs being set as primary (#1067786) - -* Thu Feb 13 2014 Peter Hutterer 1.15.0-4 -- Fix button state check (#1061541) - -* Wed Feb 12 2014 Adam Jackson 1.15.0-3.1 -- Mass rebuild - -* Wed Feb 05 2014 Adam Jackson 1.15.0-3 -- Be sure to not link Xorg against libGL, just libglx. - -* Tue Jan 14 2014 Adam Jackson 1.15.0-2 -- exa-only-draw-valid-trapezoids.patch: Fix crash in exa. - -* Mon Jan 13 2014 Adam Jackson 1.15.0-1 -- xserver 1.15.0 - -* Tue Dec 17 2013 Adam Jackson 1.14.99.904-1 -- 1.15RC4 -- Re-disable int10 on arm - -* Mon Dec 2 2013 Peter Robinson 1.14.99.902-2 -- Add aarch64 to platforms that have libunwind - -* Wed Nov 20 2013 Adam Jackson 1.14.99.902-1 -- 1.15RC2 - -* Mon Nov 18 2013 Adam Jackson 1.14.99.901-6 -- Prefer fbdev to vesa, fixes fallback path on UEFI - -* Fri Nov 08 2013 Adam Jackson 1.14.99.901-5 -- Restore XkbCopyDeviceKeymap for (older) tigervnc - -* Fri Nov 08 2013 Adam Jackson 1.14.99.901-4 -- Explicitly enable DRI2 - -* Thu Nov 07 2013 Adam Jackson 1.14.99.901-3 -- Merge Xinerama+{Damage,Render,Composite} fix series - -* Thu Nov 07 2013 Adam Jackson 1.14.99.901-2 -- Fix build with --disable-present - -* Thu Nov 07 2013 Adam Jackson 1.14.99.901-1 -- 1.15RC1 - -* Mon Oct 28 2013 Adam Jackson 1.14.99.3-2 -- Don't build xwayland in RHEL - -* Fri Oct 25 2013 Adam Jackson 1.14.99.3-1 -- xserver 1.14.99.3 -- xwayland branch refresh -- Drop some F17-era Obsoletes -- Update BuildReqs to match reality - -* Wed Oct 23 2013 Peter Hutterer 1.14.3-6 -- Fix Xdmx cursor jumps (#1019821) - -* Tue Oct 08 2013 Adam Jackson 1.14.3-5 -- Snap wayland damage reports to the bounding box - -* Thu Oct 03 2013 Adam Jackson 1.14.3-4 -- Fix up fixing up the driver list after filtering out non-wayland - -* Wed Oct 02 2013 Adam Jackson 1.14.3-3 -- Only look at wayland-capable drivers when run with -wayland - -* Mon Sep 23 2013 Adam Jackson 1.14.3-2 -- xwayland support - -* Mon Sep 16 2013 Peter Hutterer 1.14.3-1 -- xserver 1.14.3 - -* Tue Jul 30 2013 Peter Hutterer 1.14.2-9 -- Fix active touch grabs, second touchpoint didn't get sent to client -- Fix version mismatch for XI 2.2+ clients (where a library supports > 2.2 - but another version than the originally requested one). - -* Tue Jul 30 2013 Dave Airlie 1.14.2-8 -- fixes for multi-monitor reverse optimus - -* Mon Jul 22 2013 Peter Hutterer 1.14.2-7 -- Fix erroneous valuator 1 coordinate when an absolute device in relative - mode doesn't send y coordinates. - -* Fri Jul 19 2013 Peter Hutterer 1.14.2-6 -- Add new version of the resolution-based scaling patch - scale y down - instead of x up. That gives almost the same behaviour as current - synaptics. Drop the synaptics quirk, this needs to be now removed from the - driver. - -* Mon Jul 15 2013 Peter Hutterer 1.14.2-5 -- Fix logspam when trying to free a non-existant grab. -- Update touch patch to upstream version (from fdo #66720) -- re-add xephyr resizable patch, got lost in rebase (#976995) - -* Fri Jul 12 2013 Dave Airlie 1.14.2-4 -- reapply dropped patch to fix regression (#981953) - -* Tue Jul 09 2013 Peter Hutterer 1.14.2-3 -- Fix crash on 32-bit with virtual box guest additions (#972095) - -* Tue Jul 09 2013 Peter Hutterer 1.14.2-2 -- Fix crash in gnome-shell when tapping a menu twice (fdo #66720) - -* Thu Jul 04 2013 Peter Hutterer 1.14.2-1 -- xorg-server 1.4.2 -- drop merged patches -- Add a quirk to set the synaptics resolution to 0 by default. The pre-scale - patch in the server clashes with synaptics inaccurate resolution numbers, - causing the touchpad movement to be stunted. - -* Thu Jun 06 2013 Peter Hutterer 1.14.1.901-2 -- Backport the touch grab race condition patches from fdo #56578 - -* Thu Jun 06 2013 Peter Hutterer 1.14.1.901-1 -- xserver 1.14.2RC1 - -* Tue Jun 04 2013 Peter Hutterer 1.14.1-4 -- Update quirks for trackballs and the La-VIEW Technology Naos 5000 mouse - -* Sun Jun 02 2013 Adam Jackson 1.14.1-3 -- Backport an arm/ppc crash fix from master (#965749) - -* Tue May 14 2013 Peter Hutterer 1.14.1-2 -- Add -resizeable option to Xephyr, enable by default (#962572) -- Fix crash on 24bpp host server (#518960) - -* Mon May 06 2013 Dave Airlie 1.14.1-1 -- upstream rebase -- reorganise the randr/gpu screen patches + backports - -* Wed Apr 17 2013 Peter Hutterer 1.14.0-6 -- CVE-2013-1940: Fix xf86FlushInput() to drain evdev events - (#950438, #952949) - -* Fri Apr 12 2013 Dave Airlie 1.14.0-5 -- reenable reverse optimus and some missing patch from F18 - -* Fri Apr 12 2013 Dave Airlie 1.14.0-4 -- fix bug with GPU hotplugging while VT switched -- reenable reverse optimus and some missing patch from F18 - -* Fri Mar 22 2013 Dan Horák 1.14.0-3 -- libunwind exists only on selected arches - -* Thu Mar 14 2013 Adam Jackson 1.14.0-2 -- Different RHEL customization - -* Thu Mar 07 2013 Peter Hutterer 1.14.0-1 -- xserver 1.14 - -* Wed Mar 06 2013 Peter Hutterer 1.13.99.902-2 -- Use libunwind for backtraces - -* Fri Feb 15 2013 Adam Jackson -- Drop -sdk Prov/Obs, changed to -devel in F9 -- Drop xorg-x11-X* Obsoletes, leftover from the modular transition in FC5 - -* Fri Feb 15 2013 Peter Hutterer 1.13.99.902-1 -- xserver 1.14RC2 from git - -* Thu Feb 14 2013 Peter Hutterer 1.13.99.901-5 -- Fix scrolling for Evoluent Vertical Mouse 3 (#612140#c20) - -* Fri Jan 25 2013 Peter Hutterer 1.13.99.901-4 -- Add quirk for Evoluent Vertical Mouse 3, button mapping is quirky - (#612140) - -* Wed Jan 23 2013 Adam Jackson 1.13.99.901-3 -- Bump XI minor for barriers - -* Wed Jan 09 2013 Adam Jackson 1.13.99.901-2 -- Pick up fixes from git - -* Wed Jan 09 2013 Adam Jackson 1.13.99.901-1 -- xserver 1.14RC1 - -* Tue Dec 18 2012 Peter Hutterer 1.13.1-1 -- server 1.13.1 - -* Fri Dec 14 2012 Adam Jackson 1.13.0-15 -- Cherry-pick a fix for selection for TouchBegin from multiple clients - -* Wed Dec 12 2012 Dave Airlie 1.13.0-14 -- add events for autoconfig of gpus devices, allow usb devices to notify gnome - -* Wed Dec 12 2012 Dave Airlie 1.13.0-13 -- fix hotplug issue with usb devices and large screens - -* Wed Dec 12 2012 Dave Airlie 1.13.0-11 -- Bump default EQ length to reduce the number of unhelpful abrt reports - -* Wed Nov 28 2012 Adam Jackson 1.13.0-10 -- Fix VT switch key handling - -* Wed Nov 28 2012 Peter Hutterer 1.13.0-9 -- Fix server crash when a XI 1.x device grab is activated on a disabled - synaptics touchpad is disabled - -* Tue Nov 27 2012 Jiri Kastner 1.13.0-8 -- Fix for non-PCI configuration-less setups - -* Wed Oct 31 2012 Peter Hutterer 1.13.0-7 -- Fix build issues on new kernels caused by removal of _INPUT_H - -* Tue Oct 30 2012 Peter Hutterer 1.13.0-6 -- Add touchscreen fixes (including pointer emulation) #871064 - -* Tue Sep 25 2012 Dave Airlie 1.13.0-6 -- update server autobind patch to fix crash reported on irc - -* Thu Sep 20 2012 Peter Hutterer 1.13.0-5 -- Set the transformation matrix to the unity matrix to avoid spurious cursor - jumps (#852841) - -* Fri Sep 14 2012 Dave Airlie 1.13.0-4 -- fix bug when hotplugging a monitor causes oops - -* Mon Sep 10 2012 Dave Airlie 1.13.0-3 -- fix race across GPU power down and server startup - -* Mon Sep 10 2012 Dave Airlie 1.13.0-2 -- fix compat output segfault on output less gpus. - -* Fri Sep 07 2012 Dave Airlie 1.13.0-1 -- rebase to upstream 1.13.0 release tarball - -* Fri Sep 07 2012 Dave Airlie 1.12.99.905-5 -- fix prime offload with DRI2 compositors - -* Mon Sep 03 2012 Dave Airlie 1.12.99.905-4 -- fix multi-gpu after VT switch - -* Mon Aug 27 2012 Dave Airlie 1.12.99.905-3 -- port multi-seat video fixes from upstream - -* Fri Aug 24 2012 Dave Airlie 1.12.99.905-2 -- reintroduce auto config but working this time -- fix two recycle/exit crashes - -* Wed Aug 22 2012 Dave Airlie 1.12.99.905-1 -- rebase to 1.12.99.905 snapshot - -* Fri Aug 17 2012 Dave Airlie 1.12.99.904-4 -- autobind was horribly broken on unplug - drop it like its hotplug. - -* Fri Aug 17 2012 Dave Airlie 1.12.99.904-3 -- add git fixes + autobind to gpu devices. - -* Wed Aug 15 2012 Adam Jackson 1.12.99.904-2 -- Always install int10 and vbe sdk headers - -* Wed Aug 08 2012 Dave Airlie 1.12.99.904-1 -- rebase to 1.12.99.904 snapshot - -* Fri Aug 03 2012 Adam Jackson 1.12.99.903-6 -- Make failure to iopl non-fatal - -* Mon Jul 30 2012 Adam Jackson 1.12.99.903-5 -- No need to --disable-xaa explicitly anymore. - -* Thu Jul 26 2012 Adam Jackson 1.12.99.903-4 -- Install xserver-sdk-abi-requires.release based on stable_abi not gitdate, - so drivers built against a server that Provides multiple ABI versions will - Require the stable version. - -* Thu Jul 26 2012 Adam Jackson 1.12.99.903-3 -- Make it possible to Provide: both stable and gitdate-style ABI versions. - -* Thu Jul 26 2012 Peter Hutterer 1.12.99.903-2 -- xserver-1.12-os-print-newline-after-printing-display-name.patch: drop, - 014ad46f1b353a95e2c4289443ee857cfbabb3ae - -* Thu Jul 26 2012 Dave Airlie 1.12.99.903-1 -- rebase to 1.12.99.903 snapshot - -* Wed Jul 25 2012 Dave Airlie 1.12.99.902-3 -- fix crash due to GLX being linked twice - -* Sun Jul 22 2012 Fedora Release Engineering - 1.12.99.902-2.20120717 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jul 18 2012 Dave Airlie 1.12.99.902-1 -- server 1.12.99.902 - -* Mon Jul 09 2012 Peter Hutterer 1.12.3-1 -- server 1.12.3 - -* Tue Jun 26 2012 Peter Hutterer 1.12.2-4 -- send keycode/event type down the wire when SlowKeys enable, otherwise - GNOME won't warn about it (#816764) - -* Thu Jun 21 2012 Peter Hutterer 1.12.2-3 -- print newline after printing $DISPLAY to -displayfd (#824594) - -* Fri Jun 15 2012 Dan Horák 1.12.2-2 -- fix build without xorg (aka s390x) - -* Wed May 30 2012 Peter Hutterer 1.12.2-1 -- xserver 1.12.2 - -* Fri May 25 2012 Dave Airlie 1.12.1-2 -- xserver-fix-pci-slot-claims.patch: backport slot claiming fix from master -- xserver-1.12-modesetting-fallback.patch: add modesetting to fallback list - -* Mon May 14 2012 Peter Hutterer -- Drop xserver-1.10.99.1-test.patch: - cd89482088f71ed517c2e88ed437e4752070c3f4 fixed it - -* Mon May 14 2012 Peter Hutterer 1.12.1-1 -- server 1.12.1 -- force autoreconf to avoid libtool errors -- update patches for new indentation style. - -* Mon May 14 2012 Peter Hutterer 1.12.0-6 -- Make timers signal-safe (#814869) - -* Sun May 13 2012 Dennis Gilmore 1.12.0-5 -- enable vbe on arm arches - -* Thu Apr 26 2012 Adam Jackson 1.12.0-4 -- Obsolete some old video drivers in F18+ - -* Wed Mar 21 2012 Adam Jackson 1.12.0-3 -- Tweak arches for RHEL - -* Wed Mar 14 2012 Adam Jackson 1.12.0-2 -- Install Xorg mode 4755, there's no security benefit to 4711. (#712432) - -* Mon Mar 05 2012 Peter Hutterer 1.12.0-1 -- xserver 1.12 -- xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch: - drop, 6f2838818 - -* Thu Feb 16 2012 Adam Jackson 1.11.99.903-2.20120215 -- Don't pretend int10 is a thing on non-PC arches - -* Thu Feb 16 2012 Peter Hutterer 1.11.99.903-1.20120215 -- Server version is 1.11.99.903 now, use that. +* Thu Aug 09 2018 Adam Jackson - 1.20.1-1 +- xserver 1.20.1 -* Wed Feb 15 2012 Peter Hutterer 1.11.99.901-7.20120215 -- Today's git snapshot +* Sat Jul 14 2018 Fedora Release Engineering - 1.20.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Sun Feb 12 2012 Peter Hutterer 1.11.99.901-6.20120124 -- Fix installation of xserver-sdk-abi-requires script, if stable_abi is set - always install the relese one, not the git one +* Tue Jun 12 2018 Adam Jackson - 1.20.0-4 +- Xorg and Xwayland Requires: libEGL -* Sat Feb 11 2012 Peter Hutterer 1.11.99.901-5.20120124 -- ABI is considered stable now: - video 12.0, input 16.0, extension 6.0, font 0.6, ansic 0.4 +* Fri Jun 01 2018 Adam Williamson - 1.20.0-3 +- Backport fixes for RHBZ#1579067 -* Sat Feb 11 2012 Peter Hutterer 1.11.99.901-4.20120124 -- xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch: - reset last.scroll on the device whenever the slave device switched to - avoid jumps during scrolling (#788632). +* Wed May 16 2018 Adam Jackson - 1.20.0-2 +- Xorg Requires: xorg-x11-drv-libinput -* Tue Jan 24 2012 Peter Hutterer 1.11.99.901-3.20120124 -- Today's git snapshot -- xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b +* Thu May 10 2018 Adam Jackson - 1.20.0-1 +- xserver 1.20 -* Wed Jan 04 2012 Peter Hutterer 1.11.99.901-2.20120103 -- xserver-1.12-Xext-fix-selinux-build-failure.patch: fix build error - triggered by Red Hat-specific patch to libselinux +* Wed Apr 25 2018 Adam Jackson - 1.19.99.905-2 +- Fix xvfb-run's default depth to be 24 -* Tue Jan 03 2012 Peter Hutterer 1.11.99.901-1.20120103 -- Git snapshot 98cde254acb9b98337ddecf64c138d38c14ec2bf -- xserver-1.11.99-optionstr.patch: drop -- 0001-Xext-don-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch: drop +* Tue Apr 24 2018 Adam Jackson - 1.19.99.905-1 +- xserver 1.20 RC5 -* Fri Dec 16 2011 Adam Jackson 1.11.99.1-11 -- Always install XAA SDK headers so drivers still build +* Thu Apr 12 2018 Olivier Fourdan - 1.19.99.904-2 +- Re-fix "use type instead of which in xvfb-run (rhbz#1443357)" which + was overridden inadvertently -* Thu Dec 15 2011 Adam Jackson 1.11.99.1-10 -- --disable-xaa +* Tue Apr 10 2018 Adam Jackson - 1.19.99.904-1 +- xserver 1.20 RC4 -* Thu Dec 01 2011 Adam Jackson 1.11.99.1-9 -- xserver-1.8-disable-vboxvideo.patch: Drop, should be fixed now -- Drop vesamodes and extramodes, rhpxl is no more -- Stop building libxf86config, pyxf86config will be gone soon +* Mon Apr 02 2018 Adam Jackson - 1.19.99.903-1 +- xserver 1.20 RC3 -* Tue Nov 29 2011 Dave Airlie 1.11.99.1-8 -- put optionstr.h into devel package +* Tue Feb 13 2018 Olivier Fourdan 1.19.6-5 +- xwayland: avoid race condition on new keymap +- xwayland: Keep separate variables for pointer and tablet foci (rhbz#1519961) +- xvfb-run now support command line option “--auto-display” -* Mon Nov 21 2011 Adam Jackson 1.11.99.1-7 -- Restore DRI1 until drivers are properly prepared for it +* Fri Feb 09 2018 Fedora Release Engineering - 1.19.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Thu Nov 17 2011 Adam Jackson 1.11.99.1-6 -- Disable DRI1 +* Tue Jan 30 2018 Olivier Fourdan 1.19.6-3 +- Avoid generating a core file when the Wayland compositor is gone. -* Wed Nov 16 2011 Adam Jackson 1.11.99.1-5 -- Obsolete some dead input drivers. +* Thu Jan 11 2018 Peter Hutterer 1.19.6-2 +- Fix handling of devices with ID_INPUT=null -* Mon Nov 14 2011 Adam Jackson 1.11.99.1-3 -- Fix permissions on abi script when doing git snapshots +* Wed Dec 20 2017 Adam Jackson - 1.19.6-1 +- xserver 1.19.6 -* Wed Nov 09 2011 Peter Hutterer 1.11.99.1-1.20111109 -- Update to today's git snapshot -- xserver-1.6.1-nouveau.patch: drop, upstream -- xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch: drop, - upstream -- 0001-dix-block-signals-when-closing-all-devices.patch: drop, upstream +* Thu Oct 12 2017 Adam Jackson - 1.19.5-1 +- xserver 1.19.5 -* Wed Nov 09 2011 Adam Jackson -- Change the ABI magic for snapshots +* Thu Oct 05 2017 Olivier Fourdan - 1.19.4-1 +- xserver-1.19.4 +- Backport tablet support for Xwayland -* Mon Oct 24 2011 Peter Hutterer 1.11.1-2 -- Block signals when removing all input devices #737031 +* Fri Sep 08 2017 Troy Dawson - 1.19.3-9 +- Cleanup spec file conditionals -* Thu Oct 13 2011 Adam Jackson -- Drop some Requires >= on things where we had newer versions in F14. +* Thu Aug 03 2017 Fedora Release Engineering - 1.19.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild -* Mon Sep 26 2011 Adam Jackson 1.11.1-1 -- xserver 1.11.1 +* Thu Jul 27 2017 Fedora Release Engineering - 1.19.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Mon Sep 12 2011 Adam Tkac 1.11.0-2 -- ship more files in the -source subpkg +* Sun Jul 2 2017 Ville Skyttä - 1.19.3-6 +- Use type instead of which in xvfb-run (rhbz#1443357) -* Tue Sep 06 2011 Adam Jackson 1.11.0-1 -- xserver 1.11.0 +* Thu May 04 2017 Orion Poplawski - 1.19.3-5 +- Enable full build for s390/x -* Thu Aug 18 2011 Adam Jackson 1.10.99.902-1.20110818 -- xserver 1.11rc2 +* Mon Apr 24 2017 Ben Skeggs - 1.19.3-4 +- Default to xf86-video-modesetting on GeForce 8 and newer -* Fri Jul 29 2011 Dave Airlie 1.10.99.1-10.2011051 -- xvfb-run requires xauth installed, fix requires (from jlaska on irc) +* Fri Apr 07 2017 Adam Jackson - 1.19.3-3 +- Inoculate against a versioning bug with libdrm 2.4.78 -* Wed Jul 27 2011 Peter Hutterer 1.10.99.1-9.20110511 -- Add support for multi-seat support from the config/udev backend. +* Thu Mar 23 2017 Hans de Goede - 1.19.3-2 +- Use va_gl as vdpau driver on i965 GPUs (rhbz#1413733) -* Wed Jun 29 2011 Dan Horák 1.10.99.1-8.20110511 -- don't build tests when --disable-xorg is used like on s390(x) +* Wed Mar 15 2017 Adam Jackson - 1.19.3-1 +- xserver 1.19.3 -* Tue Jun 21 2011 Adam Jackson 1.10.99.1-7.20110511 -- BuildRequires: systemtap-sdt-devel, configure --with-dtrace +* Thu Mar 02 2017 Adam Jackson - 1.19.2-1 +- xserver 1.19.2 -* Wed May 11 2011 Adam Tkac 1.10.99.1-6.20110511 -- include hw/dmx/doc/doxygen.conf.in in the -source subpkg +* Sat Feb 11 2017 Fedora Release Engineering - 1.19.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Mon May 09 2011 1.10.99.1-5.20110511 -- Today's server from git -- xserver-1.10-fix-trapezoids.patch: drop, c6cb70be1ed7cf7 -- xserver-1.10-glx-pixmap-crash.patch: drop, 6a433b67ca15fd1 -- xserver-1.10-bg-none-revert.patch: drop, dc0cf7596782087 +* Wed Feb 01 2017 Peter Hutterer 1.19.1-3 +- Fix a few input thread lock issues causing intel crashes (#1384486) -* Thu Apr 21 2011 Hans de Goede 1.10.99.1-4.20110418 -- Drop xserver-1.9.0-qxl-fallback.patch, since the latest qxl driver - supports both revision 1 and 2 qxl devices (#642153) +* Mon Jan 16 2017 Adam Jackson - 1.19.1-2 +- Limit the intel driver only on F26 and up -* Wed Apr 20 2011 Soren Sandmann 1.10.99.1-3.20110418 -- xserver-1.10-fix-trapezoids.patch: this patch is necessary to prevent - trap corruption with pixman 0.21.8. +* Wed Jan 11 2017 Adam Jackson - 1.19.1-1 +- xserver 1.19.1 -* Tue Apr 19 2011 Peter Hutterer 1.10.99.1-2.20110418 -- rebase all patches -- xserver-1.10-vbe-malloc.patch: drop, d8caa782009abf4d -- "git rm" all unused patches +* Tue Jan 10 2017 Hans de Goede - 1.19.0-4 +- Follow Debian and only default to the intel ddx on gen4 or older intel GPUs -* Mon Apr 18 2011 Peter Hutterer 1.10.99.1-1.20110418 -- Today's server from git +* Tue Dec 20 2016 Hans de Goede - 1.19.0-3 +- Add one more patch for better integration with the nvidia binary driver -* Wed Mar 30 2011 Adam Jackson 1.10.0-7 -- xserver-1.10-glx-pixmap-crash.patch, xserver-1.10-bg-none-revert.patch: - bugfixes from xserver-next +* Thu Dec 15 2016 Hans de Goede - 1.19.0-2 +- Add some patches for better integration with the nvidia binary driver +- Add a patch from upstream fixing a crash (rhbz#1389886) -* Tue Mar 22 2011 Adam Jackson 1.10.0-6 -- Fix thinko in pointer barrier patch +* Wed Nov 23 2016 Olivier Fourdan 1.19.0-1 +- xserver 1.19.0 +- Fix use after free of cursors in Xwayland (rhbz#1385258) +- Fix an issue where some monitors would show only black, or + partially black when secondary GPU outputs are used -* Tue Mar 22 2011 Adam Tkac 1.10.0-5 -- add more files into -source subpkg +* Tue Nov 15 2016 Peter Hutterer 1.19.0-0.8.rc2 +- Update device barriers for new master devices (#1384432) -* Thu Mar 17 2011 Adam Jackson 1.10.0-4 -- xserver-1.10-pointer-barriers.patch: Backport CRTC confinement from master - and pointer barriers from the development tree for same. -- xserver-1.10-vbe-malloc.patch: Fix a buffer overrun in the VBE code. +* Thu Nov 3 2016 Hans de Goede - 1.19.0-0.7.rc2 +- Update to 1.19.0-rc2 +- Fix (hopefully) various crashes in FlushAllOutput() (rhbz#1382444) +- Fix Xwayland crashing in glamor on non glamor capable hw (rhbz#1390018) -* Fri Mar 11 2011 Peter Hutterer 1.10.0-3 -- Add Xen virtual pointer quirk to 10-quirks.conf (#523914, #679699) +* Tue Nov 1 2016 Ben Crocker - 1.19.0-0.6.20161028 +- Fix Config record allocation during startup: if xorg.conf.d directory +- was absent, a segfault resulted. -* Wed Mar 09 2011 Adam Jackson 1.10.0-2 -- Merge from F16: +* Mon Oct 31 2016 Adam Jackson - 1.19.0-0.5.20161026 +- Use %%autopatch instead of doing our own custom git-am trick - * Wed Mar 09 2011 Adam Jackson 1.10.0-2 - - Disable filesystem caps in paranoia until module loading is audited +* Fri Oct 28 2016 Hans de Goede - 1.19.0-0.4.20161026 +- Add missing Requires: libXfont2-devel to -devel sub-package (rhbz#1389711) - * Fri Feb 25 2011 Peter Hutterer 1.9.99.902-1 - - xserver 1.10.0 - - server-1.9-99.901-xkb-repeat-issues.patch: drop, merged - - xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8 - - xserver-1.6.99-default-modes.patch: drop, see dc498b4 - - xserver-1.7.1-multilib.patch: drop, see a16e282 - - ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0 +* Wed Oct 26 2016 Hans de Goede - 1.19.0-0.3.20161026 +- Sync with upstream git, bringing in a bunch if bug-fixes +- Add some extra fixes which are pending upstream +- This also adds PointerWarping emulation to Xwayland, which should improve + compatiblity with many games