Accepting request 353912 from home:eeich:branches:X11:XOrg

- u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch
  Fix panning when configured in xorg.conf* (boo#771521).

- Handle source-file-list in build not prep
- Process xorg-x11-server.macros in install

OBS-URL: https://build.opensuse.org/request/show/353912
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=605

N_xorg-x11-server-rpmmacros.patch

@@ -1,15 +0,0 @@
-From: dimstar@opensuse.org
-
-Provide RPM macros to require correct ABI Versions.
-
-Index: xorg-server-1.12.1/configure.ac
-===================================================================
---- xorg-server-1.12.1.orig/configure.ac
-+++ xorg-server-1.12.1/configure.ac
-@@ -2232,5 +2232,6 @@ test/Makefile
- test/xi2/Makefile
- xserver.ent
- xorg-server.pc
-+xorg-x11-server.macros
- ])
- AC_OUTPUT

u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch

@@ -0,0 +1,46 @@
+From: Egbert Eich <eich@suse.de>
+Date: Fri Jan 15 16:52:18 2016 +0100
+Subject: [PATCH]Panning: Set panning state in xf86RandR12ScreenSetSize()
+Patch-mainline: to be upstreamed
+
+References: boo#771521
+Signed-off-by: Egbert Eich <eich@suse.com>
+
+Right after verifying the panning area the per-crtc panning state should
+be set.
+This fixes panning when set in the configuration.
+
+Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=771521
+Signed-off-by: Egbert Eich <eich@suse.de>
+---
+ hw/xfree86/modes/xf86RandR12.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
+index eae7016..9f444dd 100644
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -681,6 +681,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
+     WindowPtr pRoot = pScreen->root;
+     PixmapPtr pScrnPix;
+     Bool ret = FALSE;
++    Bool panning = FALSE;
+     int c;
+ 
+     if (randrp->virtualX == -1 || randrp->virtualY == -1) {
+@@ -709,6 +710,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
+             if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)
+                 crtc->panningTrackingArea.y2 += height - pScreen->height;
+             xf86RandR13VerifyPanningArea(crtc, width, height);
++            panning = PANNING_ENABLED (crtc);
+             xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY);
+         }
+     }
+@@ -718,6 +720,7 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
+     pScreen->height = pScrnPix->drawable.height = height;
+     randrp->mmWidth = pScreen->mmWidth = mmWidth;
+     randrp->mmHeight = pScreen->mmHeight = mmHeight;
++    randrp->panning = panning;
+ 
+     xf86SetViewport(pScreen, pScreen->width - 1, pScreen->height - 1);
+     xf86SetViewport(pScreen, 0, 0);

xorg-x11-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jan 15 16:25:36 UTC 2016 - eich@suse.com
+
+- u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch
+  Fix panning when configured in xorg.conf* (boo#771521).
+
+-------------------------------------------------------------------
+Fri Jan 15 11:47:17 UTC 2016 - eich@suse.com
+
+- Handle source-file-list in build not prep
+- Process xorg-x11-server.macros in install
+
 -------------------------------------------------------------------
 Tue Jan 12 13:19:06 UTC 2016 - fcrozat@suse.com
 

xorg-x11-server.spec

@@ -157,7 +157,6 @@ Provides:       X11_ABI_HAS_DPMS_GET_CAPABILITIES
 Requires:       xkeyboard-config
 
 # PATCH-FEATURE-OPENSUSE n_xorg-x11-server-rpmmacros.patch dimstar@opensuse.org -- Provide RPM macros to require correct ABI Versions.
-Patch0:         N_xorg-x11-server-rpmmacros.patch
 Patch1:         N_default-module-path.diff
 Patch2:         N_zap_warning_xserver.diff
 Patch3:         N_driver-autoconfig.diff
@@ -184,6 +183,7 @@ Patch204:       U_systemd-logind-do-not-rely-on-directed-signals.patch
 Patch205:       U_kdrive-UnregisterFd-Fix-off-by-one.patch
 Patch206:       u_busfault_sigaction-Only-initialize-pointer-when-matched.patch
 Patch207:       U_modesetting-should-not-reference-gbm-when-it-s-not-d.patch
+Patch208:       u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch
 
 Patch1000:      n_xserver-optimus-autoconfig-hack.patch
 
@@ -262,8 +262,6 @@ This package contains patched sources of X.Org Server.
 %setup -q -n xorg-server-%{dirsuffix} -a3
 # Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end.
 sh %{SOURCE92} --verify . %{SOURCE91}
-cp %{SOURCE90} .
-%patch0 -p1
 
 %if 0%{?suse_version} < 1315
 %patch1
@@ -292,6 +290,7 @@ cp %{SOURCE90} .
 %patch205 -p1
 %patch206 -p1
 %patch207 -p1
+%patch208 -p1
 
 %patch1000 -p1
 
@@ -302,9 +301,11 @@ cp %{SOURCE90} .
 ### patch222 might not be applicable anymore
 #%patch1222 -p1
 
-find . -type f \! -name '*.orig' \! -path ./source-file-list > source-file-list
-
 %build
+test -e source-file-list || \
+    find . -type f \! -name '*.orig' \! -path ./source-file-list > \
+    source-file-list
+
 autoreconf -fi
 %configure CFLAGS="%{optflags} -fno-strict-aliasing" \
 	    --sysconfdir=/etc \
@@ -402,6 +403,8 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \
   %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name}
 %endif
 install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace
+cp %{S:90} .
+./config.status --file xorg-x11-server.macros
 install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server
 %ifnarch s390 s390x
 %if 0%{?suse_version} >= 1315