- Rename XBMC to Kodi following upstream

- Update to 14.0

Changes:	http://kodi.tv/introducing-kodi-14/
PR:		196299
Differential Revision:	https://reviews.freebsd.org/D1900
Submitted by:	mickael.maillot@gmail.com (maintainer)
Reviewed by:	bapt

29 files changed, 965 insertions, 632 deletions

diff --git a/MOVED b/MOVED
index 407a9fecb8e9..068809b34bfa 100644
--- a/MOVED
+++ b/MOVED
@@ -7427,3 +7427,4 @@ japanese/mozc-additions||2015-02-15|Obsoleted by mozc script in japanese/mozc-se
 math/ruby-numru_units|math/rubygem-numru-units|2015-02-22|Long time broken. Please use math/rubygem-numru-units instead
 lang/ruby19|lang/ruby20|2015-02-24|Upstream support ended February 23, 2015
 games/trigger|games/trigger-rally|2015-02-26|Follow upstream naming
+multimedia/xbmc|multimedia/kodi|2015-02-28|Project renamed
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 41c8b683cd71..b5efd220d860 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -161,6 +161,7 @@
     SUBDIR += kdenlive
     SUBDIR += kissdx
     SUBDIR += kmplayer-kde4
+    SUBDIR += kodi
     SUBDIR += kplayer-kde4
     SUBDIR += libaacs
     SUBDIR += libass
@@ -409,7 +410,6 @@
     SUBDIR += x265
     SUBDIR += xanim
     SUBDIR += xawtv
-    SUBDIR += xbmc
     SUBDIR += xbmc-addon-pvr
     SUBDIR += xfce4-parole
     SUBDIR += xine
diff --git a/multimedia/xbmc/Makefile b/multimedia/kodi/Makefile
index 7db4fce01a16..40a4539f2da7 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,10 +1,14 @@
 # $FreeBSD$
 
-PORTNAME=	xbmc
-DISTVERSION=	13.2
-PORTREVISION=	7
+PORTNAME=	kodi
+DISTVERSION=	14.0
+PORTREVISION=	0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
+MASTER_SITES=	http://mirrors.kodi.tv/releases/source/ \
+		GH:ffmpeg
+DISTFILES=	${DISTVERSION}-Helix${EXTRACT_SUFX} \
+		${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
+EXTRACT_ONLY=	${DISTVERSION}-Helix${EXTRACT_SUFX}
 
 MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	Award winning media center application
@@ -25,17 +29,18 @@ LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass \
 		libcdio.so:${PORTSDIR}/sysutils/libcdio	\
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		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 \
 		libfribidi.so:${PORTSDIR}/converters/fribidi \
+		libgnutls.so:${PORTSDIR}/security/gnutls \
 		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libmad.so:${PORTSDIR}/audio/libmad \
 		libmodplug.so:${PORTSDIR}/audio/libmodplug \
 		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
 		libpcre.so:${PORTSDIR}/devel/pcre \
@@ -49,48 +54,46 @@ LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass \
 		libyajl.so:${PORTSDIR}/devel/yajl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
+		python:${PORTSDIR}/lang/python \
 		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	xbmc
+GH_PROJECT=	ffmpeg
+GH_COMMIT=	8865ab5
+GH_TAGNAME=	2.4.4-Helix
+
 USES=		gettext gmake iconv:wchar_t libtool:build pkgconfig python:2
 USE_AUTOTOOLS=	autoconf:env automake:env
 GNU_CONFIGURE=	yes
 USE_XORG=	xt xmu xtst
 USE_GL=		glu
-USE_SDL=	image sdl
+USE_SDL=	image sdl2
 USE_JAVA=	yes
 JAVA_BUILD=	jre
 NOPRECIOUSMAKEVARS=	yes
 INSTALLS_ICONS=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
-DESKTOP_ENTRIES="XBMC" \
-		"${COMMENT}" \
-		"${DATADIR}/media/icon.png" \
-		"xbmc" \
-		"AudioVideo;Video;" \
-		true
-
-WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}-Gotham
+WRKSRC=		${WRKDIR}/xbmc-${DISTVERSION}-Helix
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC DOCS LAME \
-		LIBBLURAY HAL LIRC MYSQL NONFREE PULSEAUDIO RTMP SFTP \
-		SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR
+OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC DOCS \
+		LIBBLURAY LIRC MYSQL NONFREE RTMP SFTP \
+		SMB VAAPI VDPAU WEBSERVER XRANDR
 AIRPLAY_DESC=	AirPlay support via libplist
-AIRTUNES_DESC=	AirTunes support via libshairport
+AIRTUNES_DESC=	AirTunes support via libshairplay
 CEC_DESC=	CEC adapter support
 NONFREE_DESC=	Enable non-free components (rar, ccx, ffmpeg)
 SFTP_DESC=	SSH SFTP support via libssh
-VORBIS_DESC=	Ogg Vorbis audio encoder
 
-OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY HAL LIRC MYSQL \
-			RTMP SFTP SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR
+OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC MYSQL \
+			RTMP SFTP SMB VAAPI VDPAU WEBSERVER XRANDR
 
 AIRPLAY_LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist
 AIRPLAY_CONFIGURE_ENABLE=	airplay
 
-AIRTUNES_LIB_DEPENDS=	libshairport.so:${PORTSDIR}/audio/libshairport
+AIRTUNES_LIB_DEPENDS=	libshairplay.so:${PORTSDIR}/audio/shairplay
 AIRTUNES_CONFIGURE_ENABLE=	airtunes
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
@@ -103,12 +106,6 @@ CEC_CONFIGURE_ENABLE=	libcec
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
-HAL_CONFIGURE_ENABLE=	hal
-
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
-LAME_CONFIGURE_ENABLE=	libmp3lame
-
 LIRC_RUN_DEPENDS=	lircd:${PORTSDIR}/comms/lirc
 
 MYSQL_USE=	MYSQL=yes
@@ -116,9 +113,6 @@ MYSQL_CONFIGURE_ENABLE=	mysql
 
 NONFREE_CONFIGURE_ENABLE=	non-free
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE=	pulse
-
 RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
 RTMP_CONFIGURE_ENABLE=	rtmp
 
@@ -132,9 +126,6 @@ VAAPI_CONFIGURE_ENABLE=	vaapi
 VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
-VORBIS_LIB_DEPENDS=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
-VORBIS_CONFIGURE_ENABLE=	libvorbisenc
-
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
 WEBSERVER_CONFIGURE_ENABLE=	webserver
 
@@ -145,7 +136,7 @@ SFTP_CONFIGURE_ENABLE=	ssh
 XRANDR_USE=	XORG=xrandr
 XRANDR_CONFIGURE_ENABLE=	xrandr
 
-CONFIGURE_ARGS+=	--disable-debug --disable-nfs --disable-alsa
+CONFIGURE_ARGS+=	--disable-debug --disable-nfs --disable-alsa --disable-pulse
 
 .include <bsd.port.options.mk>
 
@@ -166,6 +157,11 @@ NO_CDROM=	Restricted binary distribution
 NO_PACKAGE=	${NO_CDROM}
 .endif
 
