diff --git a/N_Install-Avoid-failure-on-wrapper-installation.patch b/N_Install-Avoid-failure-on-wrapper-installation.patch index f9538e8..3f1590b 100644 --- a/N_Install-Avoid-failure-on-wrapper-installation.patch +++ b/N_Install-Avoid-failure-on-wrapper-installation.patch @@ -24,7 +24,7 @@ index 85bd0be..461e818 100644 $(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR) - mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg - ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg -- -chown root $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap +- -chown 0 $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap + mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg 2>/dev/null && target=Xorg; \ + ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/$${target} + -test "x$UID" = "x0" -o "x$EUID" = "x0" && \ diff --git a/U_Xext-shm-Refuse-to-work-for-remote-clients.patch b/U_Xext-shm-Refuse-to-work-for-remote-clients.patch deleted file mode 100644 index 0cc3c7b..0000000 --- a/U_Xext-shm-Refuse-to-work-for-remote-clients.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ec7e2b54c5b4a34b2a077082967bc3ead30e227e Mon Sep 17 00:00:00 2001 -From: Alexander Volkov -Date: Tue, 5 Jun 2018 13:05:39 +0300 -Subject: [PATCH] Xext/shm: Refuse to work for remote clients - -Avoid access to System V shared memory segment on the X server side -for clients forwarded via SSH. Also prevent them from hanging while -waiting for the reply from the ShmCreateSegment request. - -v2: Allow ShmQueryVersion request even for remote clients - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=11080 -Signed-off-by: Alexander Volkov -Reviewed-by: Adam Jackson ---- - Xext/shm.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index fc8441c43..896a966e3 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -1302,9 +1302,14 @@ static int - ProcShmDispatch(ClientPtr client) - { - REQUEST(xReq); -- switch (stuff->data) { -- case X_ShmQueryVersion: -+ -+ if (stuff->data == X_ShmQueryVersion) - return ProcShmQueryVersion(client); -+ -+ if (!client->local) -+ return BadRequest; -+ -+ switch (stuff->data) { - case X_ShmAttach: - return ProcShmAttach(client); - case X_ShmDetach: -@@ -1461,9 +1466,14 @@ static int _X_COLD - SProcShmDispatch(ClientPtr client) - { - REQUEST(xReq); -- switch (stuff->data) { -- case X_ShmQueryVersion: -+ -+ if (stuff->data == X_ShmQueryVersion) - return SProcShmQueryVersion(client); -+ -+ if (!client->local) -+ return BadRequest; -+ -+ switch (stuff->data) { - case X_ShmAttach: - return SProcShmAttach(client); - case X_ShmDetach: --- -2.16.3 - diff --git a/U_exa-use-picturematchformat.patch b/U_exa-use-picturematchformat.patch deleted file mode 100644 index e4c9cb4..0000000 --- a/U_exa-use-picturematchformat.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3ebef6ab850675e1091df2125ebdfbb147436e6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= -Date: Fri, 1 Jun 2018 11:57:15 +0200 -Subject: exa: Use PictureMatchFormat for source-only picture format description -References: bsc#1102979 - -Their pFormat member is NULL, which resulted in a crash in -miRenderColorToPixel. - -Fixes: 8171d4c2d67b "render: Store and use all 16bpc of precision for - solid pixels (v2.1)" -Reviewed-by: Adam Jackson ---- - exa/exa_render.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/exa/exa_render.c b/exa/exa_render.c -index 50a9a65..9fbfdfc 100644 ---- a/exa/exa_render.c -+++ b/exa/exa_render.c -@@ -291,7 +291,8 @@ exaTryDriverSolidFill(PicturePtr pSrc, - pixel = exaGetPixmapFirstPixel(pSrcPix); - } - else -- miRenderColorToPixel(pSrc->pFormat, -+ miRenderColorToPixel(PictureMatchFormat(pDst->pDrawable->pScreen, 32, -+ pSrc->format), - &pSrc->pSourcePict->solidFill.fullcolor, - &pixel); - diff --git a/U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch b/U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch deleted file mode 100644 index cc19a38..0000000 --- a/U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a85e94a50c94b07574c8701a3ff3c1243f4257f4 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Fri, 15 Jun 2018 08:57:12 +0200 -Subject: [PATCH] modesetting: use drmmode_bo_import() for rotate_fb - -drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if -the format is not as expected, preventing from using a rotated output. - -Change it to use the new function drmmode_bo_import() which takes care -of calling the drmModeAddFB2() API. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715 -Signed-off-by: Olivier Fourdan -Tested-by: Tomas Pelka -Reviewed-by: Lyude Paul ---- - hw/xfree86/drivers/modesetting/drmmode_display.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index 859a21a9d..ec11b3f56 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height) - return NULL; - } - -- ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth, -- drmmode->kbpp, -- drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo), -- drmmode_bo_get_handle(&drmmode_crtc->rotate_bo), -- &drmmode_crtc->rotate_fb_id); -+ ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo, -+ &drmmode_crtc->rotate_fb_id); - - if (ret) { - ErrorF("failed to add rotate fb\n"); --- -2.16.3 - diff --git a/u_modesetting-Fix-cirrus-24bpp-breakage.patch b/u_modesetting-Fix-cirrus-24bpp-breakage.patch deleted file mode 100644 index e8870dd..0000000 --- a/u_modesetting-Fix-cirrus-24bpp-breakage.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Takashi Iwai -Subject: modesetting: Fix cirrus 24bpp breakage -References: bsc#1101699 - -The recent rewrite of modesetting driver broke the 24bpp support. -As typically found on cirrus KMS, it leads to a blank screen, spewing -the error like: - failed to add fb -22 - (EE) modeset(0): failed to set mode: Invalid argument - -The culript is that the wrong bpp value of the front buffer is passed -to drmModeAddFB(). Fix it by replacing with the back buffer bpp, -drmmode->kbpp. - -Signed-off-by: Takashi Iwai - ---- - hw/xfree86/drivers/modesetting/drmmode_display.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -990,7 +990,7 @@ drmmode_bo_import(drmmode_ptr drmmode, d - } - #endif - return drmModeAddFB(drmmode->fd, bo->width, bo->height, -- drmmode->scrn->depth, drmmode->scrn->bitsPerPixel, -+ drmmode->scrn->depth, drmmode->kbpp, - drmmode_bo_get_pitch(bo), - drmmode_bo_get_handle(bo), fb_id); - } diff --git a/xorg-server-1.20.0.tar.bz2 b/xorg-server-1.20.0.tar.bz2 deleted file mode 100644 index 0e6b7ad..0000000 --- a/xorg-server-1.20.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6 -size 6096838 diff --git a/xorg-server-1.20.1.tar.bz2 b/xorg-server-1.20.1.tar.bz2 new file mode 100644 index 0000000..aee32e3 --- /dev/null +++ b/xorg-server-1.20.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918 +size 6103772 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index d3ad6f6..6c9add2 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Aug 7 22:56:14 UTC 2018 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 1.20.1: + This bugfix release fixes several issues in RANDR, Xwayland, glamor, the + modesetting driver, and elsewhere. +- Packaging changes: + + Adapt patch N_Install-Avoid-failure-on-wrapper-installation.patch to work + with the new version + + Remove patch U_Xext-shm-Refuse-to-work-for-remote-clients.patch + + Remove patch U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch + + Remove patch u_modesetting-Fix-cirrus-24bpp-breakage.patch + + Remove patch U_exa-use-picturematchformat.patch + ------------------------------------------------------------------- Sat Jul 28 11:24:05 UTC 2018 - jdelvare@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 5560d0b..3c422ca 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -46,7 +46,7 @@ %endif Name: xorg-x11-server -Version: 1.20.0 +Version: 1.20.1 Release: 0 Url: http://xorg.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -224,14 +224,8 @@ Patch1222: b_sync-fix.patch Patch1401: u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch -Patch1500: U_Xext-shm-Refuse-to-work-for-remote-clients.patch Patch1501: U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch -Patch1600: U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch -Patch1601: u_modesetting-Fix-cirrus-24bpp-breakage.patch - -Patch1700: U_exa-use-picturematchformat.patch - %description This package contains the X.Org Server. @@ -371,14 +365,8 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch1401 -p1 -%patch1500 -p1 %patch1501 -p1 -%patch1600 -p1 -%patch1601 -p1 - -%patch1700 -p1 - %build test -e source-file-list || \ find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \