Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Sep 2015 00:23:33 +0000 (UTC)
From:      Jason Unovitch <junovitch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r397913 - in branches/2015Q3/multimedia/kodi: . files
Message-ID:  <201509260023.t8Q0NXj5033305@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: junovitch
Date: Sat Sep 26 00:23:32 2015
New Revision: 397913
URL: https://svnweb.freebsd.org/changeset/ports/397913

Log:
  MFH r397342, r397605, r397613, r397820
  
  r397342 (partial)
  multimedia/kodi: minor cleanup
  
  - Convert to USE_GL
  - Drop 8.x support
  
  Approved by:	portmgr blanket
  
  r397605
  multimedia/kodi: update 14.2 -> 15.1
  
  - Update to Kodi 15.1 "Isengard"
  - Remove CEC option from defaults
  - Set CEC option as broken, needs libcec >= 3.0.0 which has yet to be ported
  - Set USE_GCC for compilation on FreeBSD 9
  - Sort USE_XORG, set USE_LDCONFIG, add under java category (portlint)
  
  PR:		202812
  Submitted by:	mickael.maillot@gmail.com (maintainer)
  Security:	80c66af0-d1c5-449e-bd31-63b12525ff88
  Security:	CVE-2015-3395
  Security:	3d950687-b4c9-4a86-8478-c56743547af8
  Security:	CVE-2015-6818
  Security:	CVE-2015-6819
  Security:	CVE-2015-6820
  Security:	CVE-2015-6821
  Security:	CVE-2015-6822
  Security:	CVE-2015-6823
  Security:	CVE-2015-6824
  Security:	CVE-2015-6825
  Security:	CVE-2015-6826
  
  r397613
  multimedia/kodi: Set USES= compiler:c++11-lib
  
  - USES= compiler:c++11-lib was left out of the original patch due to
    an oversight. Add it and remove FreeBSD 9 specific USE_GCC= yes.
  - No PORTREVISION bump as the compiler choice remained the same.
  
  PR:		202812
  Submitted by:	mickael.maillot@gmail.com
  
  r397820
  multimedia/kodi: regen patch-configure.ac
  
  - Add atomic lib to search libs, resolve 9.3 i386 build issue
  - Bump PORTREVISION due to libatomic shlib dependency
  
  PR:		202812
  Submitted by:	mickael.maillot@gmail.com (maintainer)
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2015Q3/multimedia/kodi/files/patch-configure.ac
     - copied, changed from r397605, head/multimedia/kodi/files/patch-configure.ac
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__LangInfo.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__LangInfo.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__main__main.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__main__main.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp
     - copied unchanged from r397605, head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp
Deleted:
  branches/2015Q3/multimedia/kodi/files/patch-configure.in
  branches/2015Q3/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake
  branches/2015Q3/multimedia/kodi/files/patch-sidplay
  branches/2015Q3/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp
  branches/2015Q3/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
Modified:
  branches/2015Q3/multimedia/kodi/Makefile
  branches/2015Q3/multimedia/kodi/distinfo
  branches/2015Q3/multimedia/kodi/files/patch-ffmpegx86
  branches/2015Q3/multimedia/kodi/files/patch-freebsd
  branches/2015Q3/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh
  branches/2015Q3/multimedia/kodi/pkg-plist
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/multimedia/kodi/Makefile
==============================================================================
--- branches/2015Q3/multimedia/kodi/Makefile	Sat Sep 26 00:19:56 2015	(r397912)
+++ branches/2015Q3/multimedia/kodi/Makefile	Sat Sep 26 00:23:32 2015	(r397913)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	kodi
-DISTVERSION=	14.2
-PORTREVISION=	2
-CATEGORIES=	multimedia
-MASTER_SITES=	https://codeload.github.com/xbmc/xbmc/tar.gz/${DISTVERSION}-Helix?dummy=/ \
+DISTVERSION=	15.1
+PORTREVISION=	1
+CATEGORIES=	multimedia java
+MASTER_SITES=	https://codeload.github.com/xbmc/xbmc/tar.gz/${KODI_COMMIT}?dummy=/ \
 		GH:ffmpeg
