Index: head/multimedia/kodi/files/patch-configure.ac
===================================================================
--- head/multimedia/kodi/files/patch-configure.ac	(revision 454562)
+++ head/multimedia/kodi/files/patch-configure.ac	(revision 454563)
@@ -1,181 +1,180 @@
---- configure.ac.orig	2017-05-24 20:49:32.000000000 +0000
-+++ configure.ac	2017-08-28 14:09:04.029056190 +0000
+--- configure.ac.orig	2017-05-25 08:49:32.000000000 +1200
++++ configure.ac	2017-10-28 22:32:23.769653000 +1300
 @@ -564,12 +564,36 @@
       CORE_SYSTEM_NAME=linux
       ARCH="x86-freebsd"
       MAKE="gmake"
 +     USE_STATIC_FFMPEG=1
       ;;
    amd64-*-freebsd*)
       target_platform=target_linux
       CORE_SYSTEM_NAME=linux
       ARCH="x86_64-freebsd"
       MAKE="gmake"
 +     USE_STATIC_FFMPEG=1
 +     ;;
 +  armv6-*-freebsd*)
 +     target_platform=target_linux
 +     ARCH="armv6-freebsd"
 +     MAKE="gmake"
 +     USE_STATIC_FFMPEG=1
 +     use_arch="arm"
 +     use_neon=no
 +     use_gles=yes
 +     use_gl=no
 +     use_x11=no
 +     ;;
 +  armv7-*-freebsd*)
 +     target_platform=target_linux
 +     ARCH="armv7-freebsd"
 +     MAKE="gmake"
 +     USE_STATIC_FFMPEG=1
 +     use_arch="arm"
 +     use_neon=no
 +     use_gles=yes
 +     use_gl=no
 +     use_x11=no
       ;;
    arm-apple-darwin*)
       CORE_SYSTEM_NAME=ios
 @@ -688,7 +712,7 @@
       use_hardcoded_tables="yes"
       use_openmax=no
       CORE_SYSTEM_NAME=rbpi
 -     ARCH="arm"
 +     ARCH="armv6-freebsd"
       AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])
       USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"])
       USE_MMAL=1; AC_DEFINE([HAS_MMAL],[1],["Define to 1 if MMAL libs is enabled"])
 @@ -759,10 +783,16 @@
  # platform specific flags
  if echo "$ARCH" | grep -q "freebsd" ; then
    LOCALBASE="${LOCALBASE:-/usr/local}"
 -  CFLAGS="$CFLAGS -I$LOCALBASE/include"
 -  CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"
 -  CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"
 +  CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"
 +  CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"
 +  CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"
    LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
 +  CC_FOR_BUILD="$CC"
 +  CXX_FOR_BUILD="$CXX"
 +  CFLAGS_FOR_BUILD="$CFLAGS"
 +  CXXFLAGS_FOR_BUILD="$CXXFLAGS"
 +  LDFLAGS_FOR_BUILD="$LDFLAGS"
 +  FFMPEG_OPTS="--cc=$CC --cxx=$CXX"
  fi
  if test "$host_vendor" = "apple" ; then
    # standard application paths
-@@ -802,8 +832,17 @@
+@@ -802,8 +832,16 @@
      LIBS="$LIBS -framework CoreFoundation"
    fi
  elif test "$target_platform" = "target_raspberry_pi"; then
 -  ARCH="arm"
 +  CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include/interface/vcos/pthreads/ -I$LOCALBASE/include/interface/vcos -I$LOCALBASE/include/interface/ -I$LOCALBASE/include/interface/vmcs_host/linux"
-+  ARCH="armv6-freebsd"
++  ARCH="$(uname -p)-freebsd"
    use_arch="arm"
 +  FFMPEG_OPTS="--cc=$CC --cxx=$CXX --disable-fast-unaligned --disable-vfp --disable-xlib --disable-libxcb --disable-libxcb-shm --disable-libxcb-xfixes --disable-libxcb-shape"
 +  if test "$use_platform" = "raspberry-pi2"; then
 +    CFLAGS="$CFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
 +    CXXFLAGS="$CXXFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
