update to xf86-video-intel-2.19.0 for modular-xorg-server-1.12.4

8 files changed, 7 insertions, 174 deletions

diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 0ed414441bc..1f9cf5c4b8e 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2012/10/29 05:07:04 asau Exp $
+# $NetBSD: Makefile,v 1.30 2013/05/16 06:16:50 richard Exp $
 
-DISTNAME=	xf86-video-intel-2.7.1
-PKGREVISION=	6
+DISTNAME=	xf86-video-intel-2.19.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-intel/PLIST b/x11/xf86-video-intel/PLIST
index da176334d64..3433a3c8080 100644
--- a/x11/xf86-video-intel/PLIST
+++ b/x11/xf86-video-intel/PLIST
@@ -1,10 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2009/05/05 04:27:29 joerg Exp $
-lib/libI810XvMC.la
-lib/libIntelXvMC.la
-lib/xorg/modules/drivers/ch7017.la
-lib/xorg/modules/drivers/ch7xxx.la
+@comment $NetBSD: PLIST,v 1.4 2013/05/16 06:16:50 richard Exp $
 lib/xorg/modules/drivers/intel_drv.la
-lib/xorg/modules/drivers/ivch.la
-lib/xorg/modules/drivers/sil164.la
-lib/xorg/modules/drivers/tfp410.la
 man/man4/intel.4
diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index 6fba8988ea6..b28bd44857b 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.21 2012/09/16 02:19:20 khorben Exp $
+$NetBSD: distinfo,v 1.22 2013/05/16 06:16:50 richard Exp $
 