-DISTFILES=	${DISTVERSION}-Helix${EXTRACT_SUFX} \
+DISTFILES=	${DISTVERSION}-Isengard${EXTRACT_SUFX} \
 		${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
-EXTRACT_ONLY=	${DISTVERSION}-Helix${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTVERSION}-Isengard${EXTRACT_SUFX}
 
 MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	Award winning media center application
@@ -31,7 +31,6 @@ LIB_DEPENDS=	libass.so:${PORTSDIR}/multi
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libdrm.so:${PORTSDIR}/graphics/libdrm \
 		libenca.so:${PORTSDIR}/converters/enca \
-		libGLEW.so:${PORTSDIR}/graphics/glew \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -59,21 +58,24 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	ffmpeg
-GH_TAGNAME=	2.4.6-Helix
+GH_TAGNAME=	2.6.4-Isengard
+KODI_COMMIT=	f4dda26
 
-USES=		autoreconf:build gettext gmake iconv:wchar_t jpeg libtool \
-		pkgconfig python:2
+USES=		autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
+		libtool pkgconfig python:2
 GNU_CONFIGURE=	yes
-USE_XORG=	xt xmu xtst xrandr
-USE_GL=		glu
+USE_XORG=	xmu xrandr xt xtst
+USE_GL=		glu glew
 USE_SDL=	image sdl2
 USE_JAVA=	yes
+USE_LDCONFIG=	yes
 JAVA_BUILD=	jre
 NOPRECIOUSMAKEVARS=	yes
 INSTALLS_ICONS=	yes
+
 ONLY_FOR_ARCHS=	i386 amd64
 
-WRKSRC=		${WRKDIR}/xbmc-${DISTVERSION}-Helix
+WRKSRC=		${WRKDIR}/xbmc-${KODI_COMMIT}
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC DOCS \
@@ -85,7 +87,7 @@ 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 CEC LIBBLURAY LIRC MYSQL \
+OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI LIBBLURAY LIRC MYSQL \
 			NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER
 
 AIRPLAY_LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist
@@ -97,7 +99,8 @@ AIRTUNES_CONFIGURE_ENABLE=	airtunes
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
-CEC_BUILD_DEPENDS=	libcec>=2.2.0:${PORTSDIR}/multimedia/libcec
+CEC_BROKEN=		libcec >= 3.0.0 has not been ported yet
+CEC_BUILD_DEPENDS=	libcec>=3.0.0:${PORTSDIR}/multimedia/libcec
 CEC_LIB_DEPENDS=	libcec.so:${PORTSDIR}/multimedia/libcec
 CEC_CONFIGURE_ENABLE=	libcec
 
@@ -144,12 +147,6 @@ PLIST_SUB+=	ARCH="x86"
 PLIST_SUB+=	ARCH="x86_64"
 .endif
 
-.if ${OSVERSION} < 900033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-.endif
-
 .if ${PORT_OPTIONS:MNONFREE}
 NO_CDROM=	Restricted binary distribution
 NO_PACKAGE=	${NO_CDROM}
@@ -161,16 +158,10 @@ post-extract:
 		 -C ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
 
 post-patch:
-	${REINPLACE_CMD} 's;"event\.h";"sidplay/event.h";' \
-		${WRKSRC}/lib/libsidplay2/libsidplay/src/event.cpp \
-		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6510/mos6510.h \
-		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6526/mos6526.h \
-		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
 	${REINPLACE_CMD} 's;make;gmake;' \
 		${WRKSRC}/bootstrap \
 		${WRKSRC}/codegenerator.mk \
-		${WRKSRC}/xbmc/Makefile.in \
-		${WRKSRC}/tools/TexturePacker/Makefile.in
+		${WRKSRC}/xbmc/Makefile.in
 	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk
 
 pre-configure:

Modified: branches/2015Q3/multimedia/kodi/distinfo
==============================================================================
--- branches/2015Q3/multimedia/kodi/distinfo	Sat Sep 26 00:19:56 2015	(r397912)
+++ branches/2015Q3/multimedia/kodi/distinfo	Sat Sep 26 00:23:32 2015	(r397913)
@@ -1,4 +1,4 @@
-SHA256 (14.2-Helix.tar.gz) = d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4
-SIZE (14.2-Helix.tar.gz) = 70703786
-SHA256 (ffmpeg-2.4.6-Helix.tar.gz) = 0872316475fc6d546be63cf9f4d6fe8e29c7f873f9a3344aa577b1f7c517b7cf
-SIZE (ffmpeg-2.4.6-Helix.tar.gz) = 9041228
+SHA256 (15.1-Isengard.tar.gz) = 6bf415258a3dffd4843e9446a62d9392997556240b7db703acb44d2bef3454d5
+SIZE (15.1-Isengard.tar.gz) = 61476469
+SHA256 (ffmpeg-2.6.4-Isengard.tar.gz) = 2487a6d4ad5701ad22582fc064ce39b60c383eec4958ca1e3218379035fa523f
+SIZE (ffmpeg-2.6.4-Isengard.tar.gz) = 9365476

Copied and modified: branches/2015Q3/multimedia/kodi/files/patch-configure.ac (from r397605, head/multimedia/kodi/files/patch-configure.ac)
==============================================================================
--- head/multimedia/kodi/files/patch-configure.ac	Wed Sep 23 02:35:08 2015	(r397605, copy source)
+++ branches/2015Q3/multimedia/kodi/files/patch-configure.ac	Sat Sep 26 00:23:32 2015	(r397913)
@@ -1,4 +1,4 @@
---- configure.ac.orig	2015-03-31 16:37:07 UTC
+--- configure.ac.orig	2015-08-16 14:37:32 UTC
 +++ configure.ac
 @@ -636,10 +636,12 @@
    i386-*-freebsd*)
@@ -13,7 +13,7 @@
       ;;
    arm-apple-darwin*)
       use_joystick=no
-@@ -808,10 +810,16 @@
+@@ -824,10 +826,16 @@
  # platform specific flags
  if echo "$ARCH" | grep -q "freebsd" ; then
    LOCALBASE="${LOCALBASE:-/usr/local}"
@@ -33,7 +33,7 @@
  fi
  if test "$host_vendor" = "apple" ; then
    # standard application paths
-@@ -944,6 +952,7 @@
+@@ -960,6 +968,7 @@
  
  # Check inotify availability
  AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
@@ -41,7 +41,7 @@
  
  # Checks for boost headers using CXX instead of CC
  AC_LANG_PUSH([C++])
-@@ -1240,7 +1249,7 @@
+@@ -1257,12 +1266,13 @@
  )
  
  #Check to see if libs are needed for functions that are often built-in to libc
@@ -50,7 +50,13 @@
  AC_SEARCH_LIBS([dlopen],dl)
  AC_SEARCH_LIBS([clock_gettime],rt)
  AC_SEARCH_LIBS([dn_expand],  resolv)
-@@ -1740,7 +1749,7 @@
+ 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
+@@ -1727,7 +1737,7 @@
  
    if test "$cross_compiling" != "yes"; then
      if test "$use_debug" != "yes"; then
@@ -59,7 +65,7 @@
      fi
      if test "$use_optimizations" != "yes"; then
        FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
-@@ -1751,7 +1760,7 @@
+@@ -1738,7 +1748,7 @@
        SAVE_LIBS="$LIBS"
        # check for system installed ffmpeg. We require minimum versions.
        PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
@@ -68,7 +74,7 @@
          [FFMPEG_FOUND="false"])
  
        if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
-@@ -1778,7 +1787,7 @@
+@@ -1765,7 +1775,7 @@
      elif test "$with_ffmpeg" = "force"; then
        # always build our ffmpeg
        AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
@@ -77,7 +83,7 @@
        export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
  
      elif test "$with_ffmpeg" != "no"; then
-@@ -1791,7 +1800,7 @@
+@@ -1778,7 +1788,7 @@
  
  if test "$FFMPEG_FOUND" != "true"; then
    PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
@@ -86,7 +92,7 @@
      [AC_MSG_ERROR("ffmpeg not found")])
  fi
  
-@@ -2204,7 +2213,7 @@
+@@ -2173,7 +2183,7 @@
  # 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