+post-extract:
+	${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
+	${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \
+		 -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 \
@@ -174,24 +170,23 @@ post-patch:
 		${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
 	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk
 	${REINPLACE_CMD} '/^autopoint/d' ${WRKSRC}/lib/cpluff/autogen.sh
-	${REINPLACE_CMD} 's;static weak_ptr;static boost::weak_ptr;' \
-		${WRKSRC}/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
 
 run-autotools:
 	cd ${WRKSRC} && ${SH} ./bootstrap
-	${REINPLACE_CMD} "s;'' iconv;iconv;" ${WRKSRC}/configure
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/manpages/xbmc.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf xbmc.bin.1.gz xbmc.1.gz)
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xbmc/xbmc.bin
-	${FIND} ${STAGEDIR}${PREFIX}/lib/xbmc -name '*.so' -or -name '*.xbs' -or -name '*.vis' \
+	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz)
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi.bin
+	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' -or -name '*.xbs' -or -name '*.vis' \
 		| ${XARGS} ${STRIP_CMD}
 .if ${PORT_OPTIONS:MXRANDR}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xbmc/xbmc-xrandr
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo
new file mode 100644
index 000000000000..3e502c2008a9
--- /dev/null
+++ b/multimedia/kodi/distinfo
@@ -0,0 +1,4 @@
+SHA256 (14.0-Helix.tar.gz) = 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192
+SIZE (14.0-Helix.tar.gz) = 70811373
+SHA256 (ffmpeg-2.4.4-Helix.tar.gz) = 58f93865780873f8d12dc401a100aa7b58ec1e43522a8d271e7989056c481080
+SIZE (ffmpeg-2.4.4-Helix.tar.gz) = 8876754
diff --git a/multimedia/kodi/files/patch-Makefile.include.in b/multimedia/kodi/files/patch-Makefile.include.in
new file mode 100644
index 000000000000..8665f3a71193
--- /dev/null
+++ b/multimedia/kodi/files/patch-Makefile.include.in
@@ -0,0 +1,41 @@
+diff --git Makefile.include.in Makefile.include.in
+index 6ee228a..daeb046 100644
+--- Makefile.include.in
++++ 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
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
+ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
+-INCLUDES+=$(sort @INCLUDES@)
++#INCLUDES+=$(sort @INCLUDES@)
++INCLUDES+=@INCLUDES@
+ INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
+ INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+ DEFINES+= \
+@@ -91,22 +92,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 $@ \
+ 	&& $(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 $@ \
+ 	&& $(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 $@ \
+ 	&& $(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 $@ \
+ 	&& $(GEN_DEPS)
+ 
+ %.o: %.S
diff --git a/multimedia/xbmc/files/patch-clang b/multimedia/kodi/files/patch-clang
index 543bf0adf15f..543bf0adf15f 100644
--- a/multimedia/xbmc/files/patch-clang
+++ b/multimedia/kodi/files/patch-clang
diff --git a/multimedia/kodi/files/patch-configure.in b/multimedia/kodi/files/patch-configure.in
new file mode 100644
index 000000000000..5c95bba30023
--- /dev/null
+++ b/multimedia/kodi/files/patch-configure.in
@@ -0,0 +1,89 @@
+--- configure.in.orig	2014-12-08 19:57:30.000000000 +0100
++++ configure.in	2014-12-16 15:55:58.000000000 +0100
+@@ -621,10 +621,12 @@
+   i386-*-freebsd*)
+      ARCH="x86-freebsd"
+      MAKE="gmake"
++     USE_STATIC_FFMPEG=1
+      ;;
+   amd64-*-freebsd*)
+      ARCH="x86_64-freebsd"
+      MAKE="gmake"
++     USE_STATIC_FFMPEG=1
+      ;;
+   arm-apple-darwin*)
+      use_joystick=no
+@@ -781,10 +783,16 @@
+ # platform specific flags
+ if echo "$ARCH" | grep -q "freebsd" ; then
+   LOCALBASE="${LOCALBASE:-/usr/local}"
+-  CFLAGS="$CFLAGS -I$LOCALBASE/include"
+-  CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"
+-  CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"
++  CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"
++  CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"
++  CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"
+   LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
++  CC_FOR_BUILD="$CC"
++  CXX_FOR_BUILD="$CXX"
++  CFLAGS_FOR_BUILD="$CFLAGS"
++  CXXFLAGS_FOR_BUILD="$CXXFLAGS"
++  LDFLAGS_FOR_BUILD="$LDFLAGS"
++  FFMPEG_OPTS="--cc=$CC --cxx=$CXX"
+ fi
+ if test "$host_vendor" = "apple" ; then
+   # standard application paths
+@@ -1184,7 +1192,7 @@
+ )
+ 
+ #Check to see if libs are needed for functions that are often built-in to libc
+-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))
++AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))
+ AC_SEARCH_LIBS([dlopen],dl)
+ AC_SEARCH_LIBS([clock_gettime],rt)
+ AC_SEARCH_LIBS([dn_expand],  resolv)
+@@ -1699,7 +1707,7 @@
+ 
+   if test "$cross_compiling" != "yes"; then
+     if test "$use_debug" != "yes"; then
+-      FFMPEG_OPTS="-r"
++      FFMPEG_OPTS="${FFMPEG_OPTS} -r"
+     fi
+     if test "$use_optimizations" != "yes"; then
+       FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
+@@ -1710,7 +1718,7 @@
+       SAVE_LIBS="$LIBS"
+       # check for system installed ffmpeg. We require minimum versions.
+       PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
+-        [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
++        [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
+         [FFMPEG_FOUND="false"])
+ 
+       if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
+@@ -1737,7 +1745,7 @@
+     elif test "$with_ffmpeg" = "force"; then
+       # always build our ffmpeg
+       AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
+-      CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS}
++      CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} || exit 1
+       export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
+ 
+     elif test "$with_ffmpeg" != "no"; then
+@@ -1750,7 +1758,7 @@
+ 
+ if test "$FFMPEG_FOUND" != "true"; then
+   PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
+-    [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"], 
++    [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"], 
+     [AC_MSG_ERROR("ffmpeg not found")])
+ fi
+ 
+@@ -2408,6 +2416,8 @@
+   LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
+ fi
+ 
++LIBS=$(echo "$LIBS" | tr "\n" " ")
++
+ USE_PVR_ADDONS=0
+ DISABLE_PVR_ADDON_CONFIG=1
+ if [[ -f "pvr-addons/Makefile.am" ]]; then
diff --git a/multimedia/xbmc/files/patch-lib__ffmpeg__libavutil__x86__asm.h b/multimedia/kodi/files/patch-ffmpegx86
index 30396eadd27b..308f968855fb 100644
--- a/multimedia/xbmc/files/patch-lib__ffmpeg__libavutil__x86__asm.h
+++ b/multimedia/kodi/files/patch-ffmpegx86
@@ -1,6 +1,6 @@
---- ./lib/ffmpeg/libavutil/x86/asm.h.orig	2014-01-01 02:26:03.000000000 +0000
-+++ ./lib/ffmpeg/libavutil/x86/asm.h	2014-01-12 10:28:23.000000000 +0000
-@@ -68,7 +68,7 @@
+--- tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix/libavutil/x86/asm.h.orig	2014-12-25 13:59:22.000000000 +0100
++++ tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix/libavutil/x86/asm.h	2014-12-25 14:00:04.000000000 +0100
+@@ -71,7 +71,7 @@
  typedef int x86_reg;
  #endif
  
diff --git a/multimedia/kodi/files/patch-freebsd b/multimedia/kodi/files/patch-freebsd
new file mode 100644
index 000000000000..f05a739f382a
--- /dev/null
+++ b/multimedia/kodi/files/patch-freebsd
@@ -0,0 +1,54 @@
+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
++++ tools/depends/target/ffmpeg/Makefile
+@@ -21,6 +21,11 @@ ffmpg_config += --enable-encoder=wmav2 --enable-protocol=http
+ 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 --enable-gnutls
+diff --git xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+index 2b6e646..babfe89 100644
+--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
++++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
+@@ -289,6 +289,8 @@ bool CAESinkOSS::Initialize(AEAudioFormat &format, std::string &device)
+ #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)
+   {
+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>
+ 
diff --git a/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake b/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake
new file mode 100644
index 000000000000..0936b93f863a
--- /dev/null
+++ b/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake
@@ -0,0 +1,38 @@
+--- project/cmake/scripts/common/prepare-env.cmake.orig	2014-12-19 08:42:16.000000000 +0100
++++ project/cmake/scripts/common/prepare-env.cmake	2014-12-21 20:51:17.000000000 +0100
+@@ -45,12 +45,12 @@
+ get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
+ 
+ # generate the proper kodi-config.cmake file
+-configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
++#configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
+ # copy cmake helpers to lib/kodi
+-file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
++#file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
+ 
+ # generate xbmc-config.cmake for backwards compatibility to xbmc
+-configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
++#configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
+ 
+ ### copy all the addon binding header files to include/kodi
+ # parse addon-bindings.mk to get the list of header files to copy
+@@ -61,17 +61,6 @@
+   string(REPLACE "+=" ";" binding "${binding}")
+   list(GET binding 1 header)
+   # copy the header file to include/kodi
+-  file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR})
++  #file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR})
+ 
+-  # auto-generate header files for backwards comaptibility to xbmc with deprecation warning
+-  get_filename_component(headerfile ${header} NAME)
+-  file(WRITE ${XBMC_INCLUDE_DIR}/${headerfile}
+-"#pragma once
+-#define DEPRECATION_WARNING \"Including xbmc/${headerfile} has been deprecated, please use kodi/${headerfile}\"
+-#ifdef _MSC_VER
+-  #pragma message(\"WARNING: \" DEPRECATION_WARNING)
+-#else
+-  #warning DEPRECATION_WARNING
+-#endif
+-#include \"kodi/${headerfile}\"")
+ endforeach()
+\ No newline at end of file
diff --git a/multimedia/kodi/files/patch-sidplay b/multimedia/kodi/files/patch-sidplay
new file mode 100644
index 000000000000..ffd564ee017f
--- /dev/null
+++ b/multimedia/kodi/files/patch-sidplay
@@ -0,0 +1,151 @@
+diff --git lib/libsidplay2/Makefile.in lib/libsidplay2/Makefile.in
+index 5dda4c9..14247e8 100644
+--- lib/libsidplay2/Makefile.in
++++ lib/libsidplay2/Makefile.in
+@@ -3,7 +3,7 @@ ARCH=@ARCH@
+ SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
+          -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \
+          -Ibuilders/resid-builder/include/sidplay/builders \
+-         -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC
++         -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC
+ CFLAGS += $(SIDFLAGS)
+ CXXFLAGS += $(SIDFLAGS)
+ ifeq ($(ARCH), powerpc-osx)
+@@ -54,13 +54,18 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so
+ 
+ $(SLIB): $(OBJS)
+ ifeq ($(findstring osx,$(ARCH)), osx)
+-	$(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
++	$(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ 		-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
+ 		@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
+ else
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
++	$(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
+ 		`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
+ endif
+ 
+ include @abs_top_srcdir@/Makefile.include
+ 
++%.o: %.cpp
++	@rm -f $@
++	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \
++	&& $(GEN_DEPS)
++
+diff --git lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
+index 5a0f1d7..cd134dd 100644
+--- lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
++++ lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
+@@ -24,7 +24,7 @@
+ 
+ #include <vector>
+ #include "sidbuilder.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ 
+ /***************************************************************************
+diff --git lib/libsidplay2/libsidplay/include/sidplay/c64env.h lib/libsidplay2/libsidplay/include/sidplay/c64env.h
+index a33664d..3779609 100644
+--- lib/libsidplay2/libsidplay/include/sidplay/c64env.h
++++ lib/libsidplay2/libsidplay/include/sidplay/c64env.h
+@@ -19,7 +19,7 @@
+ #define _c64env_h_
+ 
+ #include "sidtypes.h"
+-#include "event.h"
++#include "sidplay/event.h"
+  
+ /* An implementation of of this class can be created to perform the C64
+    specifics.  A pointer to this child class can then be passed to
+diff --git lib/libsidplay2/libsidplay/include/sidplay/sid2types.h lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
+index 0911012..30b0bfe 100644
+--- lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
++++ lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
+@@ -19,7 +19,7 @@
+ #define _sid2types_h_
+ 
+ #include "sidtypes.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ class   sidbuilder;
+ struct  SidTuneInfo;
+diff --git lib/libsidplay2/libsidplay/src/event.cpp lib/libsidplay2/libsidplay/src/event.cpp
+index bfa715c..218e1d6 100644
+--- lib/libsidplay2/libsidplay/src/event.cpp
++++ lib/libsidplay2/libsidplay/src/event.cpp
+@@ -50,7 +50,7 @@
+  ***************************************************************************/
+ 
+ #include <string.h>
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ #define EVENT_TIMEWARP_COUNT 0x0FFFFF
+ 
+diff --git lib/libsidplay2/libsidplay/src/mos6510/mos6510.h lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
+index 9516df5..d5f94ba 100644
+--- lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
++++ lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
+@@ -36,7 +36,7 @@
+ #include "config.h"
+ #include "component.h"
+ #include "sidenv.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ #undef  MOS6510_VERSION
+ #undef  MOS6510_DATE
+diff --git lib/libsidplay2/libsidplay/src/mos6526/mos6526.h lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
+index 1cb665c..e6c740f 100644
+--- lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
++++ lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
+@@ -85,7 +85,7 @@
+ #define _mos6526_h_
+ 
+ #include "component.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ class MOS6526: public component
+ {
+diff --git lib/libsidplay2/libsidplay/src/mos656x/mos656x.h lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
+index ef81202..00e4029 100644
+--- lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
++++ lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
+@@ -19,7 +19,7 @@
+ #define _mos656x_h_
+ 
+ #include "component.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ typedef enum
+ {
+diff --git lib/libsidplay2/libsidplay/src/sid6526/sid6526.h lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
+index e1fb9c1..f2c0e2b 100644
+--- lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
++++ lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
+@@ -38,7 +38,7 @@
+ #define _sid6526_h_
+ 
+ #include "component.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ #include "c64env.h"
+ 
+ class SID6526: public component
+diff --git lib/libsidplay2/libsidplay/src/xsid/xsid.h lib/libsidplay2/libsidplay/src/xsid/xsid.h
+index 572b813..54313a2 100644
+--- lib/libsidplay2/libsidplay/src/xsid/xsid.h
++++ lib/libsidplay2/libsidplay/src/xsid/xsid.h
+@@ -106,7 +106,7 @@ programmed with.
+ 
+ #include "config.h"
+ #include "sidbuilder.h"
+-#include "event.h"
++#include "sidplay/event.h"
+ 
+ // XSID configuration settings
+ //#define XSID_DEBUG 1
diff --git a/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh b/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh
new file mode 100644
index 000000000000..c5e095c4e397
--- /dev/null
+++ b/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh
@@ -0,0 +1,81 @@
+--- 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
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ #      Copyright (C) 2005-2013 Team XBMC
+ #      http://xbmc.org
+@@ -27,7 +27,8 @@
+ VERSION=$(grep "VERSION=" FFMPEG-VERSION | sed 's/VERSION=//g')
+ ARCHIVE=ffmpeg-${VERSION}.tar.gz
+ 
+-function usage {
++usage()
++{
+   echo "usage $(basename $0) 
+        [-p | --prefix]    ... ffmepg install prefix
+        [-d | --download]  ... no build, download tarfile only
+@@ -82,6 +83,14 @@
+       FLAGS="$FLAGS --extra-cxxflags=\"${1#*=}\""
+       shift
+       ;;
++    --cc=*)
++      FLAGS="$FLAGS --cc=${1#*=}"
++      shift
++      ;;
++    --cxx=*)
++      FLAGS="$FLAGS --cxx=${1#*=}"
++      shift
++      ;;
+     -j)
+       BUILDTHREADS=$2
+       shift 2
+@@ -100,7 +109,7 @@
+   esac
+ done
+ 
+-BUILDTHREADS=${BUILDTHREADS:-$(grep -c "^processor" /proc/cpuinfo)}
++BUILDTHREADS=${BUILDTHREADS:-$(sysctl -n hw.ncpu)}
+ [ ${BUILDTHREADS} -eq 0 ] && BUILDTHREADS=1
+ 
+ [ -z ${VERSION} ] && exit 3
+@@ -110,10 +119,10 @@
+   [ "$VERSION" == "$CURVER" ] && exit 0
+ fi
+ 
+-[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz
++#[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz
+ [ $downloadonly ] && exit 0
+ 
+-[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1
++#[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1
+ if [ -d ${FFMPEG_PREFIX} ]
+ then
+   [ -w ${FFMPEG_PREFIX} ] || SUDO="sudo"
+@@ -121,9 +130,9 @@
+   [ -w $(dirname ${FFMPEG_PREFIX}) ] || SUDO="sudo"
+ fi
+ 
+-mkdir ffmpeg-${VERSION}
++#mkdir ffmpeg-${VERSION}
+ cd ffmpeg-${VERSION} || exit 2
+-tar --strip-components=1 -xf ../${ARCHIVE}
++#tar --strip-components=1 -xf ../${ARCHIVE}
+ 
+ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
+ ./configure --prefix=$FFMPEG_PREFIX \
+@@ -157,11 +166,11 @@
+ 	--enable-zlib \
+         ${FLAGS}
+ 
+-make -j ${BUILDTHREADS} 
++gmake -j ${BUILDTHREADS} 
+ if [ $? -eq 0 ]
+ then
+   [ ${SUDO} ] && echo "Root priviledges 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"
+   exit 1
diff --git a/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp b/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp
new file mode 100644
index 000000000000..9de81682b0b7
--- /dev/null
+++ b/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp
@@ -0,0 +1,10 @@
+--- xbmc/cores/DllLoader/dll_tracker.cpp.orig	2014-12-20 16:26:59 UTC
++++ xbmc/cores/DllLoader/dll_tracker.cpp
+@@ -24,6 +24,7 @@
+ #include "DllLoader.h"
+ #include "threads/SingleLock.h"
+ #include "utils/log.h"
++#include "stdlib.h"
+ 
+ #ifdef _cplusplus
+ extern "C"
diff --git a/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp b/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp
new file mode 100644
index 000000000000..0d9ae68ef812
--- /dev/null
+++ b/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp
@@ -0,0 +1,10 @@
+--- xbmc/cores/DllLoader/dll_tracker_file.cpp.orig	2014-12-20 16:27:04 UTC
++++ xbmc/cores/DllLoader/dll_tracker_file.cpp
+@@ -23,6 +23,7 @@
+ #include "DllLoader.h"
+ #include "threads/SingleLock.h"
+ #include "utils/log.h"
++#include "stdlib.h"
+ 
+ #ifdef TARGET_POSIX
+ #define dll_open open
diff --git a/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp b/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp
new file mode 100644
index 000000000000..186d5e7b859e
--- /dev/null
+++ b/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp
@@ -0,0 +1,10 @@
+--- xbmc/cores/DllLoader/exports/emu_kernel32.cpp.orig	2014-12-20 16:28:10 UTC
++++ xbmc/cores/DllLoader/exports/emu_kernel32.cpp
+@@ -38,6 +38,7 @@
+ #define __except catch
+ #endif
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <vector>
+ using namespace std;
diff --git a/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp b/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp
new file mode 100644
index 000000000000..9a1baa2e9d51
--- /dev/null
+++ b/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp
@@ -0,0 +1,10 @@
+--- xbmc/filesystem/iso9660.cpp.orig	2014-12-20 16:28:43 UTC
++++ xbmc/filesystem/iso9660.cpp
+@@ -52,6 +52,7 @@ ISO9660
+ #include "storage/DetectDVDType.h"  // for MODE2_DATA_SIZE etc.
+ #endif
+ #include <cdio/bytesex.h>
++#include <stdlib.h>
+ //#define _DEBUG_OUTPUT 1
+ 
+ static CCriticalSection m_critSection;
diff --git a/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp b/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp
new file mode 100644
index 000000000000..a1309a7545fe
--- /dev/null
+++ b/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>
diff --git a/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp b/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
new file mode 100644
index 000000000000..49215607e1e5
--- /dev/null
+++ b/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>
diff --git a/multimedia/kodi/pkg-descr b/multimedia/kodi/pkg-descr
new file mode 100644
index 000000000000..5d594b6fbd84
--- /dev/null
+++ b/multimedia/kodi/pkg-descr
@@ -0,0 +1,6 @@
+Kodi (formerly known as XBMC) is a free and open source cross-platform
+media-player and entertainment hub. It allows users to play and view
+most videos, music, podcasts, and other digital media files from local
+and network storage media and the internet.
+
+WWW: http://kodi.tv/
diff --git a/multimedia/xbmc/pkg-plist b/multimedia/kodi/pkg-plist
index 0b913abf9c21..55d81a1b31c5 100644
--- a/multimedia/xbmc/pkg-plist
+++ b/multimedia/kodi/pkg-plist
@@ -1,65 +1,82 @@
+bin/kodi
+bin/kodi-standalone
 bin/xbmc
 bin/xbmc-standalone
-include/xbmc/DVDDemuxPacket.h
-include/xbmc/libXBMC_addon.h
-include/xbmc/libXBMC_codec.h
-include/xbmc/libXBMC_gui.h
-include/xbmc/libXBMC_pvr.h
-include/xbmc/xbmc_addon_cpp_dll.h
-include/xbmc/xbmc_addon_dll.h
-include/xbmc/xbmc_addon_types.h
-include/xbmc/xbmc_codec_types.h
-include/xbmc/xbmc_epg_types.h
-include/xbmc/xbmc_pvr_dll.h
-include/xbmc/xbmc_pvr_types.h
-include/xbmc/xbmc_scr_dll.h
-include/xbmc/xbmc_scr_types.h
-include/xbmc/xbmc_stream_utils.hpp
-include/xbmc/xbmc_vis_dll.h
-include/xbmc/xbmc_vis_types.h
-lib/xbmc/AddOptions.cmake
-lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so
-lib/xbmc/addons/library.xbmc.codec/libXBMC_codec-%%ARCH%%-freebsd.so
-lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-%%ARCH%%-freebsd.so
-lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so
-lib/xbmc/addons/screensaver.rsxs.euphoria/Euphoria.xbs
-lib/xbmc/addons/screensaver.rsxs.plasma/Plasma.xbs
-lib/xbmc/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs
-lib/xbmc/addons/visualization.fishbmc/fishbmc.vis
-lib/xbmc/addons/visualization.glspectrum/opengl_spectrum.vis
-lib/xbmc/addons/visualization.projectm/projectM.vis
-lib/xbmc/addons/visualization.waveform/Waveform.vis
-lib/xbmc/system/ImageLib-%%ARCH%%-freebsd.so
-lib/xbmc/system/hdhomerun-%%ARCH%%-freebsd.so
-%%MYSQL%%lib/xbmc/system/libcmyth-%%ARCH%%-freebsd.so
-lib/xbmc/system/libcpluff-%%ARCH%%-freebsd.so
-lib/xbmc/system/libexif-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/avcodec-54-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/avfilter-3-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/avformat-54-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/avutil-52-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/paplayer/libsidplay2-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/paplayer/timidity-%%ARCH%%-freebsd.so
-lib/xbmc/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so
-lib/xbmc/xbmc-addon-helpers.cmake
-lib/xbmc/xbmc-config.cmake
-%%XRANDR%%lib/xbmc/xbmc-xrandr
-lib/xbmc/xbmc.bin
-man/man1/xbmc.1.gz
-man/man1/xbmc.bin.1.gz
+include/kodi/DVDDemuxPacket.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
+include/kodi/xbmc_addon_types.h
+include/kodi/xbmc_audioenc_dll.h
+include/kodi/xbmc_audioenc_types.h
+include/kodi/xbmc_codec_types.h
+include/kodi/xbmc_epg_types.h
+include/kodi/xbmc_pvr_dll.h
+include/kodi/xbmc_pvr_types.h
+include/kodi/xbmc_scr_dll.h
+include/kodi/xbmc_scr_types.h
+include/kodi/xbmc_stream_utils.hpp
+include/kodi/xbmc_vis_dll.h
+include/kodi/xbmc_vis_types.h
+include/xbmc
+lib/kodi/addon-helpers.cmake
+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
+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/kodi-config.cmake
+%%XRANDR%%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
+man/man1/kodi.bin.1.gz
+share/applications/kodi.desktop
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL
 %%PORTDOCS%%%%DOCSDIR%%/README.linux
 %%PORTDOCS%%%%DOCSDIR%%/copying.txt
-share/icons/hicolor/256x256/apps/xbmc.png
-share/icons/hicolor/48x48/apps/xbmc.png
+%%PORTDOCS%%%%DOCSDIR%%/version.txt
+share/icons/hicolor/128x128/apps/kodi.png
+share/icons/hicolor/16x16/apps/kodi.png
+share/icons/hicolor/22x22/apps/kodi.png
+share/icons/hicolor/24x24/apps/kodi.png
+share/icons/hicolor/256x256/apps/kodi.png
+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
+%%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/resources/settings.xml
+%%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/addon.xml
+%%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/library.xbmc.addon/dlfcn-win32.cpp
 %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.h
 %%DATADIR%%/addons/library.xbmc.addon/libXBMC_addon.h
@@ -70,117 +87,126 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/metadata.album.universal/albumuniversal.xml
 %%DATADIR%%/addons/metadata.album.universal/changelog.txt
 %%DATADIR%%/addons/metadata.album.universal/icon.png
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Afrikaans/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Amharic/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Asturian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Belarusian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Burmese/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Catalan/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Traditional)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Croatian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Czech/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Danish/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Estonian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Galician/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Georgian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Greek/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Hebrew/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Icelandic/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Italian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Japanese/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Latvian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Lithuanian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Macedonian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Malay/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Norwegian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Portuguese (Brazil)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Slovak/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish (Argentina)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish (Mexico)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Tamil (India)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Thai/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Turkish/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Ukrainian/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Vietnamese (Viet Nam)/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Vietnamese/strings.xml
-%%DATADIR%%/addons/metadata.album.universal/resources/language/Welsh/strings.xml
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Amharic/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Asturian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Burmese/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Czech/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Danish/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/English (Australia)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/English (New Zealand)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/English/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/French (Canada)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/French/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Galician/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Georgian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/German/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Greek/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Italian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Korean/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Latvian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Malay/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Polish/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Russian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Tamil (India)/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Thai/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Ukrainian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Vietnamese/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Welsh/strings.po
 %%DATADIR%%/addons/metadata.album.universal/resources/settings.xml
 %%DATADIR%%/addons/metadata.artists.universal/addon.xml
 %%DATADIR%%/addons/metadata.artists.universal/artistuniversal.xml
 %%DATADIR%%/addons/metadata.artists.universal/changelog.txt
 %%DATADIR%%/addons/metadata.artists.universal/icon.png
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Afrikaans/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Amharic/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Arabic/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Asturian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Belarusian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Burmese/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Catalan/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Chinese (Traditional)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Croatian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Czech/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Danish/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Estonian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Galician/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Greek/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Hebrew/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Icelandic/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Italian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Japanese/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Latvian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Lithuanian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Macedonian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Malay/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Norwegian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Portuguese (Brazil)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Slovak/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Spanish (Argentina)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Spanish (Mexico)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Tamil (India)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Thai/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Turkish/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Ukrainian/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Vietnamese (Viet Nam)/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Vietnamese/strings.xml
-%%DATADIR%%/addons/metadata.artists.universal/resources/language/Welsh/strings.xml
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Amharic/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Asturian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Burmese/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Czech/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Danish/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/English (Australia)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/English (New Zealand)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/English/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/French (Canada)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/French/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Galician/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/German/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Greek/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Italian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Korean/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Latvian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Malay/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Polish/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Russian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Tamil (India)/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Thai/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Ukrainian/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Vietnamese/strings.po
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/Welsh/strings.po
 %%DATADIR%%/addons/metadata.artists.universal/resources/settings.xml
 %%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
@@ -198,6 +224,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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
 %%DATADIR%%/addons/metadata.common.theaudiodb.com/addon.xml
 %%DATADIR%%/addons/metadata.common.theaudiodb.com/icon.png
@@ -211,181 +238,190 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Belarusian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Burmese/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Catalan/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Chinese (Traditional)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Croatian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Czech/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Danish/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Estonian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Galician/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Greek/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hebrew/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Italian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Japanese/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Lithuanian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Macedonian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Malay/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Norwegian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese (Brazil)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovak/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Argentina)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish (Mexico)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Tamil (India)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Thai/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Turkish/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Ukrainian/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese (Viet Nam)/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Vietnamese/strings.xml
-%%DATADIR%%/addons/metadata.musicvideos.theaudiodb.com/resources/language/Welsh/strings.xml
+%%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
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Afrikaans/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Albanian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Amharic/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Azerbaijani/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Basque/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Belarusian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Burmese/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Catalan/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Croatian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Czech/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Danish/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English (US)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Estonian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French (Canada)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Galician/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Greek/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hebrew/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hindi (Devanagiri)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Italian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Japanese/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Lithuanian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Macedonian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Malay/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Malayalam/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Portuguese (Brazil)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Slovak/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Spanish (Argentina)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Spanish (Mexico)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Thai/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Turkish/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Vietnamese (Viet Nam)/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.xml
-%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Welsh/strings.xml
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Albanian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Amharic/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Basque/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Burmese/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Czech/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Danish/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/English/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French (Canada)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/French/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Galician/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/German/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Greek/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hindi (Devanagiri)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Italian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Korean/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Malay/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Malayalam/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Polish/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Russian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Tamil (India)/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Thai/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Ukrainian/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Uzbek/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Vietnamese/strings.po
+%%DATADIR%%/addons/metadata.themoviedb.org/resources/language/Welsh/strings.po
 %%DATADIR%%/addons/metadata.themoviedb.org/resources/settings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/tmdb.xml
 %%DATADIR%%/addons/metadata.tvdb.com/addon.xml
 %%DATADIR%%/addons/metadata.tvdb.com/changelog.txt
 %%DATADIR%%/addons/metadata.tvdb.com/icon.png
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Afrikaans/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Albanian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Amharic/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Arabic/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Azerbaijani/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Basque/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Belarusian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Bosnian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Burmese/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Catalan/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Chinese (Traditional)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Croatian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Czech/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Danish/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Esperanto/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Estonian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Faroese/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Galician/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Georgian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Greek/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Hebrew/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Hindi (Devanagiri)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Icelandic/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Indonesian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Italian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Japanese/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Latvian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Lithuanian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Macedonian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Malay/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Malayalam/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Maltese/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Norwegian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Persian (Iran)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Persian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Portuguese (Brazil)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Serbian (Cyrillic)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Serbian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Slovak/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish (Argentina)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish (Mexico)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Tamil (India)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Thai/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Turkish/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Ukrainian/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Uzbek/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Vietnamese (Viet Nam)/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Vietnamese/strings.xml
-%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Welsh/strings.xml
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Albanian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Amharic/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Armenian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Azerbaijani/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Basque/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Bosnian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Burmese/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Czech/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Danish/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/English (Australia)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/English (New Zealand)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/English/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Esperanto/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Faroese/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/French (Canada)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/French/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Galician/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Georgian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/German/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Greek/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Hindi (Devanagiri)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Italian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Korean/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Latvian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Malay/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Malayalam/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Maltese/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Mongolian (Mongolia)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Persian (Iran)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Persian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Polish/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Russian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Serbian (Cyrillic)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Serbian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Tamil (India)/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Thai/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Ukrainian/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Uzbek/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Vietnamese/strings.po
+%%DATADIR%%/addons/metadata.tvdb.com/resources/language/Welsh/strings.po
 %%DATADIR%%/addons/metadata.tvdb.com/resources/settings.xml
 %%DATADIR%%/addons/metadata.tvdb.com/tvdb.xml
 %%DATADIR%%/addons/repository.xbmc.org/addon.xml
@@ -428,6 +464,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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
@@ -437,6 +474,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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
@@ -447,11 +485,9 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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 (Venezuela)/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/Tamil (India)/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
@@ -476,6 +512,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Albanian/strings.po
 %%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/Basque/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Belarusian/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Bosnian/strings.po
@@ -516,6 +553,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Malay/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Malayalam/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Maltese/strings.po
+%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Mongolian (Mongolia)/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Norwegian/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Persian (Iran)/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Persian/strings.po
@@ -532,12 +570,10 @@ share/icons/hicolor/48x48/apps/xbmc.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
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Uzbek/strings.po
-%%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Vietnamese (Viet Nam)/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Vietnamese/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/language/Welsh/strings.po
 %%DATADIR%%/addons/service.xbmc.versioncheck/resources/polkit/10-allow-update.pkla
@@ -596,6 +632,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/IncludesCodecFlagging.xml
 %%DATADIR%%/addons/skin.confluence/720p/IncludesHomeMenuItems.xml
 %%DATADIR%%/addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
+%%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
@@ -606,7 +643,11 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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/MyPVR.xml
+%%DATADIR%%/addons/skin.confluence/720p/MyPVRChannels.xml
+%%DATADIR%%/addons/skin.confluence/720p/MyPVRGuide.xml
+%%DATADIR%%/addons/skin.confluence/720p/MyPVRRecordings.xml
+%%DATADIR%%/addons/skin.confluence/720p/MyPVRSearch.xml
+%%DATADIR%%/addons/skin.confluence/720p/MyPVRTimers.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyPics.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyPrograms.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyVideoNav.xml
@@ -634,9 +675,10 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/ViewsFileMode.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsLiveTV.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsMusicLibrary.xml
-%%DATADIR%%/addons/skin.confluence/720p/ViewsPVR.xml
+%%DATADIR%%/addons/skin.confluence/720p/ViewsPVRGuide.xml
 %%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
@@ -644,13 +686,8 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/script-NextAired-TVGuide.xml
 %%DATADIR%%/addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml
 %%DATADIR%%/addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml
-%%DATADIR%%/addons/skin.confluence/720p/script-XBMC_Lyrics-main.xml
+%%DATADIR%%/addons/skin.confluence/720p/script-cu-lrclyrics-main.xml
 %%DATADIR%%/addons/skin.confluence/720p/script-globalsearch-main.xml
-%%DATADIR%%/addons/skin.confluence/720p/weather/10DayForecast.xml
-%%DATADIR%%/addons/skin.confluence/720p/weather/36HourForecast.xml
-%%DATADIR%%/addons/skin.confluence/720p/weather/HourlyForecast.xml
-%%DATADIR%%/addons/skin.confluence/720p/weather/MapAlerts.xml
-%%DATADIR%%/addons/skin.confluence/720p/weather/WeekendForecast.xml
 %%DATADIR%%/addons/skin.confluence/addon.xml
 %%DATADIR%%/addons/skin.confluence/backgrounds/SKINDEFAULT.jpg
 %%DATADIR%%/addons/skin.confluence/backgrounds/media-overlay.jpg
@@ -730,7 +767,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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 (Venezuela)/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
@@ -740,7 +776,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%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 (Viet Nam)/strings.po
 %%DATADIR%%/addons/skin.confluence/language/Vietnamese/strings.po
 %%DATADIR%%/addons/skin.confluence/language/Welsh/strings.po
 %%DATADIR%%/addons/skin.confluence/media/CalibrateBottomRight.png
@@ -761,6 +796,10 @@ share/icons/hicolor/48x48/apps/xbmc.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/DefaultAddonAudioEncoder.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonHelper.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonInfoLibrary.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultAddonLibrary.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonLyrics.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonMovieInfo.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultAddonMusic.png
@@ -938,6 +977,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/OverlayWatched.png
 %%DATADIR%%/addons/skin.confluence/media/OverlayWatching.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-IsRecording.png
 %%DATADIR%%/addons/skin.confluence/media/RecentAddedBack.png
@@ -1055,7 +1095,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/2.35.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/2.40.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/2.55.png
-%%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/2.76.png
+%%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/%%PYTHON_VER%%6.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/0.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/1.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/10.png
@@ -1085,6 +1125,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/mp2.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/mp3.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/ogg.png
+%%DATADIR%%/addons/skin.confluence/media/flagging/audio/opus.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/pcm_bluray.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/truehd.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/audio/vorbis.png
@@ -1122,12 +1163,14 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/h264.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/hddvd.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/hdmv.png
+%%DATADIR%%/addons/skin.confluence/media/flagging/video/hevc.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/mpeg1video.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/mpeg2video.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/tv.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/vc-1.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/vhs.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/vp8.png
+%%DATADIR%%/addons/skin.confluence/media/flagging/video/vp9.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/wvc1.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/video/xvid.png
 %%DATADIR%%/addons/skin.confluence/media/floor.png
@@ -1150,6 +1193,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/icon_system.png
 %%DATADIR%%/addons/skin.confluence/media/icon_video.png
 %%DATADIR%%/addons/skin.confluence/media/icon_weather.png
+%%DATADIR%%/addons/skin.confluence/media/kodi-logo.png
 %%DATADIR%%/addons/skin.confluence/media/osd_slider_bg.png
 %%DATADIR%%/addons/skin.confluence/media/osd_slider_bg_2.png
 %%DATADIR%%/addons/skin.confluence/media/osd_slider_nib.png
@@ -1178,7 +1222,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/separator2.png
 %%DATADIR%%/addons/skin.confluence/media/separator_vertical.png
 %%DATADIR%%/addons/skin.confluence/media/unknown-user.png
-%%DATADIR%%/addons/skin.confluence/media/xbmc-logo.png
 %%DATADIR%%/addons/skin.confluence/sounds/back.wav
 %%DATADIR%%/addons/skin.confluence/sounds/click.wav
 %%DATADIR%%/addons/skin.confluence/sounds/cursor.wav
@@ -1232,6 +1275,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/visualization.fishbmc/resources/language/Latvian/strings.po
 %%DATADIR%%/addons/visualization.fishbmc/resources/language/Lithuanian/strings.po
 %%DATADIR%%/addons/visualization.fishbmc/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/visualization.fishbmc/resources/language/Malay/strings.po
 %%DATADIR%%/addons/visualization.fishbmc/resources/language/Maltese/strings.po
 %%DATADIR%%/addons/visualization.fishbmc/resources/language/Maori/strings.po
 %%DATADIR%%/addons/visualization.fishbmc/resources/language/Norwegian/strings.po
@@ -1378,6 +1422,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/visualization.projectm/resources/language/Latvian/strings.po
 %%DATADIR%%/addons/visualization.projectm/resources/language/Lithuanian/strings.po
 %%DATADIR%%/addons/visualization.projectm/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Malay/strings.po
 %%DATADIR%%/addons/visualization.projectm/resources/language/Maltese/strings.po
 %%DATADIR%%/addons/visualization.projectm/resources/language/Maori/strings.po
 %%DATADIR%%/addons/visualization.projectm/resources/language/Norwegian/strings.po
@@ -1449,7 +1494,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/visualization.vortex/resources/Presets/WaveScope.vtx
 %%DATADIR%%/addons/visualization.vortex/resources/Presets/WaveZoomer.vtx
 %%DATADIR%%/addons/visualization.vortex/resources/Presets/Woofer.vtx
-%%DATADIR%%/addons/visualization.vortex/resources/Presets/XBMCRain.vtx
 %%DATADIR%%/addons/visualization.vortex/resources/Presets/tunnel.tra
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/Plasma_edge.jpg
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/Skull_JawUD1.png
@@ -1476,10 +1520,8 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/skull.png
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/sky.dds
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/skybox.dds
-%%DATADIR%%/addons/visualization.vortex/resources/Textures/splash_original.dds
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/trail2.dds
 %%DATADIR%%/addons/visualization.vortex/resources/Textures/vortex-v.jpg
-%%DATADIR%%/addons/visualization.vortex/resources/Textures/xbmc_icon.png
 %%DATADIR%%/addons/visualization.vortex/resources/language/Afrikaans/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Albanian/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Amharic/strings.po
@@ -1529,7 +1571,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/visualization.vortex/resources/language/Spanish/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Swedish/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Tajik/strings.po
-%%DATADIR%%/addons/visualization.vortex/resources/language/Tamil (India)/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Thai/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Turkish/strings.po
 %%DATADIR%%/addons/visualization.vortex/resources/language/Ukrainian/strings.po
@@ -1559,65 +1600,21 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/webinterface.default/js/xbmc.launcher.js
 %%DATADIR%%/addons/webinterface.default/js/xbmc.rpc.js
 %%DATADIR%%/addons/xbmc.addon/addon.xml
+%%DATADIR%%/addons/xbmc.addon/addon.xml.in
 %%DATADIR%%/addons/xbmc.addon/metadata.xsd
 %%DATADIR%%/addons/xbmc.addon/repository.xsd
 %%DATADIR%%/addons/xbmc.codec/addon.xml
 %%DATADIR%%/addons/xbmc.core/addon.xml
-%%DATADIR%%/addons/xbmc.debug/addon.xml
-%%DATADIR%%/addons/xbmc.debug/resources/language/Afrikaans/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Armenian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Bulgarian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Burmese/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Catalan/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Chinese (Simple)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Chinese (Traditional)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Croatian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Czech/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Danish/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Dutch/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/English (Australia)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/English (New Zealand)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/English (US)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/English/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Estonian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/French (Canada)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/French/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Galician/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/German/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Greek/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Hebrew/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Hungarian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Icelandic/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Indonesian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Italian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Japanese/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Korean/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Latvian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Lithuanian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Norwegian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Polish/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Portuguese (Brazil)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Portuguese/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Russian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Slovak/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Slovenian/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Spanish (Argentina)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Spanish (Mexico)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Spanish/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Swedish/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Tajik/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Tamil (India)/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Thai/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Turkish/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/language/Welsh/strings.po
-%%DATADIR%%/addons/xbmc.debug/resources/settings.xml
 %%DATADIR%%/addons/xbmc.gui/addon.xml
 %%DATADIR%%/addons/xbmc.gui/skin.xsd
 %%DATADIR%%/addons/xbmc.json/addon.xml
+%%DATADIR%%/addons/xbmc.json/addon.xml.in
 %%DATADIR%%/addons/xbmc.metadata/addon.xml
 %%DATADIR%%/addons/xbmc.metadata/scraper.xsd
 %%DATADIR%%/addons/xbmc.pvr/addon.xml
+%%DATADIR%%/addons/xbmc.pvr/icon.png
 %%DATADIR%%/addons/xbmc.python/addon.xml
+%%DATADIR%%/addons/xbmc.python/icon.png
 %%DATADIR%%/addons/xbmc.python/pluginsource.xsd
 %%DATADIR%%/addons/xbmc.python/script.xsd
 %%DATADIR%%/language/Afrikaans/langinfo.xml
@@ -1628,6 +1625,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/language/Amharic/strings.po
 %%DATADIR%%/language/Arabic/langinfo.xml
 %%DATADIR%%/language/Arabic/strings.po
+%%DATADIR%%/language/Armenian/langinfo.xml
 %%DATADIR%%/language/Armenian/strings.po
 %%DATADIR%%/language/Azerbaijani/langinfo.xml
 %%DATADIR%%/language/Azerbaijani/strings.po
@@ -1712,6 +1710,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/language/Maltese/strings.po
 %%DATADIR%%/language/Maori/langinfo.xml
 %%DATADIR%%/language/Maori/strings.po
+%%DATADIR%%/language/Mongolian (Mongolia)/langinfo.xml
 %%DATADIR%%/language/Mongolian (Mongolia)/strings.po
 %%DATADIR%%/language/Norwegian/langinfo.xml
 %%DATADIR%%/language/Norwegian/strings.po
@@ -1735,6 +1734,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/language/Serbian (Cyrillic)/strings.po
 %%DATADIR%%/language/Serbian/langinfo.xml
 %%DATADIR%%/language/Serbian/strings.po
+%%DATADIR%%/language/Sinhala/langinfo.xml
 %%DATADIR%%/language/Sinhala/strings.po
 %%DATADIR%%/language/Slovak/langinfo.xml
 %%DATADIR%%/language/Slovak/strings.po
@@ -1781,6 +1781,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/system/Lircmap.xml
 %%DATADIR%%/system/X10-Lola-IRSSmap.xml
 %%DATADIR%%/system/colors.xml
+%%DATADIR%%/system/keyboardlayouts.xml
 %%DATADIR%%/system/keymaps/appcommand.xml
 %%DATADIR%%/system/keymaps/gamepad.xml
 %%DATADIR%%/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml
@@ -1794,7 +1795,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/system/keymaps/joystick.PS3.Remote.Keyboard.xml
 %%DATADIR%%/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml
 %%DATADIR%%/system/keymaps/joystick.WiiRemote.xml
-%%DATADIR%%/system/keymaps/joystick.xml
+%%DATADIR%%/system/keymaps/joystick.xml.sample
 %%DATADIR%%/system/keymaps/keyboard.xml
 %%DATADIR%%/system/keymaps/mouse.xml
 %%DATADIR%%/system/keymaps/nyxboard/keyboard.xml
@@ -1934,4 +1935,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/userdata/PictureIcon/Readme.txt
 %%DATADIR%%/userdata/PictureIcon/picon.xml
 %%DATADIR%%/userdata/RssFeeds.xml
-share/xsessions/XBMC.desktop
+share/xbmc
+share/xsessions/kodi.desktop
+share/xsessions/xbmc.desktop
diff --git a/multimedia/xbmc/distinfo b/multimedia/xbmc/distinfo
deleted file mode 100644
index fb61f5dfd8be..000000000000
--- a/multimedia/xbmc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xbmc-13.2.tar.gz) = acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585
-SIZE (xbmc-13.2.tar.gz) = 65900491
diff --git a/multimedia/xbmc/files/patch-configure.in b/multimedia/xbmc/files/patch-configure.in
deleted file mode 100644
index ecb02b766cd1..000000000000
--- a/multimedia/xbmc/files/patch-configure.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.in.orig	2014-01-01 03:26:03.000000000 +0100
-+++ configure.in	2014-01-05 00:33:52.000000000 +0100
-@@ -820,11 +820,16 @@
- # platform specific flags
- if echo "$ARCH" | grep -q "freebsd" ; then
-   LOCALBASE="${LOCALBASE:-/usr/local}"
--  CFLAGS="$CFLAGS -I$LOCALBASE/include"
--  CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"
--  CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"
-+  CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"
-+  CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"
-+  CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"
-   LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
--  FFMPEG_EXTRACFLAGS="-I$LOCALBASE/include"
-+  FFMPEG_EXTRACFLAGS="-idirafter$LOCALBASE/include"
-+  CC_FOR_BUILD="$CC"
-+  CXX_FOR_BUILD="$CXX"
-+  CFLAGS_FOR_BUILD="$CFLAGS"
-+  CXXFLAGS_FOR_BUILD="$CXXFLAGS"
-+  LDFLAGS_FOR_BUILD="$LDFLAGS"
- fi
- if test "$host_vendor" = "apple" ; then
-   # standard xbmc paths
-@@ -948,6 +953,7 @@
- 
- # Check inotify availability
- AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
-+AC_CHECK_LIB([inotify], [main],,)
- 
- # Checks for boost headers using CXX instead of CC
- AC_LANG_PUSH([C++])
diff --git a/multimedia/xbmc/files/patch-libcec22 b/multimedia/xbmc/files/patch-libcec22
deleted file mode 100644
index 1473f9ac7016..000000000000
--- a/multimedia/xbmc/files/patch-libcec22
+++ /dev/null
@@ -1,52 +0,0 @@
-Origin: https://github.com/xbmc/xbmc/pull/5610
-
---- system/peripherals.xml.orig	2014-08-25 20:29:00.000000000 +0800
-+++ system/peripherals.xml	2014-12-31 07:15:34.972922137 +0800
-@@ -28,7 +28,7 @@
-     <setting key="device_type" type="int" value="1" configurable="0" />
-     <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
-     <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
--    <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" />
-+    <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
-   </peripheral>
- 
-   <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
---- xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp.orig	2014-08-25 20:29:00.000000000 +0800
-+++ xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp	2014-12-31 07:15:34.976923956 +0800
-@@ -101,6 +101,8 @@
-       break;
-     case ADAPTERTYPE_RPI:
-       result.m_mappedBusType = PERIPHERAL_BUS_RPI;
-+      // the Pi's adapter cannot be removed, no need to rescan
-+      m_bNeedsPolling = false;
-       break;
-     default:
-       break;
---- xbmc/peripherals/devices/PeripheralCecAdapter.cpp.orig	2014-08-25 20:29:00.000000000 +0800
-+++ xbmc/peripherals/devices/PeripheralCecAdapter.cpp	2014-12-31 07:15:34.986923118 +0800
-@@ -1302,8 +1302,8 @@
- 
- void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
- {
--  // use the same client version as libCEC version
--  m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
-+  // client version matches the version of libCEC that we originally used the API from
-+  m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0;
- 
-   // device name 'XBMC'
-   snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
-@@ -1378,8 +1378,13 @@
-   m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0;
-   m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
- 
--  // double tap prevention timeout in ms
-+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD)
-+  // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
-+  m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
-+#else
-+  // backwards compatibility. will be removed once the next major release of libCEC is out
-   m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
-+#endif
- }
- 
- void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp b/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp
deleted file mode 100644
index 46c63fbba3d9..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
-index f6ec980..7bcb6d6 100644
---- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
-+++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp
-@@ -298,6 +298,8 @@ bool CAESinkOSS::Initialize(AEAudioFormat &format, std::string &device)
- #endif
- 
-   int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES;
-+  if (AE_IS_RAW_HD(format.m_dataFormat))
-+    tmp *= 8;
-   int pos = 0;
-   while ((tmp & 0x1) == 0x0)
-   {
-@@ -478,12 +480,23 @@ void CAESinkOSS::EnumerateDevicesEx(AEDeviceInfoList &list, bool force)
-     devicename << cardinfo.shortname << " " << cardinfo.longname;
-     info.m_displayName = devicename.str();
- 
--    if (info.m_displayName.find("HDMI") != std::string::npos)
-+    info.m_dataFormats.push_back(AE_FMT_S16NE);
-+    info.m_dataFormats.push_back(AE_FMT_S32NE);
-+    if (info.m_displayName.find("HDMI") != std::string::npos) {
-       info.m_deviceType = AE_DEVTYPE_HDMI;
--    else if (info.m_displayName.find("Digital") != std::string::npos)
-+      info.m_dataFormats.push_back(AE_FMT_AC3);
-+      info.m_dataFormats.push_back(AE_FMT_DTS);
-+      info.m_dataFormats.push_back(AE_FMT_EAC3);
-+      info.m_dataFormats.push_back(AE_FMT_TRUEHD);
-+      info.m_dataFormats.push_back(AE_FMT_DTSHD);
-+      info.m_dataFormats.push_back(AE_FMT_LPCM);
-+    } else if (info.m_displayName.find("Digital") != std::string::npos) {
-       info.m_deviceType = AE_DEVTYPE_IEC958;
--    else
-+      info.m_dataFormats.push_back(AE_FMT_AC3);
-+      info.m_dataFormats.push_back(AE_FMT_DTS);
-+    } else {
-       info.m_deviceType = AE_DEVTYPE_PCM;
-+    }
-  
-     oss_audioinfo ainfo;
-     memset(&ainfo, 0, sizeof(ainfo));
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp
deleted file mode 100644
index 9187cdc9a17a..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc/cores/DllLoader/dll_tracker.cpp.orig	2013-12-27 17:07:11.000000000 +0100
-+++ xbmc/cores/DllLoader/dll_tracker.cpp	2013-12-27 17:05:29.000000000 +0100
-@@ -24,6 +24,7 @@
- #include "DllLoader.h"
- #include "threads/SingleLock.h"
- #include "utils/log.h"
-+#include <stdlib.h>
- 
- #ifdef _cplusplus
- extern "C"
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp
deleted file mode 100644
index de09cb7ceb91..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbmc/cores/DllLoader/dll_tracker_file.cpp.orig	2013-12-27 17:07:01.000000000 +0100
-+++ xbmc/cores/DllLoader/dll_tracker_file.cpp	2013-12-27 17:07:36.000000000 +0100
-@@ -23,6 +23,7 @@
- #include "DllLoader.h"
- #include "threads/SingleLock.h"
- #include "utils/log.h"
-+#include <stdlib.h>
- 
- #ifdef TARGET_POSIX
- #define dll_open open
diff --git a/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp b/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
deleted file mode 100644
index bf74dfa5c868..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2013-12-03 16:25:00.000000000 +0100
-+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp	2013-12-03 16:26:01.000000000 +0100
-@@ -29,12 +29,8 @@
- #include <string.h>
- #ifdef TARGET_FREEBSD
- #include <sys/param.h>
--#if __FreeBSD_version < 900031
--#include <sys/thr.h>
--#else
- #include <pthread_np.h>
- #endif
--#endif
- 
- #include <signal.h>
- 
-@@ -59,11 +55,7 @@
- void CThread::SetThreadInfo()
- {
- #ifdef TARGET_FREEBSD
--#if __FreeBSD_version < 900031
--  long lwpid;
--  thr_self(&lwpid);
--  m_ThreadOpaque.LwpId = lwpid;
--#else
-+#if __FreeBSD_version > 900030
-   m_ThreadOpaque.LwpId = pthread_getthreadid_np();
- #endif
- #elif defined(TARGET_ANDROID)
diff --git a/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__Common.hpp b/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__Common.hpp
deleted file mode 100644
index c6fd2bd44ae1..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__Common.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- xbmc/visualizations/XBMCProjectM/libprojectM/Common.hpp.orig	2013-12-27 16:58:27.000000000 +0100
-+++ xbmc/visualizations/XBMCProjectM/libprojectM/Common.hpp	2013-12-27 16:58:50.000000000 +0100
-@@ -57,11 +57,7 @@
- #endif
- 			 
- #ifdef LINUX
--#define projectM_isnan isnan
--#endif
--
--#ifdef LINUX
--#define projectM_isnan isnan
-+#define projectM_isnan std::isnan
- #endif
- 
- #ifdef WIN32
diff --git a/multimedia/xbmc/pkg-descr b/multimedia/xbmc/pkg-descr
deleted file mode 100644
index ffd168df0dfc..000000000000
--- a/multimedia/xbmc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-XBMC Media Center (formerly named "XBox Media Center")
-is a free and open source cross-platform media-player
-and entertainment hub.
-
-WWW: http://xbmc.org/