[packages/xorg-driver-video-intel] - adjust API for political correctness of xserver 21 - fix linking with gcc 10+ - fix missing libXv

baggins baggins at pld-linux.org
Wed Nov 3 16:40:57 CET 2021 

commit bd2edfcf8b94367bf78b869d8d53f6ae3736df0f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Nov 3 16:40:21 2021 +0100

    - adjust API for political correctness of xserver 21
    - fix linking with gcc 10+
    - fix missing libXv linking
    - rel 11

 gcc10.patch                  | 10 +++++++
 link.patch                   | 16 ++++++++++
 pc.patch                     | 69 ++++++++++++++++++++++++++++++++++++++++++++
 xorg-driver-video-intel.spec |  8 ++++-
 4 files changed, 102 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-intel.spec b/xorg-driver-video-intel.spec
index 29e7205..61b079b 100644
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -15,7 +15,7 @@ Summary:	X.org video driver for Intel integrated graphics chipsets
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla zintegrowanych układów graficznych Intela
 Name:		xorg-driver-video-intel
 Version:	2.99.917
-Release:	10
+Release:	11
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
@@ -24,6 +24,9 @@ URL:		http://xorg.freedesktop.org/
 Patch0:		xorg-driver-video-intel-git.patch
 # Patch0-md5:	2283ea06b64d9c44321e1626190f17ee
 Patch1:		driver-intel-sna-cursor-Make-sure-hw-cursors-are-disabled-before-disabling-secondary-planes.patch
+Patch2:		pc.patch
+Patch3:		gcc10.patch
+Patch4:		link.patch
 BuildRequires:	Mesa-libGL-devel
 #BuildRequires:	autoconf >= 2.63
 #BuildRequires:	automake >= 1:1.10.2-2
