xf86-video-intel-git: fix build. now this crashes at runtime.

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Fri Sep 14 06:00:37 2018 +0300
Changeset:	21538c761dfdd2bb3bfdffa5d72329c0d0a9b1b9

Modified Files:
	xf86-video-intel-git/Makefile
	xf86-video-intel-git/PLIST
	xf86-video-intel-git/distinfo
Added Files:
	xf86-video-intel-git/patches/patch-configure.ac
Removed Files:
	xf86-video-intel-git/patches/patch-src_backlight.c

Log Message:
xf86-video-intel-git: fix build. now this crashes at runtime.

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

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

diffstat:
 xf86-video-intel-git/Makefile                      |  1 +
 xf86-video-intel-git/PLIST                         |  4 ++-
 xf86-video-intel-git/distinfo                      |  2 +-
 xf86-video-intel-git/patches/patch-configure.ac    | 37 ++++++++++++++++++++++
 xf86-video-intel-git/patches/patch-src_backlight.c | 15 ---------
 5 files changed, 42 insertions(+), 17 deletions(-)

diffs:
diff --git a/xf86-video-intel-git/Makefile b/xf86-video-intel-git/Makefile
index 47653e3a78..3e95bb27bd 100644
--- a/xf86-video-intel-git/Makefile
+++ b/xf86-video-intel-git/Makefile
@@ -36,6 +36,7 @@ BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
 .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 "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-intel-git/PLIST b/xf86-video-intel-git/PLIST
index 45c2434c1c..3db3408c74 100644
--- a/xf86-video-intel-git/PLIST
+++ b/xf86-video-intel-git/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
+@comment $NetBSD$
+lib/libI810XvMC.la
+lib/libIntelXvMC.la
 lib/xorg/modules/drivers/intel_drv.la
 man/man4/intel.4
diff --git a/xf86-video-intel-git/distinfo b/xf86-video-intel-git/distinfo
index 44133f1a35..3f6e1a21a6 100644
--- a/xf86-video-intel-git/distinfo
+++ b/xf86-video-intel-git/distinfo
@@ -1,2 +1,2 @@
 $NetBSD: distinfo,v 1.1 2015/04/01 13:11:38 tnn2 Exp $
-SHA1 (patch-src_backlight.c) = 8cd0c6d2ae26370e4b4f9f2a3c8a6f081f3dc9f8
+SHA1 (patch-configure.ac) = 272b6be5a402b9366b03b87c658023335bffd6f4
diff --git a/xf86-video-intel-git/patches/patch-configure.ac b/xf86-video-intel-git/patches/patch-configure.ac
new file mode 100644
index 0000000000..a580ecc40e
--- /dev/null
+++ b/xf86-video-intel-git/patches/patch-configure.ac
@@ -0,0 +1,37 @@
+$NetBSD$
+
+Work around configure fail:
+xorg-server.h must be included first for _XORGSERVER64, else we have
+conflicting types:
+
+
+/home/fly/pkgsrc/wip/xf86-video-intel-git/work/.buildlink/include/X11/extensions/randrproto.h:53:17: error: conflicting types for 'CARD32'
+ #define RRLease CARD32
+                 ^
+/home/fly/pkgsrc/wip/xf86-video-intel-git/work/.buildlink/include/xorg/randrstr.h:66:13: note: in expansion of macro 'RRLease'
+ typedef XID RRLease;
+             ^~~~~~~
+In file included from /home/fly/pkgsrc/wip/xf86-video-intel-git/work/.buildlink/include/xorg/misc.h:76:0,
+                 from /home/fly/pkgsrc/wip/xf86-video-intel-git/work/.buildlink/include/xorg/xf86str.h:37,
+                 from conftest.c:55:
+/home/fly/pkgsrc/wip/xf86-video-intel-git/work/.buildlink/include/X11/Xmd.h:108:22: note: previous declaration of 'CARD32' was here
+ typedef unsigned int CARD32;
+                      ^~~~~~
+
+
+--- configure.ac.orig	2018-09-14 02:26:58.000000000 +0000
++++ configure.ac
+@@ -495,10 +495,10 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DR
+         CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS"
+         CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS"
+         AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no],
+-                [/* for dri.h */
+-                 #include <xf86str.h>
+-                 /* for dristruct.h */
++                [/* for dristruct.h */
+                  #include <xorg-server.h>
++                 /* for dri.h */
++                 #include <xf86str.h>
+                  #ifdef HAVE_DRI_H
+                  # include <dri.h>
+                  #endif
diff --git a/xf86-video-intel-git/patches/patch-src_backlight.c b/xf86-video-intel-git/patches/patch-src_backlight.c
deleted file mode 100644
index 04d4cc19fd..0000000000
--- a/xf86-video-intel-git/patches/patch-src_backlight.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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];