-+    ARCH="armv7-freebsd"
 +    FFMPEG_OPTS="${FFMPEG_OPTS} --enable-neon"
 +  fi
 +
  elif test "$use_arch" = "arm"; then
    CFLAGS="$CFLAGS -mno-apcs-stack-check"
    CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
-@@ -921,6 +960,7 @@
+@@ -921,6 +959,7 @@
  
  # Check inotify availability
  AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
 +AC_CHECK_LIB([inotify], [main],,)
  
  # Python
  if test -z "$PYTHON_NOVERSIONCHECK"; then
-@@ -1169,12 +1209,13 @@
+@@ -1169,12 +1208,13 @@
  )
  
  #Check to see if libs are needed for functions that are often built-in to libc
 -AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))
 +AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))
  AC_SEARCH_LIBS([dlopen],dl)
  AC_SEARCH_LIBS([clock_gettime],rt)
  AC_SEARCH_LIBS([dn_expand],  resolv)
  AC_SEARCH_LIBS([_dn_expand], resolv)
  AC_SEARCH_LIBS([__dn_expand],resolv)
 +AC_SEARCH_LIBS([__atomic_load_8], [atomic])
  
  # platform dependent libraries
  if test "$host_vendor" = "apple" ; then
-@@ -1558,7 +1599,7 @@
+@@ -1558,7 +1598,7 @@
  
    if test "$cross_compiling" != "yes"; then
      if test "$use_debug" != "yes"; then
 -      FFMPEG_OPTS="-r"
 +      FFMPEG_OPTS="${FFMPEG_OPTS} -r"
      fi
      if test "$use_optimizations" != "yes"; then
        FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
-@@ -1569,7 +1610,7 @@
+@@ -1569,7 +1609,7 @@
        SAVE_LIBS="$LIBS"
        # check for system installed ffmpeg. We require minimum versions.
        PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
 -        [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
 +        [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
          [FFMPEG_FOUND="false"])
  
        if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
-@@ -1596,7 +1637,11 @@
+@@ -1596,7 +1636,11 @@
      elif test "$with_ffmpeg" = "force"; then
        # always build our ffmpeg
        AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
 -      CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS}
 +      if test "$use_arch" = "arm"; then
 +        ASFLAGS="-no-integrated-as" CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} || exit 1
 +      else
 +        CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} || exit 1
 +      fi
        export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
  
      elif test "$with_ffmpeg" != "no"; then
-@@ -1609,7 +1654,7 @@
+@@ -1609,7 +1653,7 @@
  
  if test "$FFMPEG_FOUND" != "true"; then
    PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
 -    [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
 +    [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
      [AC_MSG_ERROR("ffmpeg not found")])
  fi
  
-@@ -1633,9 +1678,9 @@
+@@ -1633,9 +1677,9 @@
  echo "Checking for SWIG installation"
  AC_PATH_PROG(SWIG_EXE, swig, "none")
  if test "$SWIG_EXE" = "none"; then
 -  AC_PATH_PROG(SWIG20_EXE, swig2.0, "none")
 -  if test "$SWIG20_EXE" != "none" ; then
 -    SWIG_EXE=$SWIG20_EXE
 +  AC_PATH_PROG(SWIG30_EXE, swig3.0, "none")
 +  if test "$SWIG30_EXE" != "none" ; then
 +    SWIG_EXE=$SWIG30_EXE
    fi
  fi
  if test "$SWIG_EXE" = "none"; then
-@@ -1928,7 +1973,7 @@
+@@ -1928,7 +1972,7 @@
    AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
      [$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
    if test "$TEXTUREPACKER" = "none"; then
 -    make -C ${abs_top_srcdir}/tools/depends/native/TexturePacker
 +    $MAKE -C ${abs_top_srcdir}/tools/depends/native/TexturePacker
      TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
    fi
    if test -x "$TEXTUREPACKER"; then
-@@ -2148,6 +2193,8 @@
+@@ -2148,6 +2192,8 @@
    LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
  fi
  
 +LIBS=$(echo "$LIBS" | tr "\n" " ")
 +
  OUTPUT_FILES="Makefile \
      Makefile.include \
      addons/skin.estuary/media/Makefile \