[arch-commits] Commit in xorg-server/trunk (3 files)

[Laurent Carlier]

    Date: Sunday, June 17, 2018 @ 05:33:33
  Author: lcarlier
Revision: 327086

upgpkg: xorg-server 1.20.0-8

fix FS#59025 and FS#58637

Added:
  xorg-server/trunk/meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
  xorg-server/trunk/xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
Modified:
  xorg-server/trunk/PKGBUILD

------------------------------------------------------------------+
 PKGBUILD                                                         |   14 +++
 meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch |   36 ++++++++++
 xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch    |   18 +++++
 3 files changed, 66 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-17 00:05:03 UTC (rev 327085)
+++ PKGBUILD	2018-06-17 05:33:33 UTC (rev 327086)
@@ -6,7 +6,7 @@
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest'
          'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.20.0
-pkgrel=7
+pkgrel=8
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -25,6 +25,8 @@
         0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
         xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
         xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
+        meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
+        xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
         xvfb-run # with updates from FC master
         xvfb-run.1)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
@@ -40,6 +42,8 @@
             'afe5c58d86089f02d4f3b7d0e6912cd3d75a17522b40e9cd7d4c69611740174884de3455940c6a565ffaad0f4e7e4f7ebeab72b79e8c6ef15da57418fbedcf0d'
             'a8f65ca23ae52865147bdc1bc059b1265ba4bc61527992cf054fe76a0396ef5dfd2386782be371e926184a63def3be7333bb37fc429627d4e6fa159d263f40f7'
             'fc259a0a4acb7b70209fc599b0f4bc94942316bbc8c6995f783026b7cd455900bcb7527615d76c99bd2e0155e0035cbd619939a1f7ddf3af32ed854afe45b631'
+            '1990daa38f2eba161ecc2f310711af85e3d76c78ca45e002dff3697da2f8a2dc53d9371b1e7e55be80a002ef9cb095c6675e19021f270d06cf2b4ea728407aea'
+            'e6339cb1c41e26a43caae7f3e991e9f528000676c29f5bc5a29c99bab2a5f5529efba2b9226a63d138700e6228b234eccd2982d40052b4ee41cfdff96dcc1521'
             '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22')
 
@@ -65,8 +69,14 @@
   # https://bugs.freedesktop.org/show_bug.cgi?id=106656
   patch -Np1 -i ../0002-fix-libshadow-2.patch
 
-  # FS#i58662
+  # FS#58662
   patch -Np1 -i ../0003_Use_PictureMatchFormat_for_source-only_picture_format.diff
+
+  # Display incorrect when rotated 90 degree - FS#58637
+  patch -Np1 -i ../xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
+
+  # xserver by default listens on tcp sockets - FS##59025
+  patch -Np1 -i ../meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
 }
 
 build() {

Added: meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch
===================================================================
--- meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch	                        (rev 0)
+++ meson-Add-configuration-of-listening-on-tcp-unix-and-local.patch	2018-06-17 05:33:33 UTC (rev 327086)
@@ -0,0 +1,36 @@
+diff --git a/include/meson.build b/include/meson.build
+index f76f557..dfca3c3 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -153,10 +153,10 @@ conf_data.set('BUSFAULT', conf_data.get('HAVE_SIGACTION'))
+ conf_data.set('_XTYPEDEF_POINTER', '1')
+ conf_data.set('_XITYPEDEF_POINTER', '1')
+ 
++conf_data.set('LISTEN_TCP', get_option('listen_tcp'))
++conf_data.set('LISTEN_UNIX', get_option('listen_unix'))
++conf_data.set('LISTEN_LOCAL', get_option('listen_local'))
+ # XXX: Configurable?
+-conf_data.set('LISTEN_TCP', '1')
+-conf_data.set('LISTEN_UNIX', '1')
+-conf_data.set('LISTEN_LOCAL', '1')
+ conf_data.set('XTRANS_SEND_FDS', '1')
+ 
+ conf_data.set('TCPCONN', '1')
+diff --git a/meson_options.txt b/meson_options.txt
+index 86fca46..3453b8d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -45,6 +45,13 @@ option('vendor_name_short', type: 'string', value: 'X.Org')
+ option('vendor_web', type: 'string', value: 'http://wiki.x.org')
+ option('os_vendor', type: 'string', value: '')
+ 
++option('listen_tcp', type: 'boolean', value: false,
++       description: 'Listen on TCP by default')
++option('listen_unix', type: 'boolean', value: true,
++       description: 'Listen on Unix by default')
++option('listen_local', type: 'boolean', value: true,
++       description: 'Listen on local by default')
++
+ option('int10', type: 'combo', choices: ['stub', 'x86emu', 'vm86', 'auto', 'false'],
+        value: 'auto',
+        description: 'Xorg int10 backend (default: usually x86emu)')

Added: xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch
===================================================================
--- xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch	                        (rev 0)
+++ xserver-modesetting-use-drmmode_bo_import-for-rotate_fb.patch	2018-06-17 05:33:33 UTC (rev 327086)
@@ -0,0 +1,18 @@
+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");