@@ -95,7 +101,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],
-@@ -2215,7 +2224,7 @@
+@@ -2184,7 +2194,7 @@
    AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
      [$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
    if test "$TEXTUREPACKER" = "none"; then
@@ -104,7 +110,7 @@
      TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
    fi
    if test -x "$TEXTUREPACKER"; then
-@@ -2479,6 +2488,8 @@
+@@ -2448,6 +2458,8 @@
    LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
  fi
  

Modified: branches/2015Q3/multimedia/kodi/files/patch-ffmpegx86
==============================================================================
--- branches/2015Q3/multimedia/kodi/files/patch-ffmpegx86	Sat Sep 26 00:19:56 2015	(r397912)
+++ branches/2015Q3/multimedia/kodi/files/patch-ffmpegx86	Sat Sep 26 00:23:32 2015	(r397913)
@@ -1,5 +1,5 @@
---- tools/depends/target/ffmpeg/ffmpeg-2.4.6-Helix/libavutil/x86/asm.h.orig	2014-12-25 13:59:22.000000000 +0100
-+++ tools/depends/target/ffmpeg/ffmpeg-2.4.6-Helix/libavutil/x86/asm.h	2014-12-25 14:00:04.000000000 +0100
+--- tools/depends/target/ffmpeg/ffmpeg-2.6.4-Isengard/libavutil/x86/asm.h.orig	2014-12-25 12:59:22 UTC
++++ tools/depends/target/ffmpeg/ffmpeg-2.6.4-Isengard/libavutil/x86/asm.h
 @@ -71,7 +71,7 @@
  typedef int x86_reg;
  #endif

Modified: branches/2015Q3/multimedia/kodi/files/patch-freebsd
==============================================================================
--- branches/2015Q3/multimedia/kodi/files/patch-freebsd	Sat Sep 26 00:19:56 2015	(r397912)
+++ branches/2015Q3/multimedia/kodi/files/patch-freebsd	Sat Sep 26 00:23:32 2015	(r397913)
@@ -1,3 +1,16 @@
+diff --git lib/cpluff/autogen.sh lib/cpluff/autogen.sh
+index ee0a418..efd5291 100755
+--- lib/cpluff/autogen.sh
++++ 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
 diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile
 index 0e08dcf..e94d78f 100644
 --- tools/depends/target/ffmpeg/Makefile
@@ -27,15 +40,3 @@ index 2b6e646..babfe89 100644
    int pos = 0;
    while ((tmp & 0x1) == 0x0)
    {
-diff --git xbmc/cores/AudioEngine/Utils/AEELDParser.cpp xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
-index af4715c..0879bd5 100644
---- xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
-+++ xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
-@@ -23,6 +23,7 @@
- #include "utils/EndianSwap.h"
- #include <string.h>
- #include <algorithm>
-+#include <functional>
- 
- #include <stdio.h>
- 

Modified: branches/2015Q3/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh
==============================================================================
--- branches/2015Q3/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh	Sat Sep 26 00:19:56 2015	(r397912)
+++ branches/2015Q3/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh	Sat Sep 26 00:23:32 2015	(r397913)
@@ -1,5 +1,5 @@
---- tools/depends/target/ffmpeg/autobuild.sh.orig	2014-12-23 00:11:35.000000000 +0100
-+++ tools/depends/target/ffmpeg/autobuild.sh	2014-12-24 16:22:20.000000000 +0100
+--- tools/depends/target/ffmpeg/autobuild.sh.orig	2015-03-31 16:37:07 UTC
++++ tools/depends/target/ffmpeg/autobuild.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -65,17 +65,17 @@
  
  CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
  ./configure --prefix=$FFMPEG_PREFIX \
-@@ -157,11 +166,11 @@
- 	--enable-zlib \
+@@ -161,11 +170,11 @@
+ 	--disable-mipsdspr2 \
          ${FLAGS}
  
 -make -j ${BUILDTHREADS} 
 +gmake -j ${BUILDTHREADS} 
  if [ $? -eq 0 ]
  then
-   [ ${SUDO} ] && echo "Root priviledges are required to install to ${FFMPEG_PREFIX}"
+   [ ${SUDO} ] && echo "Root privileges are required to install to ${FFMPEG_PREFIX}"
 -  ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed
 +  ${SUDO} gmake install && echo "$VERSION" > ../.ffmpeg-installed
  else
-   echo "ERROR: building ffmpeg failed"
+   echo "ERROR: Building ffmpeg failed"
    exit 1

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__LangInfo.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__LangInfo.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__LangInfo.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__LangInfo.cpp)
@@ -0,0 +1,13 @@
+--- xbmc/LangInfo.cpp.orig	2015-07-21 18:41:29 UTC
++++ xbmc/LangInfo.cpp
+@@ -275,8 +275,8 @@
+   // 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)

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/cores/dvdplayer/DVDDemuxSPU.cpp.orig	2015-06-23 09:40:13 UTC
++++ xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "DVDDemuxSPU.h"
+ #include "DVDClock.h"
+ #include "utils/log.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogGamepad.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/dialogs/GUIDialogGamepad.cpp.orig	2015-04-13 10:34:31 UTC
++++ xbmc/dialogs/GUIDialogGamepad.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "GUIDialogGamepad.h"
+ #include "utils/md5.h"
+ #include "utils/StringUtils.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__dialogs__GUIDialogNumeric.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/dialogs/GUIDialogNumeric.cpp.orig	2015-04-13 10:36:23 UTC
++++ xbmc/dialogs/GUIDialogNumeric.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "GUIDialogNumeric.h"
+ #include "guilib/GUILabelControl.h"
+ #include "utils/md5.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__guilib__GUIAction.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/guilib/GUIAction.cpp.orig	2015-04-13 12:41:36 UTC
++++ xbmc/guilib/GUIAction.cpp
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <stdlib.h>
+ #include "GUIAction.h"
+ #include "utils/StringUtils.h"
+ #include "GUIWindowManager.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__guilib__GUISpinControl.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/guilib/GUISpinControl.cpp.orig	2015-04-13 12:48:49 UTC
++++ xbmc/guilib/GUISpinControl.cpp
+@@ -22,6 +22,7 @@
+ #include "input/Key.h"
+ #include "utils/StringUtils.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ using namespace std;
+ 

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h (from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__guilib__TextureBundleXPR.h)
@@ -0,0 +1,10 @@
+--- xbmc/guilib/TextureBundleXPR.h.orig	2015-08-08 17:27:25 UTC
++++ xbmc/guilib/TextureBundleXPR.h
+@@ -24,6 +24,7 @@
+ #include <string>
+ #include <stdint.h>
+ #include <vector>
++#include <ctime>
+ 
+ class CAutoTexBuffer;
+ class CBaseTexture;

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h (from r397605, head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__guilib__XBTF.h)
@@ -0,0 +1,10 @@
+--- xbmc/guilib/XBTF.h.orig	2015-08-08 15:41:42 UTC
++++ xbmc/guilib/XBTF.h
+@@ -22,6 +22,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <ctime>
+ #include <stdint.h>
+ 
+ #define XBTF_MAGIC "XBTF"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__interfaces__legacy__Dialog.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/interfaces/legacy/Dialog.cpp.orig	2015-04-13 10:42:40 UTC
++++ xbmc/interfaces/legacy/Dialog.cpp
+@@ -19,6 +19,7 @@
+  */
+ #include "LanguageHook.h"
+ 
++#include <stdlib.h>
+ #include "dialogs/GUIDialogOK.h"
+ #include "dialogs/GUIDialogYesNo.h"
+ #include "dialogs/GUIDialogSelect.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__linux__XFileUtils.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/linux/XFileUtils.cpp.orig	2014-12-20 16:29:11 UTC
++++ xbmc/linux/XFileUtils.cpp
+@@ -36,6 +36,7 @@
+ #endif
+ #include <dirent.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #if defined(TARGET_ANDROID)
+ #include <sys/file.h>

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__main__main.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__main__main.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__main__main.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__main__main.cpp)
@@ -0,0 +1,18 @@
+--- xbmc/main/main.cpp.orig	2015-04-13 12:43:35 UTC
++++ xbmc/main/main.cpp
+@@ -28,6 +28,7 @@
+ #ifdef TARGET_POSIX
+ #include <sys/resource.h>
+ #include <signal.h>
++#include <locale.h>
+ #endif
+ #if defined(TARGET_DARWIN_OSX)
+   #include "Util.h"
+@@ -35,7 +36,6 @@
+   #ifdef HAS_SDL
+     #include <SDL/SDL.h>
+   #endif
+-#include <locale.h>
+ #endif
+ #ifdef HAS_LIRC
+ #include "input/linux/LIRC.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__pvr__PVRActionListener.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/pvr/PVRActionListener.cpp.orig	2015-04-13 10:38:08 UTC
++++ xbmc/pvr/PVRActionListener.cpp
+@@ -32,6 +32,7 @@
+ #include "settings/Settings.h"
+ #include "utils/log.h"
+ #include "utils/StringUtils.h"
++#include <stdlib.h>
+ 
+ #include "pvr/PVRManager.h"
+ #include "pvr/channels/PVRChannelGroupsContainer.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__settings__AdvancedSettings.cpp)
@@ -0,0 +1,11 @@
+--- xbmc/settings/AdvancedSettings.cpp.orig	2015-04-21 18:46:28 UTC
++++ xbmc/settings/AdvancedSettings.cpp
+@@ -208,7 +208,7 @@
+   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][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]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");
++  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|french|multi|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]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");
+   m_videoCleanStringRegExps.push_back("(\\[.*\\])");
+ 
+   m_moviesExcludeFromScanRegExps.clear();

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/storage/linux/DeviceKitDisksProvider.cpp.orig	2015-04-13 10:45:50 UTC
++++ xbmc/storage/linux/DeviceKitDisksProvider.cpp
+@@ -19,6 +19,7 @@
+  */
+ #include "DeviceKitDisksProvider.h"
+ #ifdef HAS_DBUS
++#include <stdlib.h>
+ #include "settings/AdvancedSettings.h"
+ #include "guilib/LocalizeStrings.h"
+ #include "utils/log.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__storage__linux__UDisksProvider.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/storage/linux/UDisksProvider.cpp.orig	2015-04-13 12:39:11 UTC
++++ xbmc/storage/linux/UDisksProvider.cpp
+@@ -19,6 +19,7 @@
+  */
+ #include "UDisksProvider.h"
+ #ifdef HAS_DBUS
++#include <stdlib.h>
+ #include "settings/AdvancedSettings.h"
+ #include "guilib/LocalizeStrings.h"
+ #include "utils/log.h"

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp)
@@ -0,0 +1,13 @@
+--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2014-12-22 23:11:35 UTC
++++ xbmc/threads/platform/pthreads/ThreadImpl.cpp
+@@ -31,9 +31,8 @@
+ #include <sys/param.h>
+ #if __FreeBSD_version < 900031
+ #include <sys/thr.h>
+-#else
+-#include <pthread_np.h>
+ #endif
++#include <pthread_np.h>
+ #endif
+ 
+ #include <signal.h>

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__utils__CharsetConverter.cpp)
@@ -0,0 +1,11 @@
+--- xbmc/utils/CharsetConverter.cpp.orig	2015-08-10 08:41:28 UTC
++++ xbmc/utils/CharsetConverter.cpp
+@@ -67,7 +67,7 @@
+   #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
+   #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
+   #define UTF8_SOURCE "UTF-8"
+-  #define WCHAR_CHARSET "WCHAR_T"
++  #define WCHAR_CHARSET UTF32_CHARSET
+   #if __STDC_ISO_10646__
+     #ifdef SIZEOF_WCHAR_T
+       #if SIZEOF_WCHAR_T == 4