@@ -97,6 +100,9 @@ Wymaga aktywnego Kernel Mode Setting (KMS).
 %setup -q -n xf86-video-intel-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal}
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..73f5d1e
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,10 @@
+--- xf86-video-intel-2.99.917/src/legacy/i810/i810.h~	2021-11-03 16:25:36.000000000 +0100
++++ xf86-video-intel-2.99.917/src/legacy/i810/i810.h	2021-11-03 16:26:32.570981996 +0100
+@@ -322,6 +322,6 @@
+ extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
+ 
+ extern const int I810CopyROP[16];
+-const int I810PatternROP[16];
++extern const int I810PatternROP[16];
+ 
+ #endif /* _I810_H_ */
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..76bb5bb
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,16 @@
+--- xf86-video-intel-2.99.917/xvmc/Makefile.am~	2014-08-29 11:33:11.000000000 +0200
++++ xf86-video-intel-2.99.917/xvmc/Makefile.am	2021-11-03 16:31:40.260150655 +0100
+@@ -27,4 +27,4 @@
+ AM_CFLAGS = $(XVMCLIB_CFLAGS) $(XORG_CFLAGS) -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
+ 
+ libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
+-libIntelXvMC_la_LIBADD = $(XVMCLIB_LIBS) -lpthread
++libIntelXvMC_la_LIBADD = $(XVMCLIB_LIBS) -lpthread -lXv
+--- xf86-video-intel-2.99.917/src/legacy/i810/xvmc/Makefile.am~	2014-08-29 11:33:11.000000000 +0200
++++ xf86-video-intel-2.99.917/src/legacy/i810/xvmc/Makefile.am	2021-11-03 16:39:27.858301036 +0100
+@@ -8,4 +8,4 @@
+ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(DRI1_CFLAGS) -DTRUE=1 -DFALSE=0
+ 
+ libI810XvMC_la_LDFLAGS = -version-number 1:0:0
+-libI810XvMC_la_LIBADD = $(DRI1_LIBS) $(DRM_LIBS) $(XVMCLIB_LIBS)
++libI810XvMC_la_LIBADD = $(DRI1_LIBS) $(DRM_LIBS) $(XVMCLIB_LIBS) -lXv
diff --git a/pc.patch b/pc.patch
new file mode 100644
index 0000000..bf1e214
--- /dev/null
+++ b/pc.patch
@@ -0,0 +1,69 @@
+diff -ur xf86-video-intel-2.99.917/src/sna/sna_accel.c xf86-video-intel-2.99.917-pc/src/sna/sna_accel.c
+--- xf86-video-intel-2.99.917/src/sna/sna_accel.c	2021-11-03 16:24:27.669484747 +0100
++++ xf86-video-intel-2.99.917-pc/src/sna/sna_accel.c	2021-11-03 16:22:30.753591499 +0100
+@@ -17672,7 +17672,7 @@
+ 			continue;
+ 
+ 		src = dirty->src;
+-		dst = dirty->slave_dst->master_pixmap;
++		dst = dirty->secondary_dst->primary_pixmap;
+ 
+ 		region.extents.x1 = dirty->x;
+ 		region.extents.x2 = dirty->x + dst->drawable.width;
+@@ -17699,7 +17699,7 @@
+ 		dy += dirty->dst_y;
+ #endif
+ 		RegionTranslate(&region, dx, dy);
+-		DamageRegionAppend(&dirty->slave_dst->drawable, &region);
++		DamageRegionAppend(&dirty->secondary_dst->drawable, &region);
+ 
+ 		DBG(("%s: slave:  ((%d, %d), (%d, %d))x%d\n", __FUNCTION__,
+ 		     region.extents.x1, region.extents.y1,
+@@ -17776,7 +17776,7 @@
+ 			kgem_bo_sync__gtt(&sna->kgem, __sna_pixmap_get_bo(dst));
+ 		}
+ 
+-		DamageRegionProcessPending(&dirty->slave_dst->drawable);
++		DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ skip:
+ 		RegionUninit(&region);
+ 		DamageEmpty(dirty->damage);
+diff -ur xf86-video-intel-2.99.917/src/uxa/intel_driver.c xf86-video-intel-2.99.917-pc/src/uxa/intel_driver.c
+--- xf86-video-intel-2.99.917/src/uxa/intel_driver.c	2021-11-03 16:24:27.676151157 +0100
++++ xf86-video-intel-2.99.917-pc/src/uxa/intel_driver.c	2021-11-03 16:23:43.264480387 +0100
+@@ -624,30 +624,30 @@
+ 	RegionRec pixregion;
+ 	int was_blocked;
+ 
+-	PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
++	PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap);
+ 	RegionTranslate(&pixregion, dirty->x, dirty->y);
+ 	RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage));
+ 	RegionTranslate(&pixregion, -dirty->x, -dirty->y);
+ 	was_blocked = RegionNil(&pixregion);
+-	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
++	DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
+ 	RegionUninit(&pixregion);
+ 	if (was_blocked)
+ 		return;
+ 
+-	PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
++	PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap);
+ 	PixmapSyncDirtyHelper(dirty, &pixregion);
+ 	RegionUninit(&pixregion);
+ 
+         intel_flush(intel);
+ 	if (!intel->has_prime_vmap_flush) {
+-		drm_intel_bo *bo = intel_uxa_get_pixmap_bo(dirty->slave_dst->master_pixmap);
++		drm_intel_bo *bo = intel_uxa_get_pixmap_bo(dirty->secondary_dst->primary_pixmap);
+ 		was_blocked = xf86BlockSIGIO();
+ 		drm_intel_bo_map(bo, FALSE);
+ 		drm_intel_bo_unmap(bo);
+ 		xf86UnblockSIGIO(was_blocked);
+ 	}
+ 
+-	DamageRegionProcessPending(&dirty->slave_dst->drawable);
++	DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ 	return;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-intel.git/commitdiff/bd2edfcf8b94367bf78b869d8d53f6ae3736df0f

More information about the pld-cvs-commit mailing list