xf86-video-intel: catch up with upstream

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Sep 22 20:01:54 2015 +0200
Changeset:	f7a8360c5cca6b292eeae0f35ec92413d32c8ffa

Modified Files:
	xf86-video-intel/Makefile
	xf86-video-intel/distinfo
Added Files:
	xf86-video-intel/patches/patch-src_backlight.c

Log Message:
xf86-video-intel: catch up with upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f7a8360c5cca6b292eeae0f35ec92413d32c8ffa

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

diffstat:
 xf86-video-intel/Makefile                      |  8 ++++----
 xf86-video-intel/distinfo                      |  1 +
 xf86-video-intel/patches/patch-src_backlight.c | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diffs:
diff --git a/xf86-video-intel/Makefile b/xf86-video-intel/Makefile
index 95e0e62..1d893ff 100644
--- a/xf86-video-intel/Makefile
+++ b/xf86-video-intel/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Modular Xorg Intel video driver
 CONFLICTS+=	xf86-video-i810-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-dri
+CONFIGURE_ARGS+=	--enable-dri2
 CONFIGURE_ARGS+=	--disable-dri3
 
 GNU_CONFIGURE=	YES
@@ -31,11 +32,10 @@ pre-configure:
 
 BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
 
-.include "../../wip/modular-xorg-server/buildlink3.mk"
-.include "../../wip/MesaLib/buildlink3.mk"
-.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/libXvMC/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-intel/distinfo b/xf86-video-intel/distinfo
index fdafb8a..44133f1 100644
--- a/xf86-video-intel/distinfo
+++ b/xf86-video-intel/distinfo
@@ -1 +1,2 @@
 $NetBSD: distinfo,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
+SHA1 (patch-src_backlight.c) = 8cd0c6d2ae26370e4b4f9f2a3c8a6f081f3dc9f8
diff --git a/xf86-video-intel/patches/patch-src_backlight.c b/xf86-video-intel/patches/patch-src_backlight.c
new file mode 100644
index 0000000..04d4cc1
--- /dev/null
+++ b/xf86-video-intel/patches/patch-src_backlight.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix forward declaration.
+
+--- src/backlight.c.orig	2015-09-22 17:33:34.000000000 +0000
++++ src/backlight.c
+@@ -532,6 +532,8 @@ void backlight_close(struct backlight *b
+ 		waitpid(b->pid, NULL, 0);
+ }
+ 
++static int __backlight_exists(const char *iface);
++
+ char *backlight_find_for_device(struct pci_device *pci)
+ {
+ 	char path[200];