-SHA1 (xf86-video-intel-2.7.1.tar.bz2) = f863ee65b4b7779077af9f819b07033264284628
-RMD160 (xf86-video-intel-2.7.1.tar.bz2) = 25208fe03f0fe849974a703f4a81e734e67cad18
-Size (xf86-video-intel-2.7.1.tar.bz2) = 780625 bytes
-SHA1 (patch-aa) = 7804346b3442c1435bd9292e9c2d411854dbd4e2
-SHA1 (patch-ad) = 9b001f43451daa8a68acb5059f993bcc1f3588f8
-SHA1 (patch-ag) = 68f282d59e03c74727de4577eb48297d9022e542
-SHA1 (patch-src_i830.h) = e83278f085655bb34b564c81b1bcd4abd6de95f0
-SHA1 (patch-src_i830__quirks.c) = 43dc7261630c3499687f229e7549286269787fef
+SHA1 (xf86-video-intel-2.19.0.tar.bz2) = 131934cf5e90bd48c883804cc644c4cb8b1de100
+RMD160 (xf86-video-intel-2.19.0.tar.bz2) = df7a6797cc74af57c751905e3ce65be35de43e5c
+Size (xf86-video-intel-2.19.0.tar.bz2) = 1463260 bytes
diff --git a/x11/xf86-video-intel/patches/patch-aa b/x11/xf86-video-intel/patches/patch-aa
deleted file mode 100644
index a77856e09d7..00000000000
--- a/x11/xf86-video-intel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2011/06/06 12:48:14 seanb Exp $
-
---- src/xvmc/Makefile.in.orig	2009-05-13 00:14:43.000000000 +0000
-+++ src/xvmc/Makefile.in
-@@ -265,7 +265,7 @@ libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @
- 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
- 
- libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
--libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread
-+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS)
- INTEL_G4A = \
-         dual_prime_igd.g4a              \
-         field_backward_igd.g4a          \
diff --git a/x11/xf86-video-intel/patches/patch-ad b/x11/xf86-video-intel/patches/patch-ad
deleted file mode 100644
index 6599444e0bf..00000000000
--- a/x11/xf86-video-intel/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/08/10 06:17:21 wiz Exp $
-
---- src/i830_xaa.c.orig	2009-05-13 00:12:11.000000000 +0000
-+++ src/i830_xaa.c
-@@ -614,8 +614,7 @@ I830SubsequentColorExpandScanline(ScrnIn
-     pI830->BR[9] += pScrn->displayWidth * pI830->cpp;
-     I830GetNextScanlineColorExpandBuffer(pScrn);
- 
--    if (IS_I965G(pI830))
--      I830EmitFlush(pScrn);
-+    I830EmitFlush(pScrn);
- }
- 
- #if DO_SCANLINE_IMAGE_WRITE
diff --git a/x11/xf86-video-intel/patches/patch-ag b/x11/xf86-video-intel/patches/patch-ag
deleted file mode 100644
index 92de43a6869..00000000000
--- a/x11/xf86-video-intel/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/05/05 04:27:30 joerg Exp $
-
-Unbreaks LVDS on Latitude D430.
-
---- src/i830_lvds.c.orig	2009-05-05 06:24:41.000000000 +0200
-+++ src/i830_lvds.c
-@@ -1422,12 +1422,14 @@ i830_lvds_init(ScrnInfoPtr pScrn)
-     DisplayModePtr	    lvds_ddc_mode = NULL;
-     struct i830_lvds_priv   *dev_priv;
- 
-+#if 0
-     if (!pI830->integrated_lvds) {
- 	if (pI830->debug_modes)
- 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		   "Skipping LVDS from driver feature BDB's LVDS config info.\n");
- 	return;
-     }
-+#endif
- 
-     if (pI830->quirk_flag & QUIRK_IGNORE_LVDS)
- 	return;
diff --git a/x11/xf86-video-intel/patches/patch-src_i830.h b/x11/xf86-video-intel/patches/patch-src_i830.h
deleted file mode 100644
index cd30ae53ead..00000000000
--- a/x11/xf86-video-intel/patches/patch-src_i830.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_i830.h,v 1.1 2012/09/16 02:19:20 khorben Exp $
-
-Make xf86-video-intel driver work on Atom N455 + GMA3150 graphics chipset, much like done for xsrc already:
-http://mail-index.netbsd.org/source-changes/2012/06/08/msg034860.html
-
---- src/i830.h.orig	2009-05-13 00:12:11.000000000 +0000
-+++ src/i830.h
-@@ -972,6 +972,8 @@ static inline int i830_fb_compression_su
- 	return FALSE;
-     if (IS_I810(pI830) || IS_I815(pI830) || IS_I830(pI830))
- 	return FALSE;
-+    if (IS_IGD(pI830))
-+	return FALSE;
-     /* fbc depends on tiled surface. And we don't support tiled
-      * front buffer with XAA now.
-      */
diff --git a/x11/xf86-video-intel/patches/patch-src_i830__quirks.c b/x11/xf86-video-intel/patches/patch-src_i830__quirks.c
deleted file mode 100644
index 4b69c60f2c2..00000000000
--- a/x11/xf86-video-intel/patches/patch-src_i830__quirks.c
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-src_i830__quirks.c,v 1.1 2011/11/15 20:44:58 jakllsch Exp $
-
---- src/i830_quirks.c.orig	2009-05-13 00:12:11.000000000 +0000
-+++ src/i830_quirks.c
-@@ -32,8 +32,14 @@
- 
- #define SUBSYS_ANY (~0)
- 
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#define DMIID_SYSCTL_PREFIX "machdep.dmi."
-+#else
- #define DMIID_DIR "/sys/class/dmi/id/"
- #define DMIID_FILE(x) (DMIID_DIR # x)
-+#endif
- 
- typedef struct {
-     int chipType;
-@@ -66,6 +72,62 @@ enum i830_dmi_data_t {
- 
- static char *i830_dmi_data[dmi_data_max];
- 
-+#ifdef __NetBSD__
-+/* NetBSD 6.0+ stores DMI data in sysctl machdep.dmi.* */
-+static void
-+i830_dmi_sysctl_load(enum i830_dmi_data_t field)
-+{
-+	const char *name;
-+	char *buf;
-+	size_t buflen = 0;
-+	int err;
-+
-+	switch (field) {
-+	case bios_vendor:	name = DMIID_SYSCTL_PREFIX "bios-vendor"; break;
-+	case bios_version:	name = DMIID_SYSCTL_PREFIX "bios-version"; break;
-+	case bios_date:		name = DMIID_SYSCTL_PREFIX "bios-date"; break;
-+	case sys_vendor:	name = DMIID_SYSCTL_PREFIX "system-vendor"; break;
-+	case product_name:	name = DMIID_SYSCTL_PREFIX "system-product"; break;
-+	case product_version:	name = DMIID_SYSCTL_PREFIX "system-version"; break;
-+	case product_serial:	name = DMIID_SYSCTL_PREFIX "system-serial"; break;
-+	case product_uuid:	name = DMIID_SYSCTL_PREFIX "system-uuid"; break;
-+	case board_vendor:	name = DMIID_SYSCTL_PREFIX "board-vendor"; break;
-+	case board_name:	name = DMIID_SYSCTL_PREFIX "board-product"; break;
-+	case board_version:	name = DMIID_SYSCTL_PREFIX "board-version"; break;
-+	case board_serial:	name = DMIID_SYSCTL_PREFIX "board-serial"; break;
-+	default:		goto not_found;
-+	}
-+
-+	err = sysctlbyname(name, buf, &buflen, NULL, 0);
-+	if (err || buflen == 0)
-+		goto not_found;
-+
-+	buf = xcalloc(1, buflen);
-+	if (buf == NULL)
-+		goto not_found;
-+
-+	err = sysctlbyname(name, buf, &buflen, NULL, 0);
-+	if (err)
-+		goto not_found;
-+
-+	/* i830_dmi_scan uses a fixed-size buffer, use our own instead */
-+	xfree(i830_dmi_data[field]);
-+	i830_dmi_data[field] = buf;
-+
-+	return;
-+
-+not_found:
-+	xfree(i830_dmi_data[field]);
-+	i830_dmi_data[field] = NULL;
-+}
-+
-+#define I830_DMI_FIELD_FUNC(field) \
-+static void i830_dmi_store_##field(void) \
-+{\
-+    i830_dmi_sysctl_load(field);\
-+}
-+#else
-+/* Linux stores DMI data in /sys/class/dmi/id/... */
- #define I830_DMI_FIELD_FUNC(field) \
- static void i830_dmi_store_##field(void) \
- {\
-@@ -78,6 +140,7 @@ static void i830_dmi_store_##field(void)
-     fread(i830_dmi_data[field], 64, 1, f);\
-     fclose(f);\
- }
-+#endif
- 
- I830_DMI_FIELD_FUNC(bios_vendor);
- I830_DMI_FIELD_FUNC(bios_version);