From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 5 Dec 2015 22:08:05 +0000 (+0100)
Subject: - added dirtytracking-update patch from git (needed for xserver 1.18)
X-Git-Tag: auto/th/xorg-driver-video-nouveau-1.0.12-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=f33337f5aa153090e7cc7d33cc68f8a47eb9caa6;p=packages%2Fxorg-driver-video-nouveau.git

- added dirtytracking-update patch from git (needed for xserver 1.18)
- disable glamor (already removed in git, incorrect implementation, not working with xserver 1.18)
---

diff --git a/xorg-driver-video-nouveau-dirtytracking-update.patch b/xorg-driver-video-nouveau-dirtytracking-update.patch
new file mode 100644
index 0000000..e9568f6
--- /dev/null
+++ b/xorg-driver-video-nouveau-dirtytracking-update.patch
@@ -0,0 +1,44 @@
+From fdc528306e4018b314f2efcb2be4e37672bddd75 Mon Sep 17 00:00:00 2001
+From: Vadim Rutkovsky <vrutkovs@redhat.com>
+Date: Thu, 9 Jul 2015 23:23:37 +0200
+Subject: Adapt to new dirty tracking api
+
+Mirrors commit b6d871bf2 (radeon: adopt for new X server dirty tracking
+APIs.) in xf86-video-ati.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91284
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index c30cb3a..cd13820 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -729,7 +729,9 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
+ 		screen->height = screenpix->drawable.height = max_height;
+ 	}
+ 	drmmode_crtc->scanout_pixmap_x = this_x;
+-#ifdef HAS_DIRTYTRACKING2
++#ifdef HAS_DIRTYTRACKING_ROTATION
++	PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
++#elif defined(HAS_DIRTYTRACKING2)
+ 	PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
+ #else
+ 	PixmapStartDirtyTracking(ppix, screenpix, 0, 0);
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 8e2ae03..4218e4f 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -557,7 +557,11 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
+ 	PixmapRegionInit(&pixregion, dirty->slave_dst);
+ 
+ 	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
++#ifdef HAS_DIRTYTRACKING_ROTATION
++	PixmapSyncDirtyHelper(dirty);
++#else
+ 	PixmapSyncDirtyHelper(dirty, &pixregion);
++#endif
+ 
+ 	DamageRegionProcessPending(&dirty->slave_dst->drawable);
+ 	RegionUninit(&pixregion);
+-- 
+cgit v0.10.2
+
diff --git a/xorg-driver-video-nouveau.spec b/xorg-driver-video-nouveau.spec
index 300d2ec..d208350 100644
--- a/xorg-driver-video-nouveau.spec
+++ b/xorg-driver-video-nouveau.spec
@@ -7,6 +7,7 @@ License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/archive/individual/driver/xf86-video-nouveau-%{version}.tar.bz2
 # Source0-md5:	a0d2932d84ba10c4933c8332c9afe157
+Patch0:		%{name}-dirtytracking-update.patch
 URL:		http://nouveau.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel
 BuildRequires:	autoconf >= 2.60
@@ -66,6 +67,7 @@ PCI, PCI-Express i AGP oparte na następujących układach:
 
 %prep
 %setup -q -n xf86-video-nouveau-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -74,6 +76,7 @@ PCI, PCI-Express i AGP oparte na następujących układach:
 %{__autoheader}
 %{__automake}
 %configure \
+	ac_cv_header_glamor_h=no \
 	--disable-silent-rules
 
 %{__make}