Add some patches and dependencies to make it progress further in

an empty chroot with modular x.org.

Now stops building for me with
wrapper.c:482:71: error: unknown type name '_G_va_list'
 int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, _G_va_list ap)
                                                                       ^

4 files changed, 55 insertions, 9 deletions

diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index b87a2874a8c..dc7719b091e 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/19 02:34:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/22 11:35:02 wiz Exp $
 
 PKGNAME=	kodi-15.2
 PKGREVISION=	2
@@ -10,12 +10,18 @@ MAINTAINER=	jmcneill@invisible.ca
 HOMEPAGE=	http://kodi.tv/
 COMMENT=	Open source software media center
 LICENSE=	gnu-gpl-v2
-PLIST_SUBST+=	MACHINE_CPU=${MACHINE_CPU}
+
+DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
+DEPENDS+=	zip-[0-9]*:../../archivers/zip
+BUILD_DEPENDS+=	gettext-tools-[0-9]*:../../devel/gettext-tools
+BUILD_DEPENDS+=	cmake-[0-9]*:../../devel/cmake
+BUILD_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
 
 EXTRACT_USING=	gtar
 
 WRKSRC=			${WRKDIR}/xbmc-15.2-Isengard
-USE_TOOLS+=		pkg-config automake autoconf autoreconf gmake bash
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config automake autoconf autoreconf gawk gmake bash
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_JAVA2=		yes
@@ -29,6 +35,8 @@ CONFIG_SUB_OVERRIDE=    lib/libmpeg2/.auto/config.sub \
 
 CONFIGURE_ENV+=		ac_cv_path_SWIG_EXE=${PREFIX}/bin/swig2.0
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # insists on < 3.0 as of 15.2
+
 # These need to be ported
 CONFIGURE_ARGS+=	--disable-projectm
 CONFIGURE_ARGS+=	--disable-rsxs
@@ -43,12 +51,11 @@ PKGCONFIG_OVERRIDE+=	tools/depends/native/libsquish-native/src/squish.pc.in
 PKGCONFIG_OVERRIDE+=	xbmc/visualizations/Goom/goom2k4-0/libgoom2.pc.in
 PKGCONFIG_OVERRIDE+=	xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.pc.in
 
+PLIST_SUBST+=	MACHINE_CPU=${MACHINE_CPU}
+
 pre-configure:
 	cd ${WRKSRC} && ${SH} ./bootstrap
 
-DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
-DEPENDS+=	zip-[0-9]*:../../archivers/zip
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../audio/libao/buildlink3.mk"
@@ -73,6 +80,7 @@ DEPENDS+=	zip-[0-9]*:../../archivers/zip
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo
index ba100f36785..bb1eddb1017 100644
--- a/multimedia/kodi/distinfo
+++ b/multimedia/kodi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/11/19 02:31:47 jmcneill Exp $
+$NetBSD: distinfo,v 1.9 2015/11/22 11:35:02 wiz Exp $
 
 SHA1 (15.2-Isengard.tar.gz) = 4acb4a60eadc7289f873cff5add31693b9520cba
 RMD160 (15.2-Isengard.tar.gz) = d81d3f15783b2b69920ea85d7e04f01872f2d85f
@@ -7,10 +7,11 @@ Size (15.2-Isengard.tar.gz) = 61484128 bytes
 SHA1 (patch-Makefile.in) = 10fa432a7b2dc53bdfa3f679890a343db3cca304
 SHA1 (patch-bootstrap) = 179a827d07d8a5ca6566ac247a167197652384f6
 SHA1 (patch-codegenerator.mk) = faf908bf1614f68f3a67faa9ac3139d5851daf95
-SHA1 (patch-configure.ac) = 5b19831d7a120261f7c5a42b86c55f14428afa46
+SHA1 (patch-configure.ac) = 0ea925fbc880851a413ec03b236ee99712a6c6d0
 SHA1 (patch-lib_cximage-6.0_CxImage_DllInterface.cpp) = 7f0d2d6fb46aa99d1889609e257b0978e72e1c6c
 SHA1 (patch-lib_cximage-6.0_CxImage_ximage.h) = da60aeaaa22daefaf6b91bff602ce15618e4c5a0
 SHA1 (patch-lib_cximage-6.0_CxImage_ximainfo.cpp) = 2457e20bfec3d0dc12edee3679167f092555b153
