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

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Jul 31 14:41:37 UTC 2020

Modified Files:
        pkgsrc/x11/xf86-video-intel: Makefile PLIST distinfo
Removed Files:
        pkgsrc/x11/xf86-video-intel/patches: patch-src_backlight.c
            patch-src_compat-api.h patch-src_legacy_i810_i810__video.c
            patch-src_sna_sna.h patch-src_sna_sna__accel.c
            patch-src_sna_sna__acpi.c patch-src_sna_sna__display.c
            patch-src_sna_sna__dri2.c patch-src_sna_sna__driver.c
            patch-src_uxa_intel.h patch-src_uxa_intel__display.c
            patch-src_uxa_intel__driver.c

Log Message:
xf86-video-intel: update to the latest git snapshot.

The released version is quite old and doesn't run properly on new devices.
Some logic from similar packages in wip.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/xf86-video-intel/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-video-intel/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xf86-video-intel/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_backlight.c \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__accel.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_compat-api.h \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_legacy_i810_i810__video.c \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna.h \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__acpi.c \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__display.c \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__dri2.c \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_sna_sna__driver.c \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_uxa_intel.h \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_uxa_intel__display.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.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.43 pkgsrc/x11/xf86-video-intel/Makefile:1.44
--- pkgsrc/x11/xf86-video-intel/Makefile:1.43   Sun Jun 28 13:54:09 2020
+++ pkgsrc/x11/xf86-video-intel/Makefile        Fri Jul 31 14:41:37 2020
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2020/06/28 13:54:09 nia Exp $
+# $NetBSD: Makefile,v 1.44 2020/07/31 14:41:37 maya Exp $
 
-DISTNAME=      xf86-video-intel-2.99.917
-PKGREVISION=   7
+PKGNAME=       xf86-video-intel-2.99.917.20200515
+COMMIT_ID=     5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc
+DISTNAME=      xf86-video-intel-${COMMIT_ID}
 CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
+#MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
+MASTER_SITES=  https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    joerg%NetBSD.org@localhost
@@ -13,11 +15,12 @@ COMMENT=    Modular Xorg Intel video driver
 CONFLICTS+=    xf86-video-i810-[0-9]*
 
 CONFIGURE_ARGS+=       --enable-dri
-CONFIGURE_ARGS+=       --disable-dri1
+CONFIGURE_ARGS+=       --enable-dri2
+CONFIGURE_ARGS+=       --enable-dri3
 
 GNU_CONFIGURE= YES
 USE_LIBTOOL=   YES
-USE_TOOLS+=    pkg-config
+USE_TOOLS+=    pkg-config automake autoconf autoreconf
 
 # Assumes platform compiler has SSE2, etc
 ONLY_FOR_PLATFORM+=    *-*-i386 *-*-x86_64
@@ -26,9 +29,14 @@ CONFIGURE_ENV.SunOS+=        DRIVER_MAN_SUFFIX=
 
 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.7
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -vif
+
+.include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/libXvMC/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-video-intel/PLIST
diff -u pkgsrc/x11/xf86-video-intel/PLIST:1.4 pkgsrc/x11/xf86-video-intel/PLIST:1.5
--- pkgsrc/x11/xf86-video-intel/PLIST:1.4       Thu May 16 06:16:50 2013
+++ pkgsrc/x11/xf86-video-intel/PLIST   Fri Jul 31 14:41:37 2020
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2013/05/16 06:16:50 richard Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/07/31 14:41:37 maya Exp $
+lib/libI810XvMC.la
+lib/libIntelXvMC.la
 lib/xorg/modules/drivers/intel_drv.la
 man/man4/intel.4

Index: pkgsrc/x11/xf86-video-intel/distinfo
diff -u pkgsrc/x11/xf86-video-intel/distinfo:1.29 pkgsrc/x11/xf86-video-intel/distinfo:1.30
--- pkgsrc/x11/xf86-video-intel/distinfo:1.29   Tue May 15 10:50:19 2018
+++ pkgsrc/x11/xf86-video-intel/distinfo        Fri Jul 31 14:41:37 2020
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.29 2018/05/15 10:50:19 wiz Exp $
+$NetBSD: distinfo,v 1.30 2020/07/31 14:41:37 maya Exp $
 
-SHA1 (xf86-video-intel-2.99.917.tar.bz2) = 9af9ded7a29026c211e5eb50a547e3e33976301d
-RMD160 (xf86-video-intel-2.99.917.tar.bz2) = dd443e9e87286bbc454f4231a7a5d7c9bb2488a1
-SHA512 (xf86-video-intel-2.99.917.tar.bz2) = cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f
-Size (xf86-video-intel-2.99.917.tar.bz2) = 2259040 bytes
-SHA1 (patch-src_backlight.c) = 39537a3233613c777f0475343f0be615bff3c3ca
-SHA1 (patch-src_compat-api.h) = 303cc02ad41aa8024631577b9ea0bb26cd5f23f4
+SHA1 (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = f9cb02d46b771e278a11dc88536049daf76f6ee8
+RMD160 (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = 40400b5860115d3c679ec849e0ba90dba74ee6ca
+SHA512 (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = 
29fea01332438ad7616bae56a926f5c6fa08f93f67c23a0bb38f775719f12b15fba5bcb096c0665948f80d3ff6b7c108f360e44aae008192ef6c9b21187b4bbb
+Size (xf86-video-intel-5ca3ac1a90af177eb111a965e9b4dd8a27cc58fc.tar.bz2) = 1250303 bytes
 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) = 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) = e1800c27e1b35568254efa7bc16bf89a2e5a6fd4