Accepting request 629001 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/629001
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=361

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" && \

U_Xext-shm-Refuse-to-work-for-remote-clients.patch

@@ -1,59 +0,0 @@
-From ec7e2b54c5b4a34b2a077082967bc3ead30e227e Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-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 <a.volkov@rusbitech.ru>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
- 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
-

U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch

@@ -1,40 +0,0 @@
-From a85e94a50c94b07574c8701a3ff3c1243f4257f4 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-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 <ofourdan@redhat.com>
-Tested-by: Tomas Pelka <tpelka@redhat.com>
-Reviewed-by: Lyude Paul <lyude@redhat.com>
----
- 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
-

u_modesetting-Fix-cirrus-24bpp-breakage.patch

@@ -1,31 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-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 <tiwai@suse.de>
-
----
- 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);
- }

xorg-server-1.20.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6
-size 6096838

xorg-server-1.20.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918
+size 6103772

xorg-x11-server.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+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
+
+- U_exa-use-picturematchformat.patch
+  * Fix breakage of Xfce (bsc#1102979)
+
 -------------------------------------------------------------------
 Wed Jul 25 09:25:28 UTC 2018 - sndirsch@suse.com
 

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,12 +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
-
 %description
 This package contains the X.Org Server.
 
@@ -369,12 +365,8 @@ sh %{SOURCE92} --verify . %{SOURCE91}
 
 %patch1401 -p1
 
-%patch1500 -p1
 %patch1501 -p1
 
-%patch1600 -p1
-%patch1601 -p1
-
 %build
 test -e source-file-list || \
     find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \