CVS commit: pkgsrc/x11/xf86-video-intel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue May 15 10:50:19 UTC 2018

Modified Files:
        pkgsrc/x11/xf86-video-intel: Makefile distinfo
        pkgsrc/x11/xf86-video-intel/patches: patch-src_sna_sna__accel.c

Log Message:
xf86-video-intel: update to 2.99.917nb7.

Fix build with modular-xorg-server-1.20.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/xf86-video-intel/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xf86-video-intel/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-intel/Makefile
diff -u pkgsrc/x11/xf86-video-intel/Makefile:1.40 pkgsrc/x11/xf86-video-intel/Makefile:1.41
--- pkgsrc/x11/xf86-video-intel/Makefile:1.40   Wed Mar  7 11:57:43 2018
+++ pkgsrc/x11/xf86-video-intel/Makefile        Tue May 15 10:50:19 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2018/03/07 11:57:43 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2018/05/15 10:50:19 wiz Exp $
 
 DISTNAME=      xf86-video-intel-2.99.917
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2
@@ -13,6 +13,7 @@ COMMENT=      Modular Xorg Intel video driver
 CONFLICTS+=    xf86-video-i810-[0-9]*
 
 CONFIGURE_ARGS+=       --enable-dri
+CONFIGURE_ARGS+=       --disable-dri1
 
 GNU_CONFIGURE= YES
 USE_LIBTOOL=   YES

Index: pkgsrc/x11/xf86-video-intel/distinfo
diff -u pkgsrc/x11/xf86-video-intel/distinfo:1.28 pkgsrc/x11/xf86-video-intel/distinfo:1.29
--- pkgsrc/x11/xf86-video-intel/distinfo:1.28   Wed Dec  7 21:59:54 2016
+++ pkgsrc/x11/xf86-video-intel/distinfo        Tue May 15 10:50:19 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2016/12/07 21:59:54 wiz Exp $
+$NetBSD: distinfo,v 1.29 2018/05/15 10:50:19 wiz Exp $
 
 SHA1 (xf86-video-intel-2.99.917.tar.bz2) = 9af9ded7a29026c211e5eb50a547e3e33976301d
 RMD160 (xf86-video-intel-2.99.917.tar.bz2) = dd443e9e87286bbc454f4231a7a5d7c9bb2488a1
@@ -9,11 +9,11 @@ SHA1 (patch-src_compat-api.h) = 303cc02a
 SHA1 (patch-src_legacy_i810_i810__dri.c) = fb963b994d51c9db48457106048226214a2d986c
 SHA1 (patch-src_legacy_i810_i810__video.c) = 8788a9bf4e1efdb5292771c125af9a24c09d62da
 SHA1 (patch-src_sna_sna.h) = 13f0f7c9f8235f6100da90203a9ca4aa09fad977
-SHA1 (patch-src_sna_sna__accel.c) = 0510f3409b5a1e6c0b381147af33e2ac1d4ff590
+SHA1 (patch-src_sna_sna__accel.c) = 233229449a469e12a928bde4e2f8196157918102
 SHA1 (patch-src_sna_sna__acpi.c) = 7105609e38876fe8bb931d6980c023cabdf41736
 SHA1 (patch-src_sna_sna__display.c) = b2e5b330b5b4154b4d0bbf4edd7af1cec2c68cd8
 SHA1 (patch-src_sna_sna__dri2.c) = 4bcc7e5c502a340954073386dad88fd6cebcc7b1
 SHA1 (patch-src_sna_sna__driver.c) = ced69376d7f1af697b1f51ccb46d958495138136
 SHA1 (patch-src_uxa_intel.h) = 201a28ce259c474ea9f83700ec04c105388ad8ed
 SHA1 (patch-src_uxa_intel__display.c) = b8936ecbad39f5a507ae32b4c46d5069f53ca727
-SHA1 (patch-src_uxa_intel__driver.c) = 1eeea5efb0f89eb19eb9b1f0afadb571962f2014
+SHA1 (patch-src_uxa_intel__driver.c) = e1800c27e1b35568254efa7bc16bf89a2e5a6fd4

Index: pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c
diff -u pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c:1.1 pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c:1.2
--- pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c:1.1  Wed Dec  7 21:59:54 2016
+++ pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c      Tue May 15 10:50:19 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_sna_sna__accel.c,v 1.1 2016/12/07 21:59:54 wiz Exp $
+$NetBSD: patch-src_sna_sna__accel.c,v 1.2 2018/05/15 10:50:19 wiz Exp $
 
-Upstream patches for xorg-server-1.19.
+Upstream patches for xorg-server-1.19 and 1.20.
 
 --- src/sna/sna_accel.c.orig   2014-12-20 13:29:27.000000000 +0000
 +++ src/sna/sna_accel.c
@@ -16,7 +16,17 @@ Upstream patches for xorg-server-1.19.
  #if 0
  static void __sna_fallback_flush(DrawablePtr d)
  {
-@@ -17811,6 +17816,13 @@ static bool sna_option_accel_blt(struct
+@@ -16754,7 +16764,9 @@ static int sna_create_gc(GCPtr gc)
+ 
+       gc->freeCompClip = 0;
+       gc->pCompositeClip = 0;
++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0)
+       gc->pRotatedPixmap = 0;
++#endif
+ 
+       fb_gc(gc)->bpp = bits_per_pixel(gc->depth);
+ 
+@@ -17811,6 +17823,13 @@ static bool sna_option_accel_blt(struct 
        return strcasecmp(s, "blt") == 0;
  }
  
@@ -30,7 +40,7 @@ Upstream patches for xorg-server-1.19.
  bool sna_accel_init(ScreenPtr screen, struct sna *sna)
  {
        const char *backend;
-@@ -17822,7 +17834,7 @@ bool sna_accel_init(ScreenPtr screen, st
+@@ -17822,7 +17841,7 @@ bool sna_accel_init(ScreenPtr screen, st
        list_init(&sna->flush_pixmaps);
        list_init(&sna->active_pixmaps);
  
@@ -39,7 +49,7 @@ Upstream patches for xorg-server-1.19.
  
  #ifdef DEBUG_MEMORY
        sna->timer_expire[DEBUG_MEMORY_TIMER] = GetTimeInMillis()+ 10 * 1000;
-@@ -17998,7 +18010,7 @@ void sna_accel_close(struct sna *sna)
+@@ -17998,7 +18017,7 @@ void sna_accel_close(struct sna *sna)
        sna_pixmap_expire(sna);
  
        DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna);