Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Apr 2016 18:08:56 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413474 - in head/multimedia/kodi: . files
Message-ID:  <201604161808.u3GI8u7G075761@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Apr 16 18:08:55 2016
New Revision: 413474
URL: https://svnweb.freebsd.org/changeset/ports/413474

Log:
  Update to upstream version 16.0
  
  Detailed maintainer log:
  - pulseaudio removed from default option: because otherwise kodi will select
    pulseaudio first and it's really not needed.
  - texturepacker disabled: because it's so heavily broken in upstream. not
    really important. it will be back in 17.0 with the new cmake build system.
  - switch to swig3, like all linux distrib (no change)
  
  PR:		208456
  Submitted by:	mickael.maillot@gmail.com (maintainer)

Added:
  head/multimedia/kodi/files/patch-lib_cpluff_autogen.sh   (contents, props changed)
  head/multimedia/kodi/files/patch-lib_cpluff_configure.ac   (contents, props changed)
  head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-2.8.6-Jarvis-16.0_libavutil_x86_asm.h   (contents, props changed)
  head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile   (contents, props changed)
  head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh
     - copied, changed from r413473, head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh
  head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp   (contents, props changed)
  head/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkOSS.cpp   (contents, props changed)
  head/multimedia/kodi/files/patch-xbmc_cores_dvdplayer_DVDDemuxSPU.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp
  head/multimedia/kodi/files/patch-xbmc_dialogs_GUIDialogGamepad.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp
  head/multimedia/kodi/files/patch-xbmc_dialogs_GUIDialogNumeric.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp
  head/multimedia/kodi/files/patch-xbmc_guilib_GUIAction.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp
  head/multimedia/kodi/files/patch-xbmc_guilib_GUISpinControl.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp
  head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXPR.h
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h
  head/multimedia/kodi/files/patch-xbmc_guilib_XBTF.h
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h
  head/multimedia/kodi/files/patch-xbmc_interfaces_builtins_GUIContainerBuiltins.cpp   (contents, props changed)
  head/multimedia/kodi/files/patch-xbmc_interfaces_builtins_WeatherBuiltins.cpp   (contents, props changed)
  head/multimedia/kodi/files/patch-xbmc_interfaces_legacy_Dialog.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp
  head/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp
  head/multimedia/kodi/files/patch-xbmc_main_main.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__main__main.cpp
  head/multimedia/kodi/files/patch-xbmc_music_tags_MusicInfoTagLoaderCDDA.cpp   (contents, props changed)
  head/multimedia/kodi/files/patch-xbmc_pvr_PVRActionListener.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp
  head/multimedia/kodi/files/patch-xbmc_pvr_recordings_PVRRecording.cpp   (contents, props changed)
  head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp
  head/multimedia/kodi/files/patch-xbmc_storage_linux_DeviceKitDisksProvider.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp
  head/multimedia/kodi/files/patch-xbmc_storage_linux_UDisksProvider.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp
  head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
  head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp
  head/multimedia/kodi/files/patch-xbmc_windowing_WinEventsX11.cpp
     - copied, changed from r413473, head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp
Deleted:
  head/multimedia/kodi/files/patch-clang
  head/multimedia/kodi/files/patch-ffmpegx86
  head/multimedia/kodi/files/patch-freebsd
  head/multimedia/kodi/files/patch-lib_cximage-6.0_raw_dcraw.c
  head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh
  head/multimedia/kodi/files/patch-xbmc__LangInfo.cpp
  head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp
  head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp
  head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp
  head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp
  head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp
  head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h
  head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h
  head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp
  head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp
  head/multimedia/kodi/files/patch-xbmc__main__main.cpp
  head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp
  head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp
  head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp
  head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp
  head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
  head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp
  head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp
Modified:
  head/multimedia/kodi/Makefile
  head/multimedia/kodi/distinfo
  head/multimedia/kodi/files/patch-Makefile.include.in
  head/multimedia/kodi/files/patch-configure.ac
  head/multimedia/kodi/pkg-plist

Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile	Sat Apr 16 18:03:17 2016	(r413473)
+++ head/multimedia/kodi/Makefile	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
-DISTVERSION=	15.2
-PORTREVISION=	2
+DISTVERSION=	16.0
 CATEGORIES=	multimedia java
 
 MAINTAINER=	mickael.maillot@gmail.com
@@ -18,22 +17,24 @@ BUILD_DEPENDS=	enca:converters/enca \
 		unzip:archivers/unzip \
 		nasm:devel/nasm \
 		gtk-update-icon-cache:x11-toolkits/gtk20 \
-		swig2.0:devel/swig20
+		swig3.0:devel/swig30
 LIB_DEPENDS=	libass.so:multimedia/libass \
+		libFLAC.so:audio/flac \
 		libboost_thread.so:devel/boost-libs \
 		libcdio.so:sysutils/libcdio	\
+		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
 		libdbus-1.so:devel/dbus \
+		libdcadec.so:multimedia/libdcadec \
 		libdrm.so:graphics/libdrm \
 		libenca.so:converters/enca \
-		libFLAC.so:audio/flac \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgnutls.so:security/gnutls \
-		liblzo2.so:archivers/lzo2 \
 		libjasper.so:graphics/jasper \
 		libltdl.so:devel/libltdl \
+		liblzo2.so:archivers/lzo2 \
 		libmodplug.so:audio/libmodplug \
 		libmpeg2.so:multimedia/libmpeg2 \
 		libpcre.so:devel/pcre \
@@ -51,7 +52,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 		xdpyinfo:x11/xdpyinfo
 
 USE_GITHUB=	yes
-GH_TUPLE=	xbmc:xbmc:f4dda26 xbmc:FFmpeg:2.6.4-Isengard:ffmpeg
+GH_TUPLE=	xbmc:xbmc:a5f3a99 xbmc:FFmpeg:2.8.6-Jarvis-${DISTVERSION}:ffmpeg
 
 USES=		autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
 		libtool pkgconfig python:2
@@ -81,8 +82,8 @@ CEC_DESC=	CEC adapter support
 NONFREE_DESC=	Enable non-free components (rar, ccx, ffmpeg)
 SFTP_DESC=	SSH SFTP support via libssh
 
-OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI LIBBLURAY LIRC MYSQL \
-			NFS PULSEAUDIO RTMP SFTP SMB VAAPI VDPAU WEBSERVER
+OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC \
+		MYSQL NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER
 
 AIRPLAY_LIB_DEPENDS=	libplist.so:devel/libplist
 AIRPLAY_CONFIGURE_ENABLE=	airplay
@@ -93,8 +94,7 @@ AIRTUNES_CONFIGURE_ENABLE=	airtunes
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
-CEC_BROKEN=		libcec >= 3.0.0 has not been ported yet
-CEC_BUILD_DEPENDS=	libcec>=3.0.0:multimedia/libcec
+CEC_BUILD_DEPENDS=	libcec>=3.1.0:multimedia/libcec
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec
 CEC_CONFIGURE_ENABLE=	libcec
 
@@ -136,7 +136,7 @@ SFTP_BUILD_DEPENDS=	${LOCALBASE}/lib/lib
 SFTP_RUN_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
 SFTP_CONFIGURE_ENABLE=	ssh
 
-CONFIGURE_ARGS+=	--disable-debug --disable-alsa
+CONFIGURE_ARGS+=	--disable-debug --disable-alsa --disable-texturepacker
 
 post-extract:
 	${MV} ${WRKSRC_ffmpeg} ${WRKSRC}/tools/depends/target/ffmpeg/
@@ -146,7 +146,7 @@ post-patch:
 		${WRKSRC}/bootstrap \
 		${WRKSRC}/codegenerator.mk \
 		${WRKSRC}/xbmc/Makefile.in
-	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk
+	${REINPLACE_CMD} 's;which swig;&3.0;' ${WRKSRC}/codegenerator.mk
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} ./bootstrap

Modified: head/multimedia/kodi/distinfo
==============================================================================
--- head/multimedia/kodi/distinfo	Sat Apr 16 18:03:17 2016	(r413473)
+++ head/multimedia/kodi/distinfo	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
-SHA256 (xbmc-xbmc-15.2-f4dda26_GH0.tar.gz) = 6bf415258a3dffd4843e9446a62d9392997556240b7db703acb44d2bef3454d5
-SIZE (xbmc-xbmc-15.2-f4dda26_GH0.tar.gz) = 61476469
-SHA256 (xbmc-FFmpeg-2.6.4-Isengard_GH0.tar.gz) = 2487a6d4ad5701ad22582fc064ce39b60c383eec4958ca1e3218379035fa523f
-SIZE (xbmc-FFmpeg-2.6.4-Isengard_GH0.tar.gz) = 9365476
+SHA256 (xbmc-xbmc-16.0-a5f3a99_GH0.tar.gz) = 3589defd51d0f39eff8c293c8223b8cae188a89474f63695d8aeeb1206565b96
+SIZE (xbmc-xbmc-16.0-a5f3a99_GH0.tar.gz) = 52091610
+SHA256 (xbmc-FFmpeg-2.8.6-Jarvis-16.0_GH0.tar.gz) = b08d8dc171f19627025136b498dfcad4f1b84923de7a62696d8a9a7f1d979b01
+SIZE (xbmc-FFmpeg-2.8.6-Jarvis-16.0_GH0.tar.gz) = 10264915

Modified: head/multimedia/kodi/files/patch-Makefile.include.in
==============================================================================
--- head/multimedia/kodi/files/patch-Makefile.include.in	Sat Apr 16 18:03:17 2016	(r413473)
+++ head/multimedia/kodi/files/patch-Makefile.include.in	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,9 +1,7 @@
-diff --git Makefile.include.in Makefile.include.in
-index 6ee228a..daeb046 100644
---- Makefile.include.in
+--- Makefile.include.in.orig	2016-02-20 15:21:19 UTC
 +++ Makefile.include.in
-@@ -43,7 +43,8 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
- INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
+@@ -47,7 +47,8 @@ INCLUDES+=-I@abs_top_srcdir@/addons/libr
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.kodi.audioengine
  INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
  INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
 -INCLUDES+=$(sort @INCLUDES@)
@@ -12,30 +10,30 @@ index 6ee228a..daeb046 100644
  INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
  INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
  DEFINES+= \
-@@ -91,22 +92,22 @@ GEN_DEPS=\
+@@ -95,22 +96,22 @@ GEN_DEPS=\
  
  %.o: %.cpp
  	@rm -f $@
--	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
-+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \
+-	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(CPPFLAGS) $< -o $@ \
++	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS) $< -o $@ \
  	&& $(GEN_DEPS)
  
  %.o: %.cc
  	@rm -f $@
--	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
-+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \
+-	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(CPPFLAGS) $< -o $@ \
++	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS) $< -o $@ \
  	&& $(GEN_DEPS)
  
  %.o: %.c
  	@rm -f $@
--	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
-+	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \
+-	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $(CPPFLAGS) $< -o $@ \
++	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $< -o $@ \
  	&& $(GEN_DEPS)
  
  %.o: %.C
  	@rm -f $@
--	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
-+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \
+-	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $(CPPFLAGS) $< -o $@ \
++	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $< -o $@ \
  	&& $(GEN_DEPS)
  
  %.o: %.S

Modified: head/multimedia/kodi/files/patch-configure.ac
==============================================================================
--- head/multimedia/kodi/files/patch-configure.ac	Sat Apr 16 18:03:17 2016	(r413473)
+++ head/multimedia/kodi/files/patch-configure.ac	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,19 +1,20 @@
---- configure.ac.orig	2015-08-16 14:37:32 UTC
+--- configure.ac.orig	2016-02-20 15:21:19 UTC
 +++ configure.ac
-@@ -636,10 +636,12 @@
-   i386-*-freebsd*)
+@@ -599,11 +599,13 @@ case $host in
+      target_platform=target_linux
       ARCH="x86-freebsd"
       MAKE="gmake"
 +     USE_STATIC_FFMPEG=1
       ;;
    amd64-*-freebsd*)
+      target_platform=target_linux
       ARCH="x86_64-freebsd"
       MAKE="gmake"
 +     USE_STATIC_FFMPEG=1
       ;;
    arm-apple-darwin*)
       use_joystick=no
-@@ -824,10 +826,16 @@
+@@ -777,10 +779,16 @@ fi
  # platform specific flags
  if echo "$ARCH" | grep -q "freebsd" ; then
    LOCALBASE="${LOCALBASE:-/usr/local}"
@@ -33,7 +34,7 @@
  fi
  if test "$host_vendor" = "apple" ; then
    # standard application paths
-@@ -960,6 +968,7 @@
+@@ -913,6 +921,7 @@ AC_LANG_POP([C++])
  
  # Check inotify availability
  AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
@@ -41,7 +42,7 @@
  
  # Checks for boost headers using CXX instead of CC
  AC_LANG_PUSH([C++])
-@@ -1257,12 +1266,13 @@
+@@ -1228,12 +1237,13 @@ AS_CASE([x$use_libbluray],
  )
  
  #Check to see if libs are needed for functions that are often built-in to libc
@@ -56,7 +57,7 @@
  
  # platform dependent libraries
  if test "$host_vendor" = "apple" ; then
-@@ -1727,7 +1737,7 @@
+@@ -1654,7 +1664,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; th
  
    if test "$cross_compiling" != "yes"; then
      if test "$use_debug" != "yes"; then
@@ -65,7 +66,7 @@
      fi
      if test "$use_optimizations" != "yes"; then
        FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
-@@ -1738,7 +1748,7 @@
+@@ -1665,7 +1675,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; th
        SAVE_LIBS="$LIBS"
        # check for system installed ffmpeg. We require minimum versions.
        PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
@@ -74,7 +75,7 @@
          [FFMPEG_FOUND="false"])
  
        if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
-@@ -1765,7 +1775,7 @@
+@@ -1692,7 +1702,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; th
      elif test "$with_ffmpeg" = "force"; then
        # always build our ffmpeg
        AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
@@ -83,7 +84,7 @@
        export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
  
      elif test "$with_ffmpeg" != "no"; then
-@@ -1778,7 +1788,7 @@
+@@ -1705,7 +1715,7 @@ fi
  
  if test "$FFMPEG_FOUND" != "true"; then
    PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
@@ -92,7 +93,20 @@
      [AC_MSG_ERROR("ffmpeg not found")])
  fi
  
-@@ -2173,7 +2183,7 @@
+@@ -1731,9 +1741,9 @@ fi
+ 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
+@@ -2065,7 +2075,7 @@ fi
  # we don't compile with default upstream squish, so we use our own one
  # even on non unified deps platforms
  if test "$cross_compiling" != "yes"; then
@@ -101,7 +115,7 @@
    export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
  fi
  PKG_CHECK_MODULES([SQUISH], [squish],
-@@ -2184,7 +2194,7 @@
+@@ -2076,7 +2086,7 @@ if test "x$use_texturepacker" != "xno"; 
    AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
      [$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
    if test "$TEXTUREPACKER" = "none"; then
@@ -110,7 +124,7 @@
      TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
    fi
    if test -x "$TEXTUREPACKER"; then
-@@ -2448,6 +2458,8 @@
+@@ -2346,6 +2356,8 @@ if test "$host_vendor" = "apple" ; then
    LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
  fi
  

Added: head/multimedia/kodi/files/patch-lib_cpluff_autogen.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-lib_cpluff_autogen.sh	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,11 @@
+--- lib/cpluff/autogen.sh.orig	2016-02-20 15:21:19 UTC
++++ lib/cpluff/autogen.sh
+@@ -15,7 +15,7 @@ fi
+ 
+ # Generate files in top level directory
+ cd "$basedir"
+-autopoint
++#autopoint
+ rm -f ABOUT-NLS
+ test -d auxliary || mkdir auxliary
+ libtoolize --automake -f

Added: head/multimedia/kodi/files/patch-lib_cpluff_configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-lib_cpluff_configure.ac	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,30 @@
+--- lib/cpluff/configure.ac.orig	2016-02-20 15:21:19 UTC
++++ lib/cpluff/configure.ac
+@@ -109,12 +109,12 @@ if test "$enable_threads" != no; then
+     AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([#include <pthread.h>
+ 
+-int main(int argc, char **argv) {
++[int main(int argc, char **argv) {
+ 	pthread_mutex_t mutex;
+ 	
+ 	pthread_mutex_init(&mutex, NULL);
+ 	return 0;
+-}
++}]
+ ])], [AC_MSG_RESULT([yes])
+ cp_threads=Posix], AC_MSG_RESULT([no]))
+   fi
+@@ -126,10 +126,10 @@ cp_threads=Posix], AC_MSG_RESULT([no]))
+     AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([#include <windows.h>
+ 
+-int main(int argc, char **argv) {
++[int main(int argc, char **argv) {
+   CreateMutex(NULL, FALSE, NULL);
+   return 0;
+-}
++}]
+ ])], [AC_MSG_RESULT([yes])
+ cp_threads=Windows], AC_MSG_RESULT([no]))
+   fi

Added: head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-2.8.6-Jarvis-16.0_libavutil_x86_asm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-2.8.6-Jarvis-16.0_libavutil_x86_asm.h	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,11 @@
+--- tools/depends/target/ffmpeg/FFmpeg-2.8.6-Jarvis-16.0/libavutil/x86/asm.h.orig	2016-02-03 20:33:07 UTC
++++ tools/depends/target/ffmpeg/FFmpeg-2.8.6-Jarvis-16.0/libavutil/x86/asm.h
+@@ -72,7 +72,7 @@ typedef int32_t x86_reg;
+ typedef int x86_reg;
+ #endif
+ 
+-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+ 
+ #if ARCH_X86_64 && defined(PIC)

Added: head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,14 @@
+--- tools/depends/target/ffmpeg/Makefile.orig	2016-02-20 15:21:19 UTC
++++ tools/depends/target/ffmpeg/Makefile
+@@ -24,6 +24,11 @@ ffmpg_config += --enable-libdcadec
+ ifeq ($(CROSS_COMPILING), yes)
+   ffmpg_config += --arch=$(CPU) --enable-cross-compile
+ endif
++ifeq ($(OS), freebsd)
++  ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
++  ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls
++  ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis
++endif
+ ifeq ($(OS), linux)
+   ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
+   ffmpg_config += --enable-vdpau --enable-vaapi

Copied and modified: head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh (from r413473, head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh)
==============================================================================
--- head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- tools/depends/target/ffmpeg/autobuild.sh.orig	2015-08-16 14:37:32 UTC
+--- tools/depends/target/ffmpeg/autobuild.sh.orig	2016-02-20 15:21:19 UTC
 +++ tools/depends/target/ffmpeg/autobuild.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
@@ -66,8 +66,8 @@
  
  CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
  ./configure --prefix=$FFMPEG_PREFIX \
-@@ -161,11 +170,11 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LD
- 	--disable-mipsdspr2 \
+@@ -162,11 +171,11 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LD
+ 	--enable-libdcadec \
          ${FLAGS}
  
 -make -j ${BUILDTHREADS} 

Added: head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,13 @@
+--- xbmc/LangInfo.cpp.orig	2016-02-20 15:21:19 UTC
++++ xbmc/LangInfo.cpp
+@@ -282,8 +282,8 @@ void CLangInfo::CRegion::SetGlobalLocale
+   // decimal separator is changed depending of the current language
+   // (ie. "," in French or Dutch instead of "."). This breaks atof() and
+   // others similar functions.
+-#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN_OSX) || defined(__UCLIBC__)
+-  // on FreeBSD, darwin and uClibc-based systems libstdc++ is compiled with
++#if defined(TARGET_DARWIN_OSX) || defined(__UCLIBC__)
++  // on darwin and uClibc-based systems libstdc++ is compiled with
+   // "generic" locale support
+   if (setlocale(LC_COLLATE, strLocale.c_str()) == NULL
+   || setlocale(LC_CTYPE, strLocale.c_str()) == NULL)