Copied: branches/2015Q3/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp (from r397605, head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp	Sat Sep 26 00:23:32 2015	(r397913, copy of r397605, head/multimedia/kodi/files/patch-xbmc__windowing__WinEventsX11.cpp)
@@ -0,0 +1,10 @@
+--- xbmc/windowing/WinEventsX11.cpp.orig	2015-04-13 10:40:08 UTC
++++ xbmc/windowing/WinEventsX11.cpp
+@@ -23,6 +23,7 @@
+ 
+ #ifdef HAS_X11_WIN_EVENTS
+ 
++#include <locale.h>
+ #include "WinEvents.h"
+ #include "WinEventsX11.h"
+ #include "Application.h"

Modified: branches/2015Q3/multimedia/kodi/pkg-plist
==============================================================================
--- branches/2015Q3/multimedia/kodi/pkg-plist	Sat Sep 26 00:19:56 2015	(r397912)
+++ branches/2015Q3/multimedia/kodi/pkg-plist	Sat Sep 26 00:23:32 2015	(r397913)
@@ -2,10 +2,13 @@ bin/kodi
 bin/kodi-standalone
 bin/xbmc
 bin/xbmc-standalone
+include/kodi/AEChannelData.h
 include/kodi/DVDDemuxPacket.h
+include/kodi/kodi_audiodec_dll.h
+include/kodi/kodi_audiodec_types.h
+include/kodi/libKODI_guilib.h
 include/kodi/libXBMC_addon.h
 include/kodi/libXBMC_codec.h
-include/kodi/libXBMC_gui.h
 include/kodi/libXBMC_pvr.h
 include/kodi/xbmc_addon_cpp_dll.h
 include/kodi/xbmc_addon_dll.h
@@ -23,9 +26,9 @@ include/kodi/xbmc_vis_dll.h
 include/kodi/xbmc_vis_types.h
 include/xbmc
 lib/kodi/addon-helpers.cmake
+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.gui/libXBMC_gui-%%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
@@ -35,22 +38,18 @@ lib/kodi/addons/visualization.glspectrum
 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
 lib/kodi/kodi-config.cmake
 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
-%%MYSQL%%lib/kodi/system/libcmyth-%%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
 lib/kodi/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so
-lib/kodi/system/players/paplayer/libsidplay2-%%ARCH%%-freebsd.so
-lib/kodi/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so
-lib/kodi/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so
-lib/kodi/system/players/paplayer/timidity-%%ARCH%%-freebsd.so
-lib/kodi/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so
 lib/kodi/xbmc-config.cmake
 lib/xbmc
 man/man1/kodi.1.gz
@@ -68,7 +67,6 @@ share/icons/hicolor/256x256/apps/kodi.pn
 share/icons/hicolor/32x32/apps/kodi.png
 share/icons/hicolor/48x48/apps/kodi.png
 share/icons/hicolor/64x64/apps/kodi.png
-%%DATADIR%%/FEH.py
 %%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/addon.xml
 %%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/icon.png
 %%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/resources/language/English/strings.po
@@ -77,11 +75,18 @@ 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.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/language.xsd
+%%DATADIR%%/addons/kodi.resource/uisounds.xsd
+%%DATADIR%%/addons/library.kodi.guilib/libKODI_guilib.h
 %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.cpp
 %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.h
 %%DATADIR%%/addons/library.xbmc.addon/libXBMC_addon.h
 %%DATADIR%%/addons/library.xbmc.codec/libXBMC_codec.h
-%%DATADIR%%/addons/library.xbmc.gui/libXBMC_gui.h
 %%DATADIR%%/addons/library.xbmc.pvr/libXBMC_pvr.h
 %%DATADIR%%/addons/metadata.album.universal/addon.xml
 %%DATADIR%%/addons/metadata.album.universal/albumuniversal.xml
@@ -204,15 +209,9 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/metadata.common.allmusic.com/addon.xml
 %%DATADIR%%/addons/metadata.common.allmusic.com/allmusic.xml
 %%DATADIR%%/addons/metadata.common.allmusic.com/icon.png
-%%DATADIR%%/addons/metadata.common.amazon.de/addon.xml
-%%DATADIR%%/addons/metadata.common.amazon.de/amazonde.xml
-%%DATADIR%%/addons/metadata.common.amazon.de/icon.png
 %%DATADIR%%/addons/metadata.common.fanart.tv/addon.xml
 %%DATADIR%%/addons/metadata.common.fanart.tv/fanarttv.xml
 %%DATADIR%%/addons/metadata.common.fanart.tv/icon.png
-%%DATADIR%%/addons/metadata.common.hdtrailers.net/addon.xml
-%%DATADIR%%/addons/metadata.common.hdtrailers.net/hdtrailers.xml
-%%DATADIR%%/addons/metadata.common.hdtrailers.net/icon.png
 %%DATADIR%%/addons/metadata.common.htbackdrops.com/addon.xml
 %%DATADIR%%/addons/metadata.common.htbackdrops.com/htbackdrops.xml
 %%DATADIR%%/addons/metadata.common.htbackdrops.com/icon.png
@@ -426,6 +425,19 @@ 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.language.en_gb/addon.xml
+%%DATADIR%%/addons/resource.language.en_gb/icon.png
+%%DATADIR%%/addons/resource.language.en_gb/resources/langinfo.xml
+%%DATADIR%%/addons/resource.language.en_gb/resources/strings.po
+%%DATADIR%%/addons/resource.uisounds.confluence/addon.xml
+%%DATADIR%%/addons/resource.uisounds.confluence/icon.png
+%%DATADIR%%/addons/resource.uisounds.confluence/resources/back.wav
+%%DATADIR%%/addons/resource.uisounds.confluence/resources/click.wav
+%%DATADIR%%/addons/resource.uisounds.confluence/resources/cursor.wav
+%%DATADIR%%/addons/resource.uisounds.confluence/resources/notify.wav
+%%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
@@ -436,62 +448,64 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.black/icon.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/addon.xml
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/icon.png
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Afrikaans/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Albanian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Amharic/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Arabic/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Basque/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Belarusian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Bulgarian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Burmese/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Catalan/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Traditional)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Croatian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Czech/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Danish/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Dutch/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English (Australia)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English (New Zealand)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English (US)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Estonian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Finnish/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/French (Canada)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/French/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Galician/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/German/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Greek/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hebrew/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hindi (Devanagiri)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hungarian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Icelandic/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Indonesian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Italian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Japanese/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Korean/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Latvian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Lithuanian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Macedonian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Malay/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Norwegian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Polish/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese (Brazil)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Romanian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Russian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovak/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish (Argentina)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish (Mexico)/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Swedish/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Tajik/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Thai/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Turkish/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Ukrainian/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Vietnamese/strings.po
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Welsh/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.en_au/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.fa_ir/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.lt_lt/strings.po
+%%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.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
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.sk_sk/strings.po
+%%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.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
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/resource.language.zh_tw/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/settings.xml
 %%DATADIR%%/addons/script.module.pil/addon.xml
 %%DATADIR%%/addons/service.xbmc.versioncheck/LICENSE.txt
@@ -512,6 +526,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Amharic/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Arabic/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Armenian/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Asturian/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Basque/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Belarusian/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Bosnian/strings.po
@@ -569,6 +584,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Spanish (Mexico)/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Spanish/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Tamil (India)/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Thai/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Turkish/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Ukrainian/strings.po
@@ -695,89 +711,85 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/build.bat
 %%DATADIR%%/addons/skin.confluence/changelog.txt
 %%DATADIR%%/addons/skin.confluence/colors/defaults.xml
-%%DATADIR%%/addons/skin.confluence/fonts/NOTICE.txt
+%%DATADIR%%/addons/skin.confluence/fonts/LICENCE.txt
 %%DATADIR%%/addons/skin.confluence/fonts/README.txt
 %%DATADIR%%/addons/skin.confluence/fonts/Roboto-Bold.ttf
 %%DATADIR%%/addons/skin.confluence/fonts/Roboto-Regular.ttf
 %%DATADIR%%/addons/skin.confluence/icon.png
-%%DATADIR%%/addons/skin.confluence/language/Afrikaans/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Albanian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Amharic/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Arabic/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Armenian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Azerbaijani/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Basque/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Belarusian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Bosnian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Bulgarian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Burmese/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Catalan/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Chinese (Simple)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Chinese (Traditional)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Croatian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Czech/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Danish/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Dutch/strings.po
-%%DATADIR%%/addons/skin.confluence/language/English (Australia)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/English (New Zealand)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/English (US)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/English/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Esperanto/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Estonian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Faroese/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Filipino/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Finnish/strings.po
-%%DATADIR%%/addons/skin.confluence/language/French (Canada)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/French/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Galician/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Georgian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/German/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Greek/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Hebrew/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Hindi (Devanagiri)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Hungarian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Icelandic/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Indonesian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Italian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Japanese/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Korean/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Latvian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Lithuanian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Macedonian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Malay/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Malayalam/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Maltese/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Maori/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Mongolian (Mongolia)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Norwegian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Ossetic/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Persian (Iran)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Persian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Polish/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Portuguese (Brazil)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Portuguese/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Romanian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Romansh/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Russian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Serbian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Sinhala/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Slovak/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Slovenian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Spanish (Argentina)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Spanish (Mexico)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Spanish/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Swedish/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Tajik/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Tamil (India)/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Tatar/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Telugu/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Thai/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Turkish/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Ukrainian/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Uzbek/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Vietnamese/strings.po
-%%DATADIR%%/addons/skin.confluence/language/Welsh/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.af_za/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.am_et/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ar_sa/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.az_az/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.be_by/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.bg_bg/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.bs_ba/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ca_es/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.cs_cz/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.cy_gb/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.da_dk/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.de_de/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.el_gr/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.en_au/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.en_gb/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.en_nz/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.en_us/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.eo/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.es_ar/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.es_es/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.es_mx/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.et_ee/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.eu_es/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.fa_af/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.fa_ir/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.fi_fi/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.fo_fo/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.fr_ca/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.fr_fr/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.gl_es/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.he_il/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.hi_in/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.hr_hr/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.hu_hu/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.hy_am/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.id_id/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.is_is/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.it_it/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ja_jp/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ko_kr/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.lt_lt/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.lv_lv/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.mi/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.mk_mk/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ml_in/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.mn_mn/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ms_my/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.mt_mt/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.my_mm/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.nb_no/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.nl_nl/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.pl_pl/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.pt_br/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.pt_pt/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ro_ro/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ru_ru/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.si_lk/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.sk_sk/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.sl_si/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.sq_al/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.sr_rs/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.sr_rs@latin/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.sv_se/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.szl/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.ta_in/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.te_in/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.tg_tj/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.th_th/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.tr_tr/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.uk_ua/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.uz_uz/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.vi_vn/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.zh_cn/strings.po
+%%DATADIR%%/addons/skin.confluence/language/resource.language.zh_tw/strings.po
 %%DATADIR%%/addons/skin.confluence/media/CalibrateBottomRight.png
 %%DATADIR%%/addons/skin.confluence/media/CalibratePixelRatio.png
 %%DATADIR%%/addons/skin.confluence/media/CalibrateSubtitles.png
@@ -796,9 +808,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/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/DefaultAddonInfoLibrary.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonInfoProvider.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonLanguage.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonLibrary.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonLyrics.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonMovieInfo.png
@@ -814,6 +829,7 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonSkin.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonSubtitles.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonTvInfo.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonUISounds.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonVideo.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonVisualization.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonWeather.png
@@ -852,9 +868,12 @@ share/icons/hicolor/64x64/apps/kodi.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultRecentlyAddedEpisodes.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultRecentlyAddedMovies.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultRecentlyAddedMusicVideos.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultRemovableDisk.png

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



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