From: Jan RÄ™korajski Date: Thu, 30 Dec 2021 08:19:02 +0000 (+0100) Subject: - updated git patch X-Git-Tag: auto/th/xorg-driver-video-intel-2.99.917-13~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=1298a9cca330f2cdf42fee74b32e7ac1a31385b8;p=packages%2Fxorg-driver-video-intel.git - updated git patch --- diff --git a/gcc10.patch b/gcc10.patch deleted file mode 100644 index 73f5d1e..0000000 --- a/gcc10.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/pc.patch b/pc.patch deleted file mode 100644 index bf1e214..0000000 --- a/pc.patch +++ /dev/null @@ -1,69 +0,0 @@ -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(®ion, dx, dy); -- DamageRegionAppend(&dirty->slave_dst->drawable, ®ion); -+ DamageRegionAppend(&dirty->secondary_dst->drawable, ®ion); - - 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(®ion); - 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; - } - diff --git a/xorg-driver-video-intel-xserver_1_8_0.patch b/xorg-driver-video-intel-xserver_1_8_0.patch deleted file mode 100644 index 1a8cc76..0000000 --- a/xorg-driver-video-intel-xserver_1_8_0.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/compat-api.h b/src/compat-api.h -index aa93bee..1ca4380 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) - #endif - - #endif -+ -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,17,99,0,0) -+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) -+#endif ---- xf86-video-intel-2.99.917/src/sna/sna_driver.c~ 2014-12-11 14:52:11.000000000 +0100 -+++ xf86-video-intel-2.99.917/src/sna/sna_driver.c 2015-11-19 14:43:22.857017010 +0100 -@@ -60,6 +60,7 @@ - #include - #include - #include -+#include - #include "i915_drm.h" - - #ifdef HAVE_VALGRIND ---- xf86-video-intel-2.99.917/src/uxa/intel_driver.c~ 2015-11-19 16:08:20.073982082 +0100 -+++ xf86-video-intel-2.99.917/src/uxa/intel_driver.c 2015-11-19 16:10:07.683783673 +0100 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/xorg-driver-video-intel.spec b/xorg-driver-video-intel.spec index 906eb52..0705e5e 100644 --- a/xorg-driver-video-intel.spec +++ b/xorg-driver-video-intel.spec @@ -22,10 +22,8 @@ Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel # Source0-md5: fa196a66e52c0c624fe5d350af7a5e7b URL: http://xorg.freedesktop.org/ Patch0: xorg-driver-video-intel-git.patch -# Patch0-md5: 2283ea06b64d9c44321e1626190f17ee +# Patch0-md5: 0fd5075aeaa258ae81fb9707906394fb 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 Patch5: ix86.patch BuildRequires: Mesa-libGL-devel @@ -99,12 +97,11 @@ Wymaga aktywnego Kernel Mode Setting (KMS). %prep %setup -q -n xf86-video-intel-%{version} +%{__rm} src/render_program/exa_wm_yuv_rgb.g[67]a %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 -%patch5 -p1 +#%patch5 -p1 %build %{__aclocal}