Added: head/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkOSS.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkOSS.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,11 @@
+--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp.orig	2016-02-20 15:21:19 UTC
++++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+@@ -289,6 +289,8 @@ bool CAESinkOSS::Initialize(AEAudioForma
+ #endif
+ 
+   int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES;
++  if (AE_IS_RAW_HD(format.m_dataFormat) && m_initFormat.m_dataFormat != AE_FMT_LPCM)
++    tmp *= 8;
+   int pos = 0;
+   while ((tmp & 0x1) == 0x0)
+   {

Copied and modified: head/multimedia/kodi/files/patch-xbmc_cores_dvdplayer_DVDDemuxSPU.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_cores_dvdplayer_DVDDemuxSPU.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/cores/dvdplayer/DVDDemuxSPU.cpp.orig	2015-06-23 09:40:13 UTC
+--- xbmc/cores/dvdplayer/DVDDemuxSPU.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
 @@ -18,6 +18,7 @@
   *

Copied and modified: head/multimedia/kodi/files/patch-xbmc_dialogs_GUIDialogGamepad.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_dialogs_GUIDialogGamepad.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/dialogs/GUIDialogGamepad.cpp.orig	2015-04-13 10:34:31 UTC
+--- xbmc/dialogs/GUIDialogGamepad.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/dialogs/GUIDialogGamepad.cpp
 @@ -18,6 +18,7 @@
   *

Copied and modified: head/multimedia/kodi/files/patch-xbmc_dialogs_GUIDialogNumeric.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_dialogs_GUIDialogNumeric.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/dialogs/GUIDialogNumeric.cpp.orig	2015-04-13 10:36:23 UTC
+--- xbmc/dialogs/GUIDialogNumeric.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/dialogs/GUIDialogNumeric.cpp
 @@ -18,6 +18,7 @@
   *
@@ -6,5 +6,5 @@
  
 +#include <stdlib.h>
  #include "GUIDialogNumeric.h"
- #include "guilib/GUILabelControl.h"
- #include "utils/md5.h"
+ 
+ #include <cassert>

Copied and modified: head/multimedia/kodi/files/patch-xbmc_guilib_GUIAction.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_guilib_GUIAction.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/guilib/GUIAction.cpp.orig	2015-04-13 12:41:36 UTC
+--- xbmc/guilib/GUIAction.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/guilib/GUIAction.cpp
 @@ -18,6 +18,7 @@
   *

Copied and modified: head/multimedia/kodi/files/patch-xbmc_guilib_GUISpinControl.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_guilib_GUISpinControl.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/guilib/GUISpinControl.cpp.orig	2015-04-13 12:48:49 UTC
+--- xbmc/guilib/GUISpinControl.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/guilib/GUISpinControl.cpp
 @@ -22,6 +22,7 @@
  #include "input/Key.h"
@@ -6,5 +6,5 @@
  #include <stdio.h>
 +#include <stdlib.h>
  
- using namespace std;
- 
+ #define SPIN_BUTTON_DOWN 1
+ #define SPIN_BUTTON_UP   2

Copied and modified: head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXPR.h (from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXPR.h	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/guilib/TextureBundleXPR.h.orig	2015-08-08 17:27:25 UTC
+--- xbmc/guilib/TextureBundleXPR.h.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/guilib/TextureBundleXPR.h
 @@ -24,6 +24,7 @@
  #include <string>

Copied and modified: head/multimedia/kodi/files/patch-xbmc_guilib_XBTF.h (from r413473, head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_guilib_XBTF.h	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,10 +1,10 @@
---- xbmc/guilib/XBTF.h.orig	2015-08-08 15:41:42 UTC
+--- xbmc/guilib/XBTF.h.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/guilib/XBTF.h
 @@ -22,6 +22,7 @@
- 
+ #include <map>
  #include <string>
  #include <vector>
 +#include <ctime>
+ 
  #include <stdint.h>
  
- #define XBTF_MAGIC "XBTF"

Added: head/multimedia/kodi/files/patch-xbmc_interfaces_builtins_GUIContainerBuiltins.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-xbmc_interfaces_builtins_GUIContainerBuiltins.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,10 @@
+--- xbmc/interfaces/builtins/GUIContainerBuiltins.cpp.orig	2016-02-20 15:21:19 UTC
++++ xbmc/interfaces/builtins/GUIContainerBuiltins.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "GUIContainerBuiltins.h"
+ 
+ #include "guilib/GUIWindowManager.h"

Added: head/multimedia/kodi/files/patch-xbmc_interfaces_builtins_WeatherBuiltins.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-xbmc_interfaces_builtins_WeatherBuiltins.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,10 @@
+--- xbmc/interfaces/builtins/WeatherBuiltins.cpp.orig	2016-02-20 15:21:19 UTC
++++ xbmc/interfaces/builtins/WeatherBuiltins.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "WeatherBuiltins.h"
+ 
+ #include "guilib/GUIWindowManager.h"

Copied and modified: head/multimedia/kodi/files/patch-xbmc_interfaces_legacy_Dialog.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_interfaces_legacy_Dialog.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/interfaces/legacy/Dialog.cpp.orig	2015-04-13 10:42:40 UTC
+--- xbmc/interfaces/legacy/Dialog.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/interfaces/legacy/Dialog.cpp
 @@ -19,6 +19,7 @@
   */

Copied and modified: head/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,6 +1,6 @@
---- xbmc/linux/XFileUtils.cpp.orig	2014-12-20 16:29:11 UTC
+--- xbmc/linux/XFileUtils.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/linux/XFileUtils.cpp
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
  #endif
  #include <dirent.h>
  #include <errno.h>

Copied and modified: head/multimedia/kodi/files/patch-xbmc_main_main.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__main__main.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__main__main.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_main_main.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/main/main.cpp.orig	2015-04-13 12:43:35 UTC
+--- xbmc/main/main.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/main/main.cpp
 @@ -28,6 +28,7 @@
  #ifdef TARGET_POSIX

Added: head/multimedia/kodi/files/patch-xbmc_music_tags_MusicInfoTagLoaderCDDA.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-xbmc_music_tags_MusicInfoTagLoaderCDDA.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,10 @@
+--- xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp.orig	2016-02-20 15:21:19 UTC
++++ xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
+@@ -25,6 +25,7 @@
+ #include "profiles/ProfilesManager.h"
+ #include "storage/MediaManager.h"
+ #include "utils/log.h"
++#include <stdlib.h>
+ 
+ using namespace MUSIC_INFO;
+ 

Copied and modified: head/multimedia/kodi/files/patch-xbmc_pvr_PVRActionListener.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_pvr_PVRActionListener.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,6 +1,6 @@
---- xbmc/pvr/PVRActionListener.cpp.orig	2015-04-13 10:38:08 UTC
+--- xbmc/pvr/PVRActionListener.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/pvr/PVRActionListener.cpp
-@@ -32,6 +32,7 @@
+@@ -28,6 +28,7 @@
  #include "settings/Settings.h"
  #include "utils/log.h"
  #include "utils/StringUtils.h"

Added: head/multimedia/kodi/files/patch-xbmc_pvr_recordings_PVRRecording.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi/files/patch-xbmc_pvr_recordings_PVRRecording.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -0,0 +1,10 @@
+--- xbmc/pvr/recordings/PVRRecording.cpp.orig	2016-02-20 15:21:19 UTC
++++ xbmc/pvr/recordings/PVRRecording.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "dialogs/GUIDialogOK.h"
+ #include "epg/Epg.h"
+ #include "epg/EpgContainer.h"

Copied and modified: head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,7 +1,7 @@
---- xbmc/settings/AdvancedSettings.cpp.orig	2015-04-21 18:46:28 UTC
+--- xbmc/settings/AdvancedSettings.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/settings/AdvancedSettings.cpp
-@@ -208,7 +208,7 @@
-   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)";
+@@ -203,7 +203,7 @@ void CAdvancedSettings::Initialize()
+   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-9][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)?";
  
    m_videoCleanStringRegExps.clear();
 -  m_videoCleanStringRegExps.push_back("[ _\\,\\.\\(\\)\\[\\]\\-](ac3|dts|custom|dc|remastered|divx|divx5|dsr|dsrip|dutch|dvd|dvd5|dvd9|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|extended|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|3d|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");

Copied and modified: head/multimedia/kodi/files/patch-xbmc_storage_linux_DeviceKitDisksProvider.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_storage_linux_DeviceKitDisksProvider.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/storage/linux/DeviceKitDisksProvider.cpp.orig	2015-04-13 10:45:50 UTC
+--- xbmc/storage/linux/DeviceKitDisksProvider.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/storage/linux/DeviceKitDisksProvider.cpp
 @@ -19,6 +19,7 @@
   */

Copied and modified: head/multimedia/kodi/files/patch-xbmc_storage_linux_UDisksProvider.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_storage_linux_UDisksProvider.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/storage/linux/UDisksProvider.cpp.orig	2015-04-13 12:39:11 UTC
+--- xbmc/storage/linux/UDisksProvider.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/storage/linux/UDisksProvider.cpp
 @@ -19,6 +19,7 @@
   */

Copied and modified: head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2014-12-22 23:11:35 UTC
+--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/threads/platform/pthreads/ThreadImpl.cpp
 @@ -31,9 +31,8 @@
  #include <sys/param.h>

Copied and modified: head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,6 +1,6 @@
---- xbmc/utils/CharsetConverter.cpp.orig	2015-08-10 08:41:28 UTC
+--- xbmc/utils/CharsetConverter.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/utils/CharsetConverter.cpp
-@@ -67,7 +67,7 @@
+@@ -70,7 +70,7 @@
    #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
    #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
    #define UTF8_SOURCE "UTF-8"

Copied and modified: head/multimedia/kodi/files/patch-xbmc_windowing_WinEventsX11.cpp (from r413473, head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp	Sat Apr 16 18:03:17 2016	(r413473, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_windowing_WinEventsX11.cpp	Sat Apr 16 18:08:55 2016	(r413474)
@@ -1,4 +1,4 @@
---- xbmc/windowing/WinEventsX11.cpp.orig	2015-04-13 10:40:08 UTC
+--- xbmc/windowing/WinEventsX11.cpp.orig	2016-02-20 15:21:19 UTC
 +++ xbmc/windowing/WinEventsX11.cpp
 @@ -23,6 +23,7 @@
  

Modified: head/multimedia/kodi/pkg-plist
==============================================================================
--- head/multimedia/kodi/pkg-plist	Sat Apr 16 18:03:17 2016	(r413473)
+++ head/multimedia/kodi/pkg-plist	Sat Apr 16 18:08:55 2016	(r413474)
@@ -4,8 +4,13 @@ bin/xbmc
 bin/xbmc-standalone
 include/kodi/AEChannelData.h
 include/kodi/DVDDemuxPacket.h
+include/kodi/kodi_adsp_dll.h
+include/kodi/kodi_adsp_types.h
 include/kodi/kodi_audiodec_dll.h
 include/kodi/kodi_audiodec_types.h
+include/kodi/kodi_audioengine_types.h
+include/kodi/libKODI_adsp.h
+include/kodi/libKODI_audioengine.h
 include/kodi/libKODI_guilib.h
 include/kodi/libXBMC_addon.h
 include/kodi/libXBMC_codec.h
@@ -26,17 +31,12 @@ include/kodi/xbmc_vis_dll.h
 include/kodi/xbmc_vis_types.h
 include/xbmc
 lib/kodi/addon-helpers.cmake
+lib/kodi/addons/library.kodi.adsp/libKODI_adsp-%%ARCH%%-freebsd.so
+lib/kodi/addons/library.kodi.audioengine/libKODI_audioengine-%%ARCH%%-freebsd.so
 lib/kodi/addons/library.kodi.guilib/libKODI_guilib-%%ARCH%%-freebsd.so
 lib/kodi/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so
 lib/kodi/addons/library.xbmc.codec/libXBMC_codec-%%ARCH%%-freebsd.so
 lib/kodi/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so
-lib/kodi/addons/screensaver.rsxs.euphoria/Euphoria.xbs
-lib/kodi/addons/screensaver.rsxs.plasma/Plasma.xbs
-lib/kodi/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs
-lib/kodi/addons/visualization.fishbmc/fishbmc.vis
-lib/kodi/addons/visualization.glspectrum/opengl_spectrum.vis
-lib/kodi/addons/visualization.projectm/projectM.vis
-lib/kodi/addons/visualization.waveform/Waveform.vis
 lib/kodi/addoptions.cmake
 lib/kodi/check_target_platform.cmake
 lib/kodi/handle-depends.cmake
@@ -45,7 +45,6 @@ lib/kodi/kodi-xrandr
 lib/kodi/kodi.bin
 lib/kodi/prepare-env.cmake
 lib/kodi/system/ImageLib-%%ARCH%%-freebsd.so
-lib/kodi/system/hdhomerun-%%ARCH%%-freebsd.so
 lib/kodi/system/libcpluff-%%ARCH%%-freebsd.so
 lib/kodi/system/libexif-%%ARCH%%-freebsd.so
 lib/kodi/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so
@@ -75,13 +74,17 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/icon.png
 %%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/resources/language/English/strings.po
 %%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/resources/settings.xml
+%%DATADIR%%/addons/kodi.adsp/addon.xml
 %%DATADIR%%/addons/kodi.audiodecoder/addon.xml
 %%DATADIR%%/addons/kodi.guilib/addon.xml
 %%DATADIR%%/addons/kodi.guilib/addon.xml.in
 %%DATADIR%%/addons/kodi.resource/addon.xml
 %%DATADIR%%/addons/kodi.resource/icon.png
+%%DATADIR%%/addons/kodi.resource/images.xsd
 %%DATADIR%%/addons/kodi.resource/language.xsd
 %%DATADIR%%/addons/kodi.resource/uisounds.xsd
+%%DATADIR%%/addons/library.kodi.adsp/libKODI_adsp.h
+%%DATADIR%%/addons/library.kodi.audioengine/libKODI_audioengine.h
 %%DATADIR%%/addons/library.kodi.guilib/libKODI_guilib.h
 %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.cpp
 %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.h
@@ -219,9 +222,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.common.imdb.com/changelog.txt
 %%DATADIR%%/addons/metadata.common.imdb.com/icon.png
 %%DATADIR%%/addons/metadata.common.imdb.com/imdb.xml
-%%DATADIR%%/addons/metadata.common.last.fm/addon.xml
-%%DATADIR%%/addons/metadata.common.last.fm/icon.png
-%%DATADIR%%/addons/metadata.common.last.fm/lastfm.xml
 %%DATADIR%%/addons/metadata.common.musicbrainz.org/addon.xml
 %%DATADIR%%/addons/metadata.common.musicbrainz.org/icon.png
 %%DATADIR%%/addons/metadata.common.musicbrainz.org/musicbrainz.xml
@@ -234,60 +234,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.local/addon.xml
 %%DATADIR%%/addons/metadata.local/icon.png
 %%DATADIR%%/addons/metadata.local/local.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/addon.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/changelog.txt
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/icon.png
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Afrikaans/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/English (New Zealand)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/English (US)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/French (Canada)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Icelandic/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Indonesian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Malay/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.po
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/settings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/tadb.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/addon.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/changelog.txt
 %%DATADIR%%/addons/metadata.themoviedb.org/icon.png
@@ -425,6 +371,59 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.tvdb.com/tvdb.xml
 %%DATADIR%%/addons/repository.xbmc.org/addon.xml
 %%DATADIR%%/addons/repository.xbmc.org/icon.png
+%%DATADIR%%/addons/resource.images.weathericons.default/License.txt
+%%DATADIR%%/addons/resource.images.weathericons.default/addon.xml
+%%DATADIR%%/addons/resource.images.weathericons.default/icon.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/0.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/1.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/10.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/11.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/12.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/13.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/14.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/15.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/16.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/17.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/18.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/19.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/2.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/20.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/21.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/22.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/23.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/24.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/25.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/26.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/27.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/28.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/29.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/3.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/30.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/31.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/32.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/33.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/34.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/35.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/36.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/37.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/38.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/39.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/4.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/40.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/41.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/42.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/43.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/44.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/45.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/46.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/47.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/5.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/6.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/7.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/8.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/9.png
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/License.txt
+%%DATADIR%%/addons/resource.images.weathericons.default/resources/na.png
 %%DATADIR%%/addons/resource.language.en_gb/addon.xml
 %%DATADIR%%/addons/resource.language.en_gb/icon.png
 %%DATADIR%%/addons/resource.language.en_gb/resources/langinfo.xml
@@ -438,12 +437,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/resource.uisounds.confluence/resources/out.wav
 %%DATADIR%%/addons/resource.uisounds.confluence/resources/shutter.wav
 %%DATADIR%%/addons/resource.uisounds.confluence/resources/sounds.xml
-%%DATADIR%%/addons/screensaver.rsxs.euphoria/addon.xml
-%%DATADIR%%/addons/screensaver.rsxs.euphoria/icon.png
-%%DATADIR%%/addons/screensaver.rsxs.plasma/addon.xml
-%%DATADIR%%/addons/screensaver.rsxs.plasma/icon.png
-%%DATADIR%%/addons/screensaver.rsxs.solarwinds/addon.xml
-%%DATADIR%%/addons/screensaver.rsxs.solarwinds/icon.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.black/addon.xml
 %%DATADIR%%/addons/screensaver.xbmc.builtin.black/icon.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/addon.xml
@@ -486,6 +479,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.lv_lv/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.mk_mk/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.mt_mt/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.my_mm/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.nb_no/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.nl_nl/strings.po
@@ -498,6 +492,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.sl_si/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.sq_al/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.sr_rs/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.sr_rs@latin/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.sv_se/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.tg_tj/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.th_th/strings.po
@@ -600,17 +595,15 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/720p/DialogAddonInfo.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogAddonSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogAlbumInfo.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogAudioDSPManager.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogAudioDSPSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogBusy.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogButtonMenu.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogContentSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogContextMenu.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogExtendedProgressBar.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogFavourites.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogFileStacking.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogGamepad.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogKaiToast.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogKeyboard.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogMediaFilter.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogMediaSource.xml
@@ -621,12 +614,11 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/720p/DialogPVRChannelManager.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPVRGroupManager.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideInfo.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideOSD.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRInfo.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRRadioRDSInfo.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPVRTimerSettings.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogPeripheralManager.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPeripheralSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPictureInfo.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogProgress.xml
@@ -639,6 +631,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/720p/DialogVideoInfo.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogVolumeBar.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogYesNo.xml
+%%DATADIR%%/addons/skin.confluence/720p/EventLog.xml
 %%DATADIR%%/addons/skin.confluence/720p/FileBrowser.xml
 %%DATADIR%%/addons/skin.confluence/720p/FileManager.xml
 %%DATADIR%%/addons/skin.confluence/720p/Font.xml
@@ -650,14 +643,11 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/720p/IncludesPVR.xml
 %%DATADIR%%/addons/skin.confluence/720p/LockSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/LoginScreen.xml
-%%DATADIR%%/addons/skin.confluence/720p/MusicKaraokeLyrics.xml
 %%DATADIR%%/addons/skin.confluence/720p/MusicOSD.xml
-%%DATADIR%%/addons/skin.confluence/720p/MusicOverlay.xml
 %%DATADIR%%/addons/skin.confluence/720p/MusicVisualisation.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyMusicNav.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyMusicPlaylist.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyMusicPlaylistEditor.xml
-%%DATADIR%%/addons/skin.confluence/720p/MyMusicSongs.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyPVRChannels.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyPVRGuide.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyPVRRecordings.xml
@@ -685,7 +675,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/720p/VideoOSD.xml
 %%DATADIR%%/addons/skin.confluence/720p/VideoOSDBookmarks.xml
 %%DATADIR%%/addons/skin.confluence/720p/VideoOSDSettings.xml
-%%DATADIR%%/addons/skin.confluence/720p/VideoOverlay.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsAddonBrowser.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsFileMode.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsLiveTV.xml
@@ -694,7 +683,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/720p/ViewsPictures.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsVideoLibrary.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsWeather.xml
-%%DATADIR%%/addons/skin.confluence/720p/VisualisationPresetList.xml
 %%DATADIR%%/addons/skin.confluence/720p/custom_SideMenuHelp.xml
 %%DATADIR%%/addons/skin.confluence/720p/defaults.xml
 %%DATADIR%%/addons/skin.confluence/720p/includes.xml
@@ -808,10 +796,12 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddon.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonAlbumInfo.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonArtistInfo.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonAudioDSP.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonAudioDecoder.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonAudioEncoder.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonContextItem.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonHelper.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonImages.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonInfoProvider.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonLanguage.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonLibrary.png
@@ -837,8 +827,10 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAlbumCover.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultArtist.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAudio.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAudioDSP.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultCDDA.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultDVDEmpty.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultDVDFull.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultDVDRom.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultFile.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultFolder.png
@@ -898,10 +890,12 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/HomeSubFO.png
 %%DATADIR%%/addons/skin.confluence/media/HomeSubNF.png
 %%DATADIR%%/addons/skin.confluence/media/InfoMessagePanel.png
+%%DATADIR%%/addons/skin.confluence/media/KeyboardBackKey.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardCornerBottom.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardCornerBottomNF.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardCornerTop.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardCornerTopNF.png
+%%DATADIR%%/addons/skin.confluence/media/KeyboardDoneKey.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardEditArea.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardKey.png
 %%DATADIR%%/addons/skin.confluence/media/KeyboardKeyNF.png
@@ -932,6 +926,8 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/OSDChannelListNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDChannelUPFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDChannelUPNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDDSPAudioFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDDSPAudioNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDDvdFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDDvdNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDForwardFO.png
@@ -946,8 +942,6 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/OSDPlay.png
 %%DATADIR%%/addons/skin.confluence/media/OSDPlayFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDPlayNF.png
-%%DATADIR%%/addons/skin.confluence/media/OSDPlaylistFO.png
-%%DATADIR%%/addons/skin.confluence/media/OSDPlaylistNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDPreFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDPreNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDPresetSettingsFO.png
@@ -957,6 +951,8 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/OSDProgressBack.png
 %%DATADIR%%/addons/skin.confluence/media/OSDProgressMid.png
 %%DATADIR%%/addons/skin.confluence/media/OSDProgressMidLight.png
+%%DATADIR%%/addons/skin.confluence/media/OSDRadioRDSFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDRadioRDSNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRandomOffFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRandomOffNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRandomOnFO.png
@@ -998,6 +994,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/PVR-EpgProgressIndicator.png
 %%DATADIR%%/addons/skin.confluence/media/PVR-HasRecording.png
 %%DATADIR%%/addons/skin.confluence/media/PVR-HasTimer.png
+%%DATADIR%%/addons/skin.confluence/media/PVR-HasTimerSchedule.png
 %%DATADIR%%/addons/skin.confluence/media/PVR-IsRecording.png
 %%DATADIR%%/addons/skin.confluence/media/RecentAddedBack.png
 %%DATADIR%%/addons/skin.confluence/media/ScrollBarH.png
@@ -1071,6 +1068,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/ThumbBG.png
 %%DATADIR%%/addons/skin.confluence/media/ThumbBorder.png
 %%DATADIR%%/addons/skin.confluence/media/ThumbShadow.png

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604161808.u3GI8u7G075761>