+SHA1 (patch-lib_gtest_configure.ac) = 5c45c0ee6c997157c4e2bfe9d99c2e1e5b63ad1d
 SHA1 (patch-m4_xbmc__arch.m4) = ec0018a5a07cd8ab0e6718585fe8dcc9dd561c02
 SHA1 (patch-xbmc_GUIInfoManager.cpp) = 8ffd619dfc7f611da927422e9be295d8fa5fb71c
 SHA1 (patch-xbmc_Makefile.in) = 8a55856686715244d9999f846a2cc8bac6f08a21
diff --git a/multimedia/kodi/patches/patch-configure.ac b/multimedia/kodi/patches/patch-configure.ac
index 8839e900520..aad11a55732 100644
--- a/multimedia/kodi/patches/patch-configure.ac
+++ b/multimedia/kodi/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.3 2015/11/17 18:14:07 jmcneill Exp $
+$NetBSD: patch-configure.ac,v 1.4 2015/11/22 11:35:02 wiz Exp $
 
 --- configure.ac.orig	2015-10-19 06:31:15.000000000 +0000
 +++ configure.ac
@@ -28,6 +28,19 @@ $NetBSD: patch-configure.ac,v 1.3 2015/11/17 18:14:07 jmcneill Exp $
    arm-apple-darwin*)
       use_joystick=no
       use_neon=yes
+@@ -1013,10 +1032,10 @@ if test "$use_wayland" = "yes"; then
+                       [have_weston_sdk=no; AC_MSG_WARN($missing_library)])
+ 
+     AC_CHECK_PROG(WAYLAND_SCANNER, wayland-scanner, "wayland-scanner", "no")
+-    if test "x$WAYLAND_SCANNER" == "xno"; then
++    if test "x$WAYLAND_SCANNER" = "xno"; then
+       AC_MSG_WARN($missing_program)
+     else
+-      if test "x$have_weston_sdk" == "xyes" && test "x$have_pixman" = "xyes"; then
++      if test "x$have_weston_sdk" = "xyes" && test "x$have_pixman" = "xyes"; then
+         AC_SUBST(WAYLAND_TEST_INCLUDES,"$WAYLAND_CLIENT_CFLAGS $XKBCOMMON_CFLAGS $PIXMAN_CFLAGS $WESTON_CFLAGS")
+         AC_SUBST(WAYLAND_TEST_LIBS,"$WAYLAND_CLIENT_LIBS $XKBCOMMON_LIBS $PIXMAN_LIBS $WESTON_LIBS")
+         AC_DEFINE([HAVE_WESTON_SDK], [1], [Define to 1 if Weston SDK is installed.])
 @@ -1540,6 +1559,9 @@ if test "x$use_samba" != "xno"; then
    USE_LIBSMBCLIENT=1
  fi
@@ -38,3 +51,14 @@ $NetBSD: patch-configure.ac,v 1.3 2015/11/17 18:14:07 jmcneill Exp $
  # libnfs
  if test "$use_libnfs" != "no"; then
    AC_CHECK_HEADERS([nfsc/libnfs.h],,
+@@ -1598,8 +1620,8 @@ if test "x$use_airtunes" != "xno"; then
+     AC_DEFINE([HAVE_LIBSHAIRPLAY],[1],["Define to 1 if you have libshairplay."])
+   fi
+ 
+-  if test "x$USE_AIRTUNES" == "x0"; then
+-    if test "x$use_airtunes" == "xyes"; then
++  if test "x$USE_AIRTUNES" = "x0"; then
++    if test "x$use_airtunes" = "xyes"; then
+       AC_MSG_ERROR("No airtunes library could be found. (libshairplay)")
+     fi
+     use_airtunes="no"
diff --git a/multimedia/kodi/patches/patch-lib_gtest_configure.ac b/multimedia/kodi/patches/patch-lib_gtest_configure.ac
new file mode 100644
index 00000000000..fd0bc5fb43d
--- /dev/null
+++ b/multimedia/kodi/patches/patch-lib_gtest_configure.ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_gtest_configure.ac,v 1.1 2015/11/22 11:35:02 wiz Exp $
+
+--- lib/gtest/configure.ac.orig	2015-10-19 06:31:15.000000000 +0000
++++ lib/gtest/configure.ac
+@@ -55,7 +55,7 @@ AS_IF([test "x$with_pthreads" != "xno"],
+                [AC_MSG_FAILURE(
+                  [--with-pthreads was specified, but unable to be used])])])
+        have_pthreads="$acx_pthread_ok"])
+-AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"])
++AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"])
+ AC_SUBST(PTHREAD_CFLAGS)
+ AC_SUBST(PTHREAD_LIBS)
+