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

[Laurent Carlier]

    Date: Thursday, February 11, 2016 @ 11:06:02
  Author: lcarlier
Revision: 259063

upgpkg: xorg-server 1.18.1-3

try to fix FS#47151

Added:
  xorg-server/trunk/Fix-XineramaQueryScreens-for-reverse-prime.patch
Modified:
  xorg-server/trunk/PKGBUILD

--------------------------------------------------+
 Fix-XineramaQueryScreens-for-reverse-prime.patch |   55 +++++++++++++++++++++
 PKGBUILD                                         |   14 ++++-
 2 files changed, 66 insertions(+), 3 deletions(-)

Added: Fix-XineramaQueryScreens-for-reverse-prime.patch
===================================================================
--- Fix-XineramaQueryScreens-for-reverse-prime.patch	                        (rev 0)
+++ Fix-XineramaQueryScreens-for-reverse-prime.patch	2016-02-11 10:06:02 UTC (rev 259063)
@@ -0,0 +1,55 @@
+diff --git a/randr/rrmonitor.c b/randr/rrmonitor.c
+index c37dcf8..58041bb 100644
+--- a/randr/rrmonitor.c
++++ b/randr/rrmonitor.c
+@@ -326,7 +326,7 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret,
+         RRMonitorSetFromClient(pScrPriv->monitors[list.client_primary], mon);
+         mon++;
+     } else if (list.server_primary >= 0) {
+-        RRMonitorSetFromServer(pScrPriv->crtcs[list.server_primary], mon);
++        RRMonitorSetFromServer(list.server_crtc[list.server_primary], mon);
+         mon++;
+     }
+ 
+@@ -354,8 +354,8 @@ RRMonitorMakeList(ScreenPtr screen, Bool get_active, RRMonitorPtr *monitors_ret,
+ 
+     /* And finish with the list of crtc-inspired monitors
+      */
+-    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+-        RRCrtcPtr crtc = pScrPriv->crtcs[c];
++    for (c = 0; c < list.num_crtcs; c++) {
++        RRCrtcPtr crtc = list.server_crtc[c];
+         if (c == list.server_primary && list.client_primary < 0)
+             continue;
+ 
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index d12b9ba..2ba62fa 100644
+--- a/randr/rroutput.c
++++ b/randr/rroutput.c
+@@ -543,6 +543,7 @@ ProcRRSetOutputPrimary(ClientPtr client)
+     WindowPtr pWin;
+     rrScrPrivPtr pScrPriv;
+     int ret;
++    ScreenPtr slave;
+ 
+     REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
+ 
+@@ -565,7 +566,18 @@ ProcRRSetOutputPrimary(ClientPtr client)
+ 
+     pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
+     if (pScrPriv)
++    {
+         RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
++        
++        xorg_list_for_each_entry(slave,
++                                 &pWin->drawable.pScreen->output_slave_list,
++                                 output_head) {
++            rrScrPrivPtr pSlavePriv;
++            pSlavePriv = rrGetScrPriv(slave);
++            
++            RRSetPrimaryOutput(slave, pSlavePriv, output);
++        }
++    }
+ 
+     return Success;
+ }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-11 08:43:49 UTC (rev 259062)
+++ PKGBUILD	2016-02-11 10:06:02 UTC (rev 259063)
@@ -5,7 +5,7 @@
 pkgbase=xorg-server
 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.18.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('custom')
 groups=('xorg')
@@ -19,7 +19,8 @@
              'libxshmfence' 'libunwind')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         xvfb-run
-        xvfb-run.1)
+        xvfb-run.1
+        Fix-XineramaQueryScreens-for-reverse-prime.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
@@ -26,8 +27,15 @@
 sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            'afc334dfe1f1eb9e557ae01771b0f774c8fc578115e1698462ab670d1b0a213a')
 
+prepare() {
+  cd "${pkgbase}-${pkgver}"
+  # FS#47151
+  patch -Np1 -i ../Fix-XineramaQueryScreens-for-reverse-prime.patch
+}
+
 build() {
   cd "${pkgbase}-${pkgver}"
   ./configure --prefix=/usr \