- Update to 12.rc1

PR:		ports/173599
Submitted by:	Mickael Maillot <mickael.maillot@gmail.com> (maintainer)

42 files changed, 1160 insertions, 1708 deletions

diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index a493f3342601..055837ab80d0 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -1,15 +1,8 @@
-# New ports collection makefile for:    xbmc
-# Date created:				2010-09-16
-# Whom: 				Mickael Maillot <mickael.maillot@gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	xbmc
-PORTVERSION=	11.0
-PORTREVISION=	7
+DISTVERSION=	12.0.rc1
 CATEGORIES=	multimedia
-MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
 MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	XBMC is an award winning media center application
@@ -24,7 +17,9 @@ BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
 		unzip:${PORTSDIR}/archivers/unzip \
 		nasm:${PORTSDIR}/devel/nasm \
 		dvdread-config:${PORTSDIR}/multimedia/libdvdread \
-		gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20
+		gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20 \
+		${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh \
+		swig2.0:${PORTSDIR}/devel/swig20
 LIB_DEPENDS=	ass:${PORTSDIR}/multimedia/libass \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
 		cdio:${PORTSDIR}/sysutils/libcdio	\
@@ -32,7 +27,6 @@ LIB_DEPENDS=	ass:${PORTSDIR}/multimedia/libass \
 		dbus-1:${PORTSDIR}/devel/dbus \
 		enca:${PORTSDIR}/converters/enca \
 		GLEW:${PORTSDIR}/graphics/glew \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg	\
 		FLAC:${PORTSDIR}/audio/flac \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
@@ -42,6 +36,7 @@ LIB_DEPENDS=	ass:${PORTSDIR}/multimedia/libass \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		mad:${PORTSDIR}/audio/libmad \
 		modplug:${PORTSDIR}/audio/libmodplug \
+		mp3lame:${PORTSDIR}/audio/lame \
 		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
 		ogg:${PORTSDIR}/audio/libogg \
 		pcre:${PORTSDIR}/devel/pcre \
@@ -50,14 +45,21 @@ LIB_DEPENDS=	ass:${PORTSDIR}/multimedia/libass \
 		samplerate:${PORTSDIR}/audio/libsamplerate \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient	\
 		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		tag:${PORTSDIR}/audio/taglib \
+		tinyxml:${PORTSDIR}/textproc/tinyxml \
 		vorbis:${PORTSDIR}/audio/libvorbis \
 		yajl:${PORTSDIR}/devel/yajl
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
+		${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh \
 		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
-FETCH_ARGS=	-Fpr
+USE_GITHUB=	yes
+GH_ACCOUNT=	xbmc
+GH_COMMIT=	baaa51c
+GH_TAGNAME=	Frodo_rc1
+
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
@@ -67,6 +69,8 @@ USE_GL=		glu
 USE_SDL=	image sdl
 USE_MYSQL=	yes
 USE_PYTHON=	2.5+
+USE_JAVA=	yes
+JAVA_BUILD=	jre
 MAKE_JOBS_SAFE=	yes
 NOPRECIOUSMAKEVARS=	yes
 INSTALLS_ICONS=	yes
@@ -80,20 +84,18 @@ DESKTOP_ENTRIES="XBMC" \
 		"AudioVideo;Video;" \
 		true
 
-OPTIONS_DEFINE=	AVAHI LIBBLURAY HAL LIRC NONFREE OSS PULSEAUDIO RTMP VAAPI VDPAU WEBSERVER
+OPTIONS_DEFINE=	AVAHI EXTERNAL_FFMPEG LIBBLURAY HAL LIRC NONFREE PULSEAUDIO RTMP VAAPI VDPAU WEBSERVER
+EXTERNAL_FFMPEG_DESC=	Use external ffmpeg
 NONFREE_DESC=		Enable non-free components (rar, ccx, ffmpeg)
 
 OPTIONS_DEFAULT=	AVAHI LIBBLURAY HAL RTMP WEBSERVER
 
 CONFIGURE_ARGS+=	--disable-nfs
 
-.include <bsd.port.options.mk>
+MAN1=	xbmc.bin.1
+MLINKS=	xbmc.bin.1 xbmc.1
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.else
-CONFIGURE_ARGS+=	--disable-debug
-.endif
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
 PLIST_SUB+=	ARCH="x86"
@@ -101,6 +103,21 @@ PLIST_SUB+=	ARCH="x86"
 PLIST_SUB+=	ARCH="x86_64"
 .endif
 
+.if ${OSVERSION} <= 800096
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+USE_SDL+=	mixer
+CONFIGURE_ARGS+=	--disable-oss
+.else
+CONFIGURE_ARGS+=	--disable-alsa
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
+
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-avahi
 LIB_DEPENDS+=	avahi-common:${PORTSDIR}/net/avahi-app
@@ -108,6 +125,18 @@ LIB_DEPENDS+=	avahi-common:${PORTSDIR}/net/avahi-app
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
+.if ${PORT_OPTIONS:MEXTERNAL_FFMPEG}
+CONFIGURE_ARGS+=	--enable-external-ffmpeg
+FFMPEG_SUFFIX=	1
+CONFIGURE_ENV+=	FFMPEG_SUFFIX="${FFMPEG_SUFFIX}"
+PLIST_SUB+=	EXTERNAL_FFMPEG="@comment "
+BUILD_DEPENDS+=	ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
+RUN_DEPENDS+=	ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
+.else
+CONFIGURE_ARGS+=	--disable-external-ffmpeg
+PLIST_SUB+=	EXTERNAL_FFMPEG=""
+.endif
+
 .if ${PORT_OPTIONS:MLIBBLURAY}
 CONFIGURE_ARGS+=	--enable-libbluray
 LIB_DEPENDS+=	bluray:${PORTSDIR}/multimedia/libbluray
@@ -134,17 +163,6 @@ NO_PACKAGE=	${NO_CDROM}
 CONFIGURE_ARGS+=	--disable-non-free
 .endif
 
-.if ${PORT_OPTIONS:MOSS}
-.if ${OSVERSION} <= 800096
-IGNORE=	requires sound rewrite from 8.0-RELEASE or later
-.endif
-CONFIGURE_ARGS+=	--disable-alsa
-.else
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-USE_SDL+=	mixer
-.endif
-
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 CONFIGURE_ARGS+=	--enable-pulse
 LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
@@ -180,22 +198,19 @@ LIB_DEPENDS+=	microhttpd:${PORTSDIR}/www/libmicrohttpd
 CONFIGURE_ARGS+=	--disable-webserver
 .endif
 
-.if ${CC} == "clang" || ${CXX} == "clang++"
-CONFIGURE_ARGS+=	--disable-rsxs
-PLIST_SUB+=	RSXS="@comment "
-.else
-PLIST_SUB+=	RSXS=""
-.endif
-
 post-patch:
-.if ${PORT_OPTIONS:MOSS}
-	@(cd ${WRKSRC}; \
-	${BZCAT} ${FILESDIR}/extra-patch-oss.bz2 | ${PATCH} ${PATCH_DIST_ARGS})
-	@${RM} ${WRKSRC}/language/English/strings.xml.orig
-	@${RM} ${WRKSRC}/addons/skin.confluence/sounds/sounds.xml.orig
-.endif
-
-pre-configure:
-	cd ${WRKSRC} && ./bootstrap
+	${REINPLACE_CMD} 's;"event\.h";"sidplay/event.h";' \
+		${WRKSRC}/lib/libsidplay2/libsidplay/src/event.cpp \
+		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6510/mos6510.h \
+		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6526/mos6526.h \
+		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
+	${REINPLACE_CMD} 's;make;gmake;' ${WRKSRC}/bootstrap
+	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk
+
+run-autotools:
+	@cd ${WRKSRC} && ${SH} ./bootstrap
+
+post-install:
+	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/xbmc.bin.1 ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/multimedia/xbmc/distinfo b/multimedia/xbmc/distinfo
index 0cf806c883c2..693a971d40c2 100644
--- a/multimedia/xbmc/distinfo
+++ b/multimedia/xbmc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xbmc-11.0.tar.gz) = 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19
-SIZE (xbmc-11.0.tar.gz) = 63012044
+SHA256 (xbmc-12.0.rc1.tar.gz) = ae3a73812a854f778c17f92a68d33fcf874c36e4ad38c6e1f7eee7b99e27987a
+SIZE (xbmc-12.0.rc1.tar.gz) = 63663018
diff --git a/multimedia/xbmc/files/patch-Makefile.in b/multimedia/xbmc/files/patch-Makefile.in
deleted file mode 100644
index 1b18baf73dd8..000000000000
--- a/multimedia/xbmc/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./Makefile.in.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./Makefile.in	2012-01-02 10:14:38.000000000 +0100
-@@ -286,9 +286,11 @@
-   endif
- endif
- 	$(MAKE) -C lib/stsound/StSoundLibrary	
-+ifneq ($(findstring freebsd,@ARCH@), freebsd)
- ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@)),)
- 	$(MAKE) -C lib/snesapu/SNES/SNESAPU
- endif
-+endif
- imagelib: dllloader
- 	$(MAKE) -C lib/cximage-6.0
- 
diff --git a/multimedia/xbmc/files/patch-clang b/multimedia/xbmc/files/patch-clang
new file mode 100644
index 000000000000..88eda0557eb1
--- /dev/null
+++ b/multimedia/xbmc/files/patch-clang
@@ -0,0 +1,131 @@
+diff --git xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
+index e045a72..ff4f575 100644
+--- xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
++++ xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h
+@@ -198,8 +198,12 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+ #endif
+ 
+ #ifndef ARGP_FS_EI
++#ifdef __clang__
++#define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
++#else
+ #define ARGP_FS_EI extern inline
+ #endif
++#endif
+ 
+ ARGP_FS_EI size_t
+ __argp_fmtstream_write (argp_fmtstream_t __fs,
+
+diff --git lib/cpluff/libcpluff/cpluff.c lib/cpluff/libcpluff/cpluff.c
+index a7e8725..0f5bb90 100644
+--- lib/cpluff/libcpluff/cpluff.c
++++ lib/cpluff/libcpluff/cpluff.c
+@@ -77,6 +77,7 @@ CP_C_API const char *cp_get_host_type(void) {
+ 	return CP_HOST;
+ }
+ 
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ CP_HIDDEN void cpi_lock_framework(void) {
+ #if defined(CP_THREADS)
+ 	cpi_lock_mutex(framework_mutex);
+@@ -93,6 +94,7 @@ CP_HIDDEN void cpi_unlock_framework(void) {
+ 	framework_locked--;
+ #endif
+ }
++#endif
+ 
+ static void reset(void) {
+ #ifdef CP_THREADS
+diff --git lib/cpluff/libcpluff/logging.c lib/cpluff/libcpluff/logging.c
+index 928f0b4..f0f873d 100644
+--- lib/cpluff/libcpluff/logging.c
++++ lib/cpluff/libcpluff/logging.c
+@@ -129,10 +129,12 @@ CP_C_API cp_status_t cp_register_logger(cp_context_t *context, cp_logger_func_t
+ 	// Report error
+ 	if (status == CP_ERR_RESOURCE) {
+ 		cpi_error(context, N_("Logger could not be registered due to insufficient memory."));		
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ 	} else if (cpi_is_logged(context, CP_LOG_DEBUG)) {
+ 		char owner[64];
+ 		/* TRANSLATORS: %s is the context owner */
+ 		cpi_debugf(context, N_("%s registered a logger."), cpi_context_owner(context, owner, sizeof(owner)));
++#endif
+ 	}
+ 	cpi_unlock_context(context);
+ 
+@@ -166,11 +168,13 @@ CP_C_API void cp_unregister_logger(cp_context_t *context, cp_logger_func_t logge
+ 		free(lh);
+ 		update_logging_limits(context);
+ 	}
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ 	if (cpi_is_logged(context, CP_LOG_DEBUG)) {
+ 		char owner[64];
+ 		/* TRANSLATORS: %s is the context owner */
+ 		cpi_debugf(context, N_("%s unregistered a logger."), cpi_context_owner(context, owner, sizeof(owner)));
+ 	}
++#endif
+ 	cpi_unlock_context(context);
+ }
+ 
+diff --git lib/cpluff/libcpluff/pinfo.c lib/cpluff/libcpluff/pinfo.c
+index cfbf049..f7b4a4b 100644
+--- lib/cpluff/libcpluff/pinfo.c
++++ lib/cpluff/libcpluff/pinfo.c
+@@ -569,10 +569,12 @@ CP_C_API cp_status_t cp_register_plistener(cp_context_t *context, cp_plugin_list
+ 	// Report error or success
+ 	if (status != CP_OK) {
+ 		cpi_error(context, _("A plug-in listener could not be registered due to insufficient memory."));
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ 	} else if (cpi_is_logged(context, CP_LOG_DEBUG)) {
+ 		char owner[64];
+ 		/* TRANSLATORS: %s is the context owner */
+ 		cpi_debugf(context, N_("%s registered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner)));
++#endif
+ 	}
+ 	cpi_unlock_context(context);
+ 	
+@@ -591,10 +593,12 @@ CP_C_API void cp_unregister_plistener(cp_context_t *context, cp_plugin_listener_
+ 	if (node != NULL) {
+ 		process_unregister_plistener(context->env->plugin_listeners, node, NULL);
+ 	}
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ 	if (cpi_is_logged(context, CP_LOG_DEBUG)) {
+ 		char owner[64];
+ 		/* TRANSLATORS: %s is the context owner */
+ 		cpi_debugf(context, N_("%s unregistered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner)));
+ 	}
++#endif
+ 	cpi_unlock_context(context);
+ }
+diff --git lib/cpluff/libcpluff/psymbol.c lib/cpluff/libcpluff/psymbol.c
+index 632b087..fdc15af 100644
+--- lib/cpluff/libcpluff/psymbol.c
++++ lib/cpluff/libcpluff/psymbol.c
+@@ -248,11 +248,13 @@ CP_C_API void * cp_resolve_symbol(cp_context_t *context, const char *id, const c
+ 		symbol_info->usage_count++;
+ 		provider_info->usage_count++;
+ 
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ 		if (cpi_is_logged(context, CP_LOG_DEBUG)) {
+ 			char owner[64];
+ 			/* TRANSLATORS: First %s is the context owner */
+ 			cpi_debugf(context, "%s resolved symbol %s defined by plug-in %s.", cpi_context_owner(context, owner, sizeof(owner)), name, id);
+ 		}
++#endif
+ 	} while (0);
+ 
+ 	// Clean up
+@@ -314,11 +316,13 @@ CP_C_API void cp_release_symbol(cp_context_t *context, const void *ptr) {
+ 		if (symbol_info->usage_count == 0) {
+ 			hash_delete_free(context->resolved_symbols, node);
+ 			free(symbol_info);
++#if defined(CP_THREADS) || !defined(NDEBUG)
+ 			if (cpi_is_logged(context, CP_LOG_DEBUG)) {
+ 				char owner[64];
+ 				/* TRANSLATORS: First %s is the context owner */
+ 				cpi_debugf(context, _("%s released the symbol at address %p defined by plug-in %s."), cpi_context_owner(context, owner, sizeof(owner)), ptr, provider_info->plugin->plugin->identifier);
+ 			}
++#endif
+ 		}
+ 	
+ 		// Check if the symbol providing plug-in is not being used anymore
diff --git a/multimedia/xbmc/files/patch-configure.in b/multimedia/xbmc/files/patch-configure.in
index 6249fdffba2b..ac2a17462cf5 100644
--- a/multimedia/xbmc/files/patch-configure.in
+++ b/multimedia/xbmc/files/patch-configure.in
@@ -1,54 +1,6 @@
---- configure.in.orig	2011-12-23 04:12:21.000000000 +0100
-+++ configure.in	2012-01-03 16:44:09.000000000 +0100
-@@ -18,7 +18,13 @@
- # check for library basenames
- AC_DEFUN([XB_FIND_SONAME],
- [
--  if [[ "$host_vendor" != "apple" ]]; then
-+  if echo "$host" | grep -q freebsd ; then
-+    AC_MSG_CHECKING([for lib$2 soname])
-+    $1_SONAME=[`ldconfig -r | sed -n "s;.* \(/.*lib$2\.so.*\)$;\1;p" | head -n 1`]
-+    if test x$$1_SONAME != x ; then
-+      $1_SONAME=[`basename $$1_SONAME`]
-+    fi
-+  elif [[ "$host_vendor" != "apple" ]]; then
-     AC_MSG_CHECKING([for lib$2 soname])
-     $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-     if [[ ! -z $$1_FILENAME ]]; then
-@@ -453,6 +459,18 @@
-      ARCH="x86_64-linux"
-      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-      ;;
-+  i386-*-freebsd*)
-+     ARCH="x86-freebsd"
-+     MAKE="gmake"
-+     use_external_ffmpeg="yes"
-+     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+     ;;
-+  amd64-*-freebsd*)
-+     ARCH="x86_64-freebsd"
-+     MAKE="gmake"
-+     use_external_ffmpeg="yes"
-+     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+     ;;
-   arm-apple-darwin*)
-      use_joystick=no
-      use_neon=yes
-@@ -551,6 +569,13 @@
- 
- 
- # 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"
-+  LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
-+fi
- if test "$host_vendor" = "apple" ; then
-   # standard xbmc paths
-   INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/xbmc/osx"
-@@ -635,6 +660,7 @@
+--- configure.in.orig	2012-10-01 01:08:50.000000000 +0200
++++ configure.in	2012-10-03 12:17:13.000000000 +0200
+@@ -816,6 +816,7 @@
  
  # Check inotify availability
  AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
@@ -56,68 +8,42 @@
  
  # Checks for boost headers using CXX instead of CC
  AC_LANG_PUSH([C++])
-@@ -713,7 +738,11 @@
- AC_CHECK_LIB([bz2],         [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([jpeg],        [main],, AC_MSG_ERROR($missing_library)) # check for cximage
- AC_CHECK_LIB([tiff],        [main],, AC_MSG_ERROR($missing_library))
-+if echo "$ARCH" | grep -q freebsd; then
-+AC_CHECK_LIB([pthread],     [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library))
-+else
- AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
-+fi
- AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
-@@ -809,8 +838,10 @@
-     AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"])
-   fi
- else
-+  if echo "$ARCH" | grep -vq freebsd; then
-   AC_CHECK_LIB([dl],         [main],, AC_MSG_ERROR($missing_library))
-   AC_CHECK_LIB([resolv],     [main],, AC_MSG_ERROR($missing_library))
-+  fi
-   AC_CHECK_LIB([jasper],     [main],, AC_MSG_ERROR($missing_library)) # check for cximage
-   AC_CHECK_LIB([rt],         [clock_gettime],, AC_MSG_ERROR($missing_library))
- 
-@@ -1143,7 +1174,11 @@
-     use_libusb="no"
-     AC_MSG_NOTICE($libusb_disabled)
-   else
--    if test "$use_libusb" = "auto"; then
-+    if echo "$ARCH" | grep -q freebsd ; then
-+      AC_CHECK_LIB([usb],[main],
-+        [use_libusb="yes";USB_LIBS="-lusb"],
-+        [use_libusb="no";AC_MSG_RESULT($libusb_not_found)])
-+    elif test "$use_libusb" = "auto"; then
-       PKG_CHECK_MODULES([USB],[libusb],,[use_libusb="no";AC_MSG_RESULT($libusb_not_found)])
-     elif test "$use_libusb" = "yes"; then
-       PKG_CHECK_MODULES([USB],[libusb],,[use_libusb="no";AC_MSG_ERROR($libusb_not_found)])
-@@ -2157,7 +2192,8 @@
- 
- XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
-   set -x
--  rm -f CMakeCache.txt && CC="$ORIGCC" CXX="$ORIGCXX" cmake    \
-+  rm -f CMakeCache.txt &&                              \
-+  CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \
-     -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF        \
-     -DCMAKE_C_FLAGS:STRING="${CPPFLAGS} ${CFLAGS}"     \
-     -DCMAKE_CXX_FLAGS:STRING="${CPPFLAGS} ${CXXFLAGS}" \
-@@ -2210,6 +2246,9 @@
-     --disable-hyperspace \
-     --disable-lattice \
-     --disable-skyrocket
-+  if echo "$ARCH" | grep -q freebsd ; then
-+    sed -i.back "s;\(STDBOOL_H = \)stdbool.h;\1;" lib/Makefile
-+  fi
- ], [$DISABLE_RSXS])
- 
- XB_CONFIG_MODULE([lib/libapetag], [
-@@ -2226,7 +2265,7 @@
-     --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
-     --host=$host_alias \
-     --build=$build_alias \
--    --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX"
-+    --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" LDFLAGS="$LDFLAGS"
-     #LDFLAGS="$LDFLAGS -Wl,-read_only_relocs,suppress"    
- ], [0])
- 
+@@ -1491,15 +1492,15 @@
+ 
+ # External FFmpeg
+ if test "$use_external_ffmpeg" = "yes"; then
+-  FFMPEG_LIBNAMES="libavcodec libavfilter libavformat libavutil libpostproc libswscale"
++  FFMPEG_LIBNAMES="libavcodec$FFMPEG_SUFFIX libavfilter$FFMPEG_SUFFIX libavformat$FFMPEG_SUFFIX libavutil$FFMPEG_SUFFIX libpostproc$FFMPEG_SUFFIX libswscale$FFMPEG_SUFFIX"
+ 
+   # libavcore is optional
+-  PKG_CHECK_EXISTS([libavcore], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavcore")
++  PKG_CHECK_EXISTS([libavcore$FFMPEG_SUFFIX], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavcore$FFMPEG_SUFFIX")
+ 
+   # one of libswresample or libavresample is needed
+-  PKG_CHECK_EXISTS([libswresample], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libswresample",
+-                   [PKG_CHECK_EXISTS([libavresample],
+-                                     FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavresample",
++  PKG_CHECK_EXISTS([libswresample$FFMPEG_SUFFIX], FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libswresample$FFMPEG_SUFFIX",
++                   [PKG_CHECK_EXISTS([libavresample$FFMPEG_SUFFIX],
++                                     FFMPEG_LIBNAMES="$FFMPEG_LIBNAMES libavresample$FFMPEG_SUFFIX",
+                                      AC_MSG_ERROR([You need either libswresample
+                                                    or libavresample.]))])
+ 
+@@ -1509,7 +1510,7 @@
+ 
+   # Determine whether AVPacket and relevant functions are defined in libavformat
+   # or libavcodec
+-  AC_CHECK_LIB([avcodec], [av_free_packet],
++  AC_CHECK_LIB(["avcodec$FFMPEG_SUFFIX"], [av_free_packet],
+   [AC_MSG_NOTICE(== AVPacket and relevant functions defined in libavcodec. ==)],
+   [AC_MSG_NOTICE(== AVPacket and relevant functions defined in libavformat. ==)
+    AC_DEFINE([AVPACKET_IN_AVFORMAT], [1], [Whether AVPacket is in libavformat.])])
+@@ -1558,7 +1559,7 @@
+   AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
+ 
+   # Disable vdpau support if external libavcodec doesn't have it
+-  AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
++  AC_CHECK_LIB(["avcodec$FFMPEG_SUFFIX"], [ff_vdpau_vc1_decode_picture],,
+     [if test "x$use_vdpau" = "xyes"; then
+       AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
+     else
diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c
deleted file mode 100644
index 88c4dcc8d617..000000000000
--- a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./lib/cpluff/libcpluff/cpluff.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/cpluff.c	2012-01-02 10:14:38.000000000 +0100
-@@ -77,6 +77,7 @@
- 	return CP_HOST;
- }
- 
-+#if defined(CP_THREADS) || !defined(NDEBUG)
- CP_HIDDEN void cpi_lock_framework(void) {
- #if defined(CP_THREADS)
- 	cpi_lock_mutex(framework_mutex);
-@@ -93,6 +94,7 @@
- 	framework_locked--;
- #endif
- }
-+#endif
- 
- static void reset(void) {
- #ifdef CP_THREADS
diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c
deleted file mode 100644
index 86fa1c9d3f7f..000000000000
--- a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./lib/cpluff/libcpluff/logging.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/logging.c	2012-01-02 10:14:38.000000000 +0100
-@@ -130,9 +130,11 @@
- 	if (status == CP_ERR_RESOURCE) {
- 		cpi_error(context, N_("Logger could not be registered due to insufficient memory."));		
- 	} else if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s registered a logger."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- 
-@@ -167,9 +169,11 @@
- 		update_logging_limits(context);
- 	}
- 	if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s unregistered a logger."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- }
diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c
deleted file mode 100644
index c72f8476e86b..000000000000
--- a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./lib/cpluff/libcpluff/pinfo.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/pinfo.c	2012-01-02 10:14:38.000000000 +0100
-@@ -570,9 +570,11 @@
- 	if (status != CP_OK) {
- 		cpi_error(context, _("A plug-in listener could not be registered due to insufficient memory."));
- 	} else if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s registered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- 	
-@@ -592,9 +594,11 @@
- 		process_unregister_plistener(context->env->plugin_listeners, node, NULL);
- 	}
- 	if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 		char owner[64];
- 		/* TRANSLATORS: %s is the context owner */
- 		cpi_debugf(context, N_("%s unregistered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner)));
-+#endif
- 	}
- 	cpi_unlock_context(context);
- }
diff --git a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c b/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c
deleted file mode 100644
index 7fc56663c11e..000000000000
--- a/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./lib/cpluff/libcpluff/psymbol.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cpluff/libcpluff/psymbol.c	2012-01-02 10:14:38.000000000 +0100
-@@ -249,9 +249,11 @@
- 		provider_info->usage_count++;
- 
- 		if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 			char owner[64];
- 			/* TRANSLATORS: First %s is the context owner */
- 			cpi_debugf(context, "%s resolved symbol %s defined by plug-in %s.", cpi_context_owner(context, owner, sizeof(owner)), name, id);
-+#endif
- 		}
- 	} while (0);
- 
-@@ -315,9 +317,11 @@
- 			hash_delete_free(context->resolved_symbols, node);
- 			free(symbol_info);
- 			if (cpi_is_logged(context, CP_LOG_DEBUG)) {
-+#ifndef __clang__
- 				char owner[64];
- 				/* TRANSLATORS: First %s is the context owner */
- 				cpi_debugf(context, _("%s released the symbol at address %p defined by plug-in %s."), cpi_context_owner(context, owner, sizeof(owner)), ptr, provider_info->plugin->plugin->identifier);
-+#endif
- 			}
- 		}
- 	
diff --git a/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c b/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c
deleted file mode 100644
index 308d149e2816..000000000000
--- a/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./lib/cximage-6.0/raw/dcr.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/cximage-6.0/raw/dcr.c	2012-01-02 10:14:38.000000000 +0100
-@@ -144,7 +144,9 @@
- 
- 		//!!! set return point for error handling
- 		if (setjmp (dcr.failure)) {
-+#if !defined(__FreeBSD__)
- 			if (fileno(dcr.obj_) > 2) (*dcr.ops_->close_)(dcr.obj_);
-+#endif
- 			if (fileno(ofp) > 2) fclose(ofp);
- 			status = 1;
- 			goto cleanup;
diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp
deleted file mode 100644
index 3398f130fea4..000000000000
--- a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/libsidplay2/libsidplay/src/event.cpp.orig	2012-01-02 11:40:56.000000000 +0100
-+++ ./lib/libsidplay2/libsidplay/src/event.cpp	2012-01-02 11:40:57.000000000 +0100
-@@ -50,7 +50,7 @@
-  ***************************************************************************/
- 
- #include <string.h>
--#include "event.h"
-+#include "sidplay/event.h"
- 
- #define EVENT_TIMEWARP_COUNT 0x0FFFFF
- 
diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h
deleted file mode 100644
index 98964fdd831f..000000000000
--- a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/libsidplay2/libsidplay/src/mos6510/mos6510.h.orig	2012-01-02 11:44:06.000000000 +0100
-+++ ./lib/libsidplay2/libsidplay/src/mos6510/mos6510.h	2012-01-02 11:44:18.000000000 +0100
-@@ -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 a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h
deleted file mode 100644
index 1d1e604851da..000000000000
--- a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/libsidplay2/libsidplay/src/mos6526/mos6526.h.orig	2012-01-02 11:46:36.000000000 +0100
-+++ ./lib/libsidplay2/libsidplay/src/mos6526/mos6526.h	2012-01-02 11:46:47.000000000 +0100
-@@ -85,7 +85,7 @@
- #define _mos6526_h_
- 
- #include "component.h"
--#include "event.h"
-+#include "sidplay/event.h"
- 
- class MOS6526: public component
- {
diff --git a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h b/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h
deleted file mode 100644
index e77818119b6e..000000000000
--- a/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/libsidplay2/libsidplay/src/mos656x/mos656x.h.orig	2012-01-02 11:41:49.000000000 +0100
-+++ ./lib/libsidplay2/libsidplay/src/mos656x/mos656x.h	2012-01-02 11:42:18.000000000 +0100
-@@ -19,7 +19,7 @@
- #define _mos656x_h_
- 
- #include "component.h"
--#include "event.h"
-+#include "sidplay/event.h"
- 
- typedef enum
- {
diff --git a/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h b/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h
deleted file mode 100644
index bdaebf859f70..000000000000
--- a/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./lib/timidity/interface/w32g.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/timidity/interface/w32g.h	2012-01-02 10:14:38.000000000 +0100
-@@ -64,6 +64,9 @@
- #elif defined(_BORLANDC_)
- #define crt_beginthread(start_address,stack_size,arglist) \
- (HANDLE)_beginthread((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist)
-+#elif defined(__FreeBSD__)
-+#define crt_beginthread(start_address,stack_size,arglist) \
-+(HANDLE)CreateThread(NULL,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,0,NULL)
- #else
- #define crt_beginthread(start_address,stack_size,arglist) \
- (HANDLE)CreateThread(NULL,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,0,&dwTmp)
-@@ -76,6 +79,9 @@
- #elif defined(_BORLANDC_)
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id)
-+#elif defined(__FreeBSD__)
-+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
-+(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPLONG)thrdaddr)
- #else
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr)
diff --git a/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c b/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c
deleted file mode 100644
index 20bfc676de86..000000000000
--- a/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./lib/timidity/timidity/gogo_a.c.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./lib/timidity/timidity/gogo_a.c	2012-01-02 10:14:38.000000000 +0100
-@@ -108,6 +108,9 @@
- #elif defined(_BORLANDC_)
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)_beginthreadNT((BCC_BEGINTHREAD_START_ADDRESS)start_address,(unsigned)stack_size,(void *)arglist,(void *)security_attrib,(unsigned long)create_flags,(unsigned long *)thread_id)
-+#elif defined(__FreeBSD__)
-+#define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
-+(HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPLONG)thrdaddr)
- #else
- #define crt_beginthreadex(security,stack_size,start_address,arglist,initflag,thrdaddr ) \
- (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES)security,(DWORD)stack_size,(LPTHREAD_START_ROUTINE)start_address,(LPVOID)arglist,(DWORD)initflag,(LPDWORD)thrdaddr)
diff --git a/multimedia/xbmc/files/patch-m4__ax_python_devel.m4 b/multimedia/xbmc/files/patch-m4__ax_python_devel.m4
deleted file mode 100644
index b158173ee993..000000000000
--- a/multimedia/xbmc/files/patch-m4__ax_python_devel.m4
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./m4/ax_python_devel.m4.orig	2012-01-02 17:23:11.000000000 +0100
-+++ ./m4/ax_python_devel.m4	2012-01-02 17:23:13.000000000 +0100
-@@ -178,7 +178,8 @@
- 	if (e != None):
- 		ret += e
- print (ret)
--EOD`
-+EOD
-+`
- 
- 		if test -z "$ac_python_version"; then
- 			if test -n "$PYTHON_VERSION"; then
-@@ -202,7 +203,8 @@
- 	if e != None:
- 		print (e)
- 		break
--EOD`
-+EOD
-+`
- 
- 		# Before checking for libpythonX.Y, we need to know
- 		# the extension the OS we're on uses for libraries
diff --git a/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp b/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp
deleted file mode 100644
index 1e0b868b8fd4..000000000000
--- a/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./tools/TexturePacker/XBTFWriter.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./tools/TexturePacker/XBTFWriter.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -24,7 +24,9 @@
- #include <inttypes.h>
- #include "guilib/XBTF.h"
- #include "utils/EndianSwap.h"
--#if !defined(__APPLE__) && !defined(__FreeBSD__)
-+#if defined(__FreeBSD__)
-+#include <stdlib.h>
-+#elif !defined(__APPLE__)
- #include <malloc.h>
- #endif
- #include <memory.h>
diff --git a/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp b/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp
deleted file mode 100644
index 83aff567d65c..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./xbmc/addons/Addon.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/addons/Addon.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -28,6 +28,9 @@
- #ifdef __APPLE__
- #include "../osx/OSXGNUReplacements.h"
- #endif
-+#ifdef __FreeBSD__
-+#include "FreeBSDGNUReplacements.h"
-+#endif
- #include "utils/log.h"
- #include "utils/URIUtils.h"
- #include <vector>
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp b/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp
new file mode 100644
index 000000000000..b44f37d871d3
--- /dev/null
+++ b/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp
@@ -0,0 +1,13 @@
+diff --git xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+index bd01a67..49edfee 100644
+--- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
++++ xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+@@ -303,7 +303,7 @@ void CSoftAE::InternalOpenSink()
+ 
+     /* perform basic sanity checks on the format returned by the sink */
+     ASSERT(newFormat.m_channelLayout.Count() > 0);
+-    ASSERT(newFormat.m_dataFormat           <= AE_FMT_FLOAT);
++    ASSERT(newFormat.m_dataFormat           <= AE_FMT_MAX);
+     ASSERT(newFormat.m_frames                > 0);
+     ASSERT(newFormat.m_frameSamples          > 0);
+     ASSERT(newFormat.m_frameSize            == (CAEUtil::DataFormatToBits(newFormat.m_dataFormat) >> 3) * newFormat.m_channelLayout.Count());
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp
deleted file mode 100644
index 92e975b3ddc5..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
---- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -27,21 +27,23 @@
- #include <direct.h>
- #include <process.h>
- #else
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <mntent.h>
- #endif
- #endif
- #include <sys/stat.h>
- #include <sys/types.h>
-+#if !defined(__FreeBSD__)
- #include <sys/timeb.h>
-+#endif
- #include "system.h" // for HAS_DVD_DRIVE
- #ifdef HAS_DVD_DRIVE
-   #ifdef _LINUX
-     #include <sys/ioctl.h>
--    #ifndef __APPLE__
--      #include <linux/cdrom.h>
--    #else
-+    #ifdef __APPLE__
-       #include <IOKit/storage/IODVDMediaBSDClient.h>
-+    #elif !defined(__FreeBSD__)
-+      #include <linux/cdrom.h>
-     #endif
-   #endif
- #endif
-@@ -1159,7 +1161,7 @@
-   FILE* dll_fopen(const char* filename, const char* mode)
-   {
-     FILE* file = NULL;
--#if defined(_LINUX) && !defined(__APPLE__)
-+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
-     if (strcmp(filename, MOUNTED) == 0
-     ||  strcmp(filename, MNTTAB) == 0)
-     {
-@@ -1267,7 +1269,7 @@
-     {
-       // it might be something else than a file, or the file is not emulated
-       // let the operating system handle it
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-       return fseek(stream, offset, origin);
- #else
-       return fseeko64(stream, offset, origin);
-@@ -1332,7 +1334,7 @@
-     {
-       // it might be something else than a file, or the file is not emulated
-       // let the operating system handle it
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-       return ftello(stream);
- #else
-       return ftello64(stream);
-@@ -1378,7 +1380,7 @@
-       CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking");      //warning
- #ifndef _LINUX
-       return (__int64)tell(fd);
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
-       return lseek(fd, 0, SEEK_CUR);
- #else
-       return lseek64(fd, 0, SEEK_CUR);
-@@ -1555,7 +1557,7 @@
-     int ret;
- 
-     ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-     *pos = (fpos_t)tmpPos;
- #else
-     pos->__pos = (off_t)tmpPos.__pos;
-@@ -1568,7 +1570,7 @@
-     CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
-     if (pFile != NULL)
-     {
--#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       *pos = pFile->GetPosition();
- #else
-       pos->__pos = pFile->GetPosition();
-@@ -1590,7 +1592,7 @@
-     int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
-     if (fd >= 0)
-     {
--#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
- #else
-       if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
-@@ -1607,7 +1609,7 @@
-     {
-       // it might be something else than a file, or the file is not emulated
-       // let the operating system handle it
--#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       return fsetpos(stream, pos);
- #else
-       return fsetpos64(stream, pos);
-@@ -1623,7 +1625,7 @@
-     if (fd >= 0)
-     {
-       fpos64_t tmpPos;
--#if !defined(_LINUX) || defined(__APPLE__)
-+#if !defined(_LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
-       tmpPos= *pos;
- #else
-       tmpPos.__pos = (off64_t)(pos->__pos);
-@@ -2082,7 +2084,7 @@
-      if (!pFile)
-        return -1;
- 
--#ifdef HAS_DVD_DRIVE
-+#if defined(HAS_DVD_DRIVE) && !defined(__FreeBSD__)
- #ifndef __APPLE__
-     if(request == DVD_READ_STRUCT || request == DVD_AUTH)
- #else
-@@ -2125,7 +2127,7 @@
-       CLog::Log(LOGERROR, "%s - getmntent is not implemented for our virtual filesystem", __FUNCTION__);
-       return NULL;
-     }
--#if defined(_LINUX) && !defined(__APPLE__)
-+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
-     return getmntent(fp);
- #else
-     CLog::Log(LOGWARNING, "%s - unimplemented function called", __FUNCTION__);
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h b/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h
deleted file mode 100644
index 66ba89af45b7..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h	2012-01-02 10:14:38.000000000 +0100
-@@ -132,7 +132,11 @@
-   uintptr_t dll_beginthread(void( *start_address )( void * ),unsigned stack_size,void *arglist);
-   HANDLE dll_beginthreadex(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
-                            LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags,
-+#ifdef __FreeBSD__
-+                           LPLONG lpThreadId);
-+#else
-                            LPDWORD lpThreadId);
-+#endif
-   int dll_stati64(const char *path, struct _stati64 *buffer);
-   int dll_stat64(const char *path, struct __stat64 *buffer);
- #ifdef _WIN32
diff --git a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp b/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp
deleted file mode 100644
index 3f44759da068..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -91,12 +91,20 @@
- 
- CCriticalSection DllAvCodec::m_critSection;
- static CCriticalSection m_logSection;
-+#ifdef __FreeBSD__
-+std::map<uint64_t, CStdString> g_logbuffer;
-+#else
- std::map<uintptr_t, CStdString> g_logbuffer;
-+#endif
- 
- void ff_avutil_log(void* ptr, int level, const char* format, va_list va)
- {
-   CSingleLock lock(m_logSection);
-+#ifdef __FreeBSD__
-+  uint64_t threadId = (uint64_t)CThread::GetCurrentThreadId();
-+#else
-   uintptr_t threadId = (uintptr_t)CThread::GetCurrentThreadId();
-+#endif
-   CStdString &buffer = g_logbuffer[threadId];
- 
-   AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
-@@ -145,7 +153,11 @@
-   /* Loop through the logbuffer list and remove any blank buffers
-      If the thread using the buffer is still active, it will just
-      add a new buffer next time it writes to the log */
-+#ifdef __FreeBSD__
-+  std::map<uint64_t, CStdString>::iterator it;
-+#else
-   std::map<uintptr_t, CStdString>::iterator it;
-+#endif
-   for (it = g_logbuffer.begin(); it != g_logbuffer.end(); )
-     if ((*it).second.IsEmpty())
-       g_logbuffer.erase(it++);
diff --git a/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp b/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp
deleted file mode 100644
index bdc0c83ca0cd..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./xbmc/filesystem/SAPDirectory.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/filesystem/SAPDirectory.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -31,6 +31,9 @@
- #ifdef __APPLE__
- #include "OSXGNUReplacements.h" // strnlen
- #endif
-+#ifdef __FreeBSD__
-+#include "FreeBSDGNUReplacements.h"
-+#endif
- 
- #include <sys/socket.h>
- #include <netinet/in.h>
diff --git a/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp b/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp
deleted file mode 100644
index bdab987b5d80..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xbmc/interfaces/python/XBPython.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/interfaces/python/XBPython.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -428,7 +428,7 @@
- #if !(defined(__APPLE__) || defined(_WIN32))
-     DllLoaderContainer::UnloadPythonDlls();
- #endif
--#if defined(_LINUX) && !defined(__APPLE__)
-+#if defined(_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
-     // we can't release it on windows, as this is done in UnloadPythonDlls() for win32 (see above).
-     // The implementation for linux needs looking at - UnloadPythonDlls() currently only searches for "python24.dll"
-     // The implementation for osx can never unload the python dylib.
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c b/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c
deleted file mode 100644
index 7140ba5485bf..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c
+++ /dev/null
@@ -1,255 +0,0 @@
---- ./xbmc/linux/FreeBSDGNUReplacements.c.orig	2012-01-02 10:14:38.000000000 +0100
-+++ ./xbmc/linux/FreeBSDGNUReplacements.c	2012-01-02 10:14:38.000000000 +0100
-@@ -0,0 +1,252 @@
-+
-+#include "FreeBSDGNUReplacements.h"
-+
-+#if __FreeBSD_version < 800067
-+
-+/*-
-+ * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+size_t
-+strnlen(const char *s, size_t maxlen)
-+{
-+	size_t len;
-+
-+	for (len = 0; len < maxlen; len++, s++) {
-+		if (!*s)
-+			break;
-+	}   
-+	return (len);
-+}
-+
-+/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <errno.h>
-+
-+/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
-+   (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
-+   NULL), pointing to *N characters of space.  It is realloc'd as
-+   necessary.  Returns the number of characters read (not including the
-+   null terminator), or -1 on error or EOF.  */
-+
-+ssize_t
-+getdelim(char **lineptr, size_t *n, int terminator, FILE *stream)
-+{
-+  char *line, *p;
-+  size_t size, copy;
-+
-+  if (stream == NULL || lineptr == NULL || n == NULL)
-+    {
-+      errno = EINVAL;
-+      return -1;
-+    }
-+
-+  if (ferror (stream))
-+    return -1;
-+
-+  /* Make sure we have a line buffer to start with.  */
-+  if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars.  */
-+    {
-+#ifndef	MAX_CANON
-+#define	MAX_CANON	256
-+#endif
-+      line = (char *)realloc (*lineptr, MAX_CANON);
-+      if (line == NULL)
-+	return -1;
-+      *lineptr = line;
-+      *n = MAX_CANON;
-+    }
-+
-+  line = *lineptr;
-+  size = *n;
-+
-+  copy = size;
-+  p = line;
-+
-+      while (1)
-+	{
-+	  size_t len;
-+
-+	  while (--copy > 0)
-+	    {
-+	      register int c = getc (stream);
-+	      if (c == EOF)
-+		goto lose;
-+	      else if ((*p++ = c) == terminator)
-+		goto win;
-+	    }
-+
-+	  /* Need to enlarge the line buffer.  */
-+	  len = p - line;
-+	  size *= 2;
-+	  line = (char *)realloc (line, size);
-+	  if (line == NULL)
-+	    goto lose;
-+	  *lineptr = line;
-+	  *n = size;
-+	  p = line + len;
-+	  copy = size - len;
-+	}
-+
-+ lose:
-+  if (p == *lineptr)
-+    return -1;
-+  /* Return a partial line since we got an error in the middle.  */
-+ win:
-+  *p = '\0';
-+  return p - *lineptr;
-+}
-+
-+#endif
-+
-+/* Compare strings while treating digits characters numerically.
-+   Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
-+   This file is part of the libiberty library.
-+   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
-+
-+   Libiberty is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   Libiberty is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+   02110-1301 USA.  */
-+
-+#include <ctype.h>
-+
-+#define ISASCII(c) isascii(c)
-+#define ISDIGIT(c) (ISASCII (c) && isdigit (c))
-+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
-+           fractional parts, S_Z: idem but with leading Zeroes only */
-+#define  S_N    0x0
-+#define  S_I    0x4
-+#define  S_F    0x8
-+#define  S_Z    0xC
-+
-+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
-+#define  CMP    2
-+#define  LEN    3
-+
-+
-+/* Compare S1 and S2 as strings holding indices/version numbers,
-+   returning less than, equal to or greater than zero if S1 is less than,
-+   equal to or greater than S2 (for more info, see the Glibc texinfo doc).  */
-+
-+int
-+strverscmp (const char *s1, const char *s2)
-+{
-+  const unsigned char *p1 = (const unsigned char *) s1;
-+  const unsigned char *p2 = (const unsigned char *) s2;
-+  unsigned char c1, c2;
-+  int state;
-+  int diff;
-+
-+  /* Symbol(s)    0       [1-9]   others  (padding)
-+     Transition   (10) 0  (01) d  (00) x  (11) -   */
-+  static const unsigned int next_state[] =
-+    {
-+      /* state    x    d    0    - */
-+      /* S_N */  S_N, S_I, S_Z, S_N,
-+      /* S_I */  S_N, S_I, S_I, S_I,
-+      /* S_F */  S_N, S_F, S_F, S_F,
-+      /* S_Z */  S_N, S_F, S_Z, S_Z
-+    };
-+
-+  static const int result_type[] =
-+    {
-+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
-+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
-+
-+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
-+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
-+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
-+                 -1,  CMP, CMP, CMP
-+    };
-+
-+  if (p1 == p2)
-+    return 0;
-+
-+  c1 = *p1++;
-+  c2 = *p2++;
-+  /* Hint: '0' is a digit too.  */
-+  state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0));
-+
-+  while ((diff = c1 - c2) == 0 && c1 != '\0')
-+    {
-+      state = next_state[state];
-+      c1 = *p1++;
-+      c2 = *p2++;
-+      state |= (c1 == '0') + (ISDIGIT (c1) != 0);
-+    }
-+
-+  state = result_type[state << 2 | (((c2 == '0') + (ISDIGIT (c2) != 0)))];
-+
-+  switch (state)
-+    {
-+    case CMP:
-+      return diff;
-+      
-+    case LEN:
-+      while (ISDIGIT (*p1++))
-+	if (!ISDIGIT (*p2++))
-+	  return 1;
-+      
-+      return ISDIGIT (*p2) ? -1 : diff;
-+      
-+    default:
-+      return state;
-+    }
-+}
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h b/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h
deleted file mode 100644
index eacdde63be9f..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./xbmc/linux/FreeBSDGNUReplacements.h.orig	2012-01-02 10:14:38.000000000 +0100
-+++ ./xbmc/linux/FreeBSDGNUReplacements.h	2012-01-02 10:14:38.000000000 +0100
-@@ -0,0 +1,25 @@
-+#ifndef __FREEBSDGNUREPLACEMENTS_H__
-+#define __FREEBSDGNUREPLACEMENTS_H__
-+
-+#include <sys/param.h>
-+#include <string.h>
-+#include <stdio.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+#if __FreeBSD_version < 800067
-+
-+size_t strnlen(const char *s, size_t n);
-+ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *stream);
-+
-+#endif
-+
-+int strverscmp(const char *s1, const char *s2);
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+#endif
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp b/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp
deleted file mode 100644
index 24ee6e12a9dd..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./xbmc/linux/LinuxTimezone.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/linux/LinuxTimezone.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -27,6 +27,9 @@
- #ifdef __APPLE__
- #include "OSXGNUReplacements.h"
- #endif
-+#ifdef __FreeBSD__
-+#include "FreeBSDGNUReplacements.h"
-+#endif
- 
- #include "Util.h"
- 
-@@ -36,6 +39,7 @@
- {
-    char* line = NULL;
-    size_t linelen = 0;
-+   int nameonfourthfield = 0;
-    CStdString s;
-    vector<CStdString> tokens;
- 
-@@ -91,6 +95,11 @@
- 
-    // Load countries
-    fp = fopen("/usr/share/zoneinfo/iso3166.tab", "r");
-+   if (!fp)
-+   {
-+      fp = fopen("/usr/share/misc/iso3166", "r");
-+      nameonfourthfield = 1;
-+   }
-    if (fp)
-    {
-       CStdString countryCode;
-@@ -111,6 +120,16 @@
-          int i = 2;
-          while (s[i] == ' ' || s[i] == '\t') i++;
- 
-+         if (nameonfourthfield)
-+         {
-+            // skip three letter
-+            while (s[i] != ' ' && s[i] != '\t') i++;
-+            while (s[i] == ' ' || s[i] == '\t') i++;
-+            // skip number
-+            while (s[i] != ' ' && s[i] != '\t') i++;
-+            while (s[i] == ' ' || s[i] == '\t') i++;
-+         }
-+
-          countryCode = s.Left(2);
-          countryName = s.Mid(i);
- 
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in b/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in
deleted file mode 100644
index 55249040f6ad..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./xbmc/linux/Makefile.in.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/linux/Makefile.in	2012-01-02 10:14:38.000000000 +0100
-@@ -19,6 +19,10 @@
-      XTimeUtils.cpp \
-      XThreadUtils.cpp \
- 
-+ifeq ($(findstring freebsd,$(ARCH)), freebsd)
-+  SRCS+=FreeBSDGNUReplacements.cpp
-+endif
-+
- LIB=linux.a
- 
- include @abs_top_srcdir@/Makefile.include
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h b/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h
deleted file mode 100644
index 66378aea5bcb..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./xbmc/linux/PlatformDefs.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/linux/PlatformDefs.h	2012-01-02 10:14:38.000000000 +0100
-@@ -43,6 +43,10 @@
- #include <stdio.h>
- #include <sys/sysctl.h>
- #include <mach/mach.h>
-+#elif defined(__FreeBSD__)
-+#include <stdio.h>
-+#include <sys/sysctl.h>
-+#include <sys/types.h>
- #else
- #include <sys/sysinfo.h>
- #endif
-@@ -166,7 +170,7 @@
- #define CALLBACK    __stdcall
- #define WINAPI      __stdcall
- #define WINAPIV     __cdecl
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #define APIENTRY    WINAPI
- #else
- #define APIENTRY
-@@ -364,7 +368,16 @@
- #else
- #define fstat64 fstat
- #endif
--#else
-+#elif defined(__FreeBSD__)
-+typedef int64_t   off64_t;
-+typedef off_t     __off_t;
-+typedef off64_t   __off64_t;
-+typedef fpos_t fpos64_t;
-+#define __stat64 stat
-+#define stat64 stat
-+#define statfs64 statfs
-+#define fstat64 fstat
-+#else /* !__APPLE__ && !__FreeBSD__ */
- #define __stat64 stat64
- #endif
- 
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp b/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp
deleted file mode 100644
index e3e764e81540..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- ./xbmc/linux/XThreadUtils.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/linux/XThreadUtils.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -38,7 +38,11 @@
-           LPTHREAD_START_ROUTINE lpStartAddress,
-             LPVOID lpParameter,
-         DWORD dwCreationFlags,
-+#ifdef __FreeBSD__
-+          LPLONG lpThreadId
-+#else
-           LPDWORD lpThreadId
-+#endif
-     ) {
- 
-   // a thread handle would actually contain an event
-@@ -62,8 +66,12 @@
-   pthread_attr_destroy(&attr);
- 
-   if (h && lpThreadId)
-+#ifdef __FreeBSD__
-+    *lpThreadId = (LONG)h->m_hThread;
-+#else
-     // WARNING: This can truncate thread IDs on x86_64.
-     *lpThreadId = (DWORD)h->m_hThread;
-+#endif
-   return h;
- }
- 
-@@ -89,10 +97,18 @@
-    int ( *start_address )( void * ),
-    void *arglist,
-    unsigned initflag,
-+#ifdef __FreeBSD__
-+   unsigned long *thrdaddr
-+#else
-    unsigned *thrdaddr
-+#endif
- ) {
- 
-+#ifdef __FreeBSD__
-+  HANDLE h = CreateThread(NULL, stack_size, start_address, arglist, initflag, (LPLONG)thrdaddr);
-+#else
-   HANDLE h = CreateThread(NULL, stack_size, start_address, arglist, initflag, (LPDWORD)thrdaddr);
-+#endif
-   return h;
- 
- }
diff --git a/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h b/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h
deleted file mode 100644
index 08b6c6ad15dd..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./xbmc/linux/XThreadUtils.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/linux/XThreadUtils.h	2012-01-02 10:14:38.000000000 +0100
-@@ -30,7 +30,11 @@
-           LPTHREAD_START_ROUTINE lpStartAddress,
-             LPVOID lpParameter,
-         DWORD dwCreationFlags,
-+#ifdef __FreeBSD__
-+          LPLONG lpThreadId
-+#else
-           LPDWORD lpThreadId
-+#endif
-     );
- 
- HANDLE _beginthreadex(
-@@ -39,7 +43,11 @@
-    int ( *start_address )( void * ),
-    void *arglist,
-    unsigned initflag,
-+#ifdef __FreeBSD__
-+   unsigned long *thrdaddr
-+#else
-    unsigned *thrdaddr
-+#endif
- );
- 
- uintptr_t _beginthread(
diff --git a/multimedia/xbmc/files/patch-xbmc__network__Network.cpp b/multimedia/xbmc/files/patch-xbmc__network__Network.cpp
deleted file mode 100644
index 7a9c859ceb36..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__network__Network.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./xbmc/network/Network.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/network/Network.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "dialogs/GUIDialogKaiToast.h"
- 
- #include <netinet/in.h>
-+#include <sys/socket.h>
- #include <arpa/inet.h>
- 
- using namespace std;
diff --git a/multimedia/xbmc/files/patch-xbmc__network__Socket.h b/multimedia/xbmc/files/patch-xbmc__network__Socket.h
deleted file mode 100644
index 0e80d392ac8f..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__network__Socket.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./xbmc/network/Socket.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/network/Socket.h	2012-01-02 10:14:38.000000000 +0100
-@@ -30,6 +30,9 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#ifdef __FreeBSD__
-+#include <netinet/in.h>
-+#endif
- #ifdef _LINUX
- typedef int SOCKET;
- #endif
diff --git a/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp b/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp
deleted file mode 100644
index 02ea00ea59d1..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
---- ./xbmc/network/linux/NetworkLinux.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/network/linux/NetworkLinux.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -23,18 +23,26 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <linux/if.h>
- #include <linux/wireless.h>
- #include <linux/sockios.h>
- #endif
- #include <errno.h>
- #include <resolv.h>
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #include <sys/sockio.h>
- #include <net/if.h>
- #include <net/if_dl.h>
- #include <ifaddrs.h>
-+#include <net/route.h>
-+/* Darwin doesn't define this for some very odd reason */
-+#ifndef SA_SIZE
-+# define SA_SIZE(sa)						\
-+	(  (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ?	\
-+	   sizeof(long)		:				\
-+	   1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) )
-+#endif
- #else
- #include <net/if_arp.h>
- #endif
-@@ -64,7 +72,7 @@
- 
- bool CNetworkInterfaceLinux::IsWireless()
- {
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-   return false;
- #else
-   struct iwreq wrq;
-@@ -144,7 +152,7 @@
- {
-    CStdString result = "";
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    char essid[IW_ESSID_MAX_SIZE + 1];
-    memset(&essid, 0, sizeof(essid));
- 
-@@ -166,7 +174,48 @@
- {
-    CStdString result = "";
- 
--#ifndef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+   size_t needed;
-+   int mib[6];
-+   char *buf, *next, *lim;
-+   char line[16];
-+   struct rt_msghdr *rtm;
-+   struct sockaddr *sa;
-+   struct sockaddr_in *sockin;
-+
-+   mib[0] = CTL_NET;
-+   mib[1] = PF_ROUTE;
-+   mib[2] = 0;
-+   mib[3] = 0;
-+   mib[4] = NET_RT_DUMP;
-+   mib[5] = 0;
-+   if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-+      return result;
-+
-+   if ((buf = (char *)malloc(needed)) == NULL)
-+      return result;
-+
-+   if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-+      free(buf);
-+      return result;
-+   }
-+
-+   lim  = buf + needed;
-+   for (next = buf; next < lim; next += rtm->rtm_msglen) {
-+      rtm = (struct rt_msghdr *)next;
-+      sa = (struct sockaddr *)(rtm + 1);
-+      sa = (struct sockaddr *)(SA_SIZE(sa) + (char *)sa);	
-+      sockin = (struct sockaddr_in *)sa;
-+      if (inet_ntop(AF_INET, &sockin->sin_addr.s_addr,
-+         line, sizeof(line)) == NULL) {
-+            free(buf);
-+            return result;
-+	  }
-+	  result = line;
-+      break;
-+   }
-+   free(buf);
-+#else
-    FILE* fp = fopen("/proc/net/route", "r");
-    if (!fp)
-    {
-@@ -267,7 +316,7 @@
- CStdString CNetworkLinux::GetMacAddress(CStdString interfaceName)
- {
-   CStdString result = "00:00:00:00:00:00";
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- 
- #if ! defined(IFT_ETHER)
- #define IFT_ETHER 0x6/* Ethernet CSMACD */
-@@ -333,7 +382,7 @@
-   CStdString macAddr = "";
-   m_interfaces.clear();
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- 
-    // Query the list of interfaces.
-    struct ifaddrs *list;
-@@ -430,7 +479,7 @@
-    if (!IsWireless())
-       return result;
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    // Query the wireless extentsions version number. It will help us when we
-    // parse the resulting events
-    struct iwreq iwr;
-@@ -616,7 +665,7 @@
-    encryptionMode = ENC_NONE;
-    assignment = NETWORK_DISABLED;
- 
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    FILE* fp = fopen("/etc/network/interfaces", "r");
-    if (!fp)
-    {
-@@ -692,7 +741,7 @@
- 
- void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)
- {
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
-    FILE* fr = fopen("/etc/network/interfaces", "r");
-    if (!fr)
-    {
diff --git a/multimedia/xbmc/files/patch-xbmc__storage__IoSupport.cpp b/multimedia/xbmc/files/patch-xbmc__storage__IoSupport.cpp
deleted file mode 100644
index b234e78e9def..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__storage__IoSupport.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./xbmc/storage/IoSupport.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/storage/IoSupport.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -30,7 +30,7 @@
- #include "WIN32Util.h"
- #include "utils/CharsetConverter.h"
- #endif
--#if defined (_LINUX) && !defined(__APPLE__)
-+#if defined (_LINUX) && !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <linux/limits.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -54,6 +54,9 @@
- #include <IOKit/storage/IOStorageDeviceCharacteristics.h>
- #endif
- #endif
-+#ifdef __FreeBSD__
-+#include <sys/syslimits.h>
-+#endif
- #include "cdioSupport.h"
- #include "filesystem/iso9660.h"
- #include "MediaManager.h"
-@@ -228,6 +231,8 @@
- #ifdef HAS_DVD_DRIVE
- #ifdef __APPLE__
-   // FIXME...
-+#elif defined(__FreeBSD__)
-+  // NYI
- #elif defined(_LINUX)
-   char* dvdDevice = CLibcdio::GetInstance()->GetDeviceFileName();
-   if (strlen(dvdDevice) != 0)
-@@ -402,6 +407,8 @@
-     return -1;
-   }
-   return MODE2_DATA_SIZE;
-+#elif defined(__FreeBSD__)
-+  // NYI
- #elif defined(_LINUX)
-   if (hDevice->m_bCDROM)
-   {
diff --git a/multimedia/xbmc/files/patch-xbmc__threads__Thread.h b/multimedia/xbmc/files/patch-xbmc__threads__Thread.h
deleted file mode 100644
index 5733ed66b6f2..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__threads__Thread.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./xbmc/threads/Thread.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/threads/Thread.h	2012-01-02 10:14:38.000000000 +0100
-@@ -117,8 +117,12 @@
-   ThreadIdentifier ThreadId() const;
-   bool m_bAutoDelete;
-   CEvent m_StopEvent;
-+#ifdef __FreeBSD__
-+  unsigned long m_ThreadId;
-+#else
-   unsigned m_ThreadId; // This value is unreliable on platforms using pthreads
-                        // Use m_ThreadHandle->m_hThread instead
-+#endif
-   IRunnable* m_pRunnable;
- 
-   unsigned __int64 m_iLastUsage;
diff --git a/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp b/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
new file mode 100644
index 000000000000..06725e976da2
--- /dev/null
+++ b/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp
@@ -0,0 +1,18 @@
+--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2012-09-21 15:52:13.000000000 +0200
++++ xbmc/threads/platform/pthreads/ThreadImpl.cpp	2012-09-21 15:55:45.000000000 +0200
+@@ -59,12 +59,12 @@
+ void CThread::SetThreadInfo()
+ {
+ #ifdef __FreeBSD__
+-#if __FreeBSD_version < 900031
++#if __FreeBSD_version > 900030
++  m_ThreadOpaque.LwpId = pthread_getthreadid_np();
++#elif __FreeBSD_version > 800000
+   long lwpid;
+   thr_self(&lwpid);
+   m_ThreadOpaque.LwpId = lwpid;
+-#else
+-  m_ThreadOpaque.LwpId = pthread_getthreadid_np();
+ #endif
+ #elif defined(TARGET_ANDROID)
+   m_ThreadOpaque.LwpId = gettid();
diff --git a/multimedia/xbmc/files/patch-xbmc__utils__StdString.h b/multimedia/xbmc/files/patch-xbmc__utils__StdString.h
deleted file mode 100644
index 0c5fbfe3adf8..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__utils__StdString.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./xbmc/utils/StdString.h.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/utils/StdString.h	2012-01-02 10:14:38.000000000 +0100
-@@ -864,7 +864,7 @@
-       PWSTR pNextDstW      = pDstW;
-       SSCodeCvt::result res  = SSCodeCvt::ok;
-       const SSCodeCvt& conv  = SS_USE_FACET(loc, SSCodeCvt);
--#if defined(TARGET_DARWIN)
-+#if defined(TARGET_DARWIN) || defined(__FreeBSD__)
-       SSCodeCvt::state_type st= { { 0 } };
- #else
-       SSCodeCvt::state_type st= { 0 };
-@@ -911,7 +911,7 @@
-       PCWSTR pNextSrcW    = pSrcW;
-       SSCodeCvt::result res  = SSCodeCvt::ok;
-       const SSCodeCvt& conv  = SS_USE_FACET(loc, SSCodeCvt);
--#if defined(TARGET_DARWIN)
-+#if defined(TARGET_DARWIN) || defined(__FreeBSD__)
-       SSCodeCvt::state_type st= { { 0 } };
- #else
-       SSCodeCvt::state_type st= { 0 };
diff --git a/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp b/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp
deleted file mode 100644
index ac29b87cb3d8..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -782,6 +782,16 @@
- #include <stdio.h>
- #include <stdlib.h>
- #define cdft_thread_t HANDLE
-+#ifdef __FreeBSD__
-+#define cdft_thread_create(thp,func,argp) { \
-+    LONG thid; \
-+    *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \
-+    if (*(thp) == 0) { \
-+        fprintf(stderr, "cdft thread error\n"); \
-+        exit(1); \
-+    } \
-+}
-+#else
- #define cdft_thread_create(thp,func,argp) { \
-     DWORD thid; \
-     *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \
-@@ -790,6 +800,7 @@
-         exit(1); \
-     } \
- }
-+#endif
- #define cdft_thread_wait(th) { \
-     WaitForSingleObject(th, INFINITE); \
-     CloseHandle(th); \
diff --git a/multimedia/xbmc/files/patch-xbmc__windowing__X11__XRandR.cpp b/multimedia/xbmc/files/patch-xbmc__windowing__X11__XRandR.cpp
deleted file mode 100644
index 41a55df2d56a..000000000000
--- a/multimedia/xbmc/files/patch-xbmc__windowing__X11__XRandR.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./xbmc/windowing/X11/XRandR.cpp.orig	2011-12-23 04:12:21.000000000 +0100
-+++ ./xbmc/windowing/X11/XRandR.cpp	2012-01-02 10:14:38.000000000 +0100
-@@ -30,6 +30,11 @@
- #include "tinyXML/tinyxml.h"
- #include "../xbmc/utils/log.h"
- 
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#endif
-+
- using namespace std;
- 
- CXRandR::CXRandR(bool query)
diff --git a/multimedia/xbmc/pkg-plist b/multimedia/xbmc/pkg-plist
index 3c038ae66d27..804bc5ce44b5 100644
--- a/multimedia/xbmc/pkg-plist
+++ b/multimedia/xbmc/pkg-plist
@@ -1,8 +1,11 @@
 bin/xbmc-standalone
 bin/xbmc
-%%RSXS%%lib/xbmc/addons/screensaver.rsxs.euphoria/Euphoria.xbs
-%%RSXS%%lib/xbmc/addons/screensaver.rsxs.plasma/Plasma.xbs
-%%RSXS%%lib/xbmc/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs
+lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-%%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.glspectrum/opengl_spectrum.vis
 lib/xbmc/addons/visualization.projectm/projectM.vis
 lib/xbmc/addons/visualization.waveform/Waveform.vis
@@ -11,9 +14,15 @@ lib/xbmc/system/hdhomerun-%%ARCH%%-freebsd.so
 lib/xbmc/system/libcmyth-%%ARCH%%-freebsd.so
 lib/xbmc/system/libcpluff-%%ARCH%%-freebsd.so
 lib/xbmc/system/libexif-%%ARCH%%-freebsd.so
-lib/xbmc/system/libid3tag-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/avcodec-53-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/avfilter-2-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/avformat-53-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/avutil-51-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so
+%%EXTERNAL_FFMPEG%%lib/xbmc/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/adpcm-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/libsidplay2-%%ARCH%%-freebsd.so
 lib/xbmc/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so
@@ -25,59 +34,93 @@ lib/xbmc/xbmc.bin
 %%DOCSDIR%%/LICENSE.GPL
 %%DOCSDIR%%/README.linux
 %%DOCSDIR%%/copying.txt
-%%DOCSDIR%%/keymapping.txt
 share/icons/hicolor/256x256/apps/xbmc.png
 share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/FEH.py
-%%DATADIR%%/addons/metadata.albums.allmusic.com/addon.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/allmusic.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/icon.png
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.albums.allmusic.com/resources/settings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/addon.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/allmusic.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/icon.png
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/French/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/German/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.artists.allmusic.com/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
+%%DATADIR%%/addons/library.xbmc.gui/libXBMC_gui.h
+%%DATADIR%%/addons/library.xbmc.pvr/libXBMC_pvr.h
+%%DATADIR%%/addons/metadata.album.universal/addon.xml
+%%DATADIR%%/addons/metadata.album.universal/albumuniversal.xml
+%%DATADIR%%/addons/metadata.album.universal/changelog.txt
+%%DATADIR%%/addons/metadata.album.universal/icon.png
+%%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/Catalan/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Simple)/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/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/French/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/Italian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Korean/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/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/Russian/strings.po
+%%DATADIR%%/addons/metadata.album.universal/resources/language/Slovak/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/settings.xml
+%%DATADIR%%/addons/metadata.artists.theaudiodb.com/addon.xml
+%%DATADIR%%/addons/metadata.artists.theaudiodb.com/changelog.txt
+%%DATADIR%%/addons/metadata.artists.theaudiodb.com/icon.png
+%%DATADIR%%/addons/metadata.artists.theaudiodb.com/resources/language/English/strings.xml
+%%DATADIR%%/addons/metadata.artists.theaudiodb.com/resources/settings.xml
+%%DATADIR%%/addons/metadata.artists.theaudiodb.com/tadb.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/Chinese (Simple)/strings.xml
+%%DATADIR%%/addons/metadata.artists.universal/resources/language/English/strings.xml
+%%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.fanart.tv/addon.xml
+%%DATADIR%%/addons/metadata.common.fanart.tv/fanarttv.xml
 %%DATADIR%%/addons/metadata.common.hdtrailers.net/addon.xml
 %%DATADIR%%/addons/metadata.common.hdtrailers.net/hdtrailers.xml
+%%DATADIR%%/addons/metadata.common.hdtrailers.net/icon.png
 %%DATADIR%%/addons/metadata.common.htbackdrops.com/addon.xml
 %%DATADIR%%/addons/metadata.common.htbackdrops.com/htbackdrops.xml
+%%DATADIR%%/addons/metadata.common.htbackdrops.com/icon.png
 %%DATADIR%%/addons/metadata.common.imdb.com/addon.xml
 %%DATADIR%%/addons/metadata.common.imdb.com/changelog.txt
+%%DATADIR%%/addons/metadata.common.imdb.com/icon.png
 %%DATADIR%%/addons/metadata.common.imdb.com/imdb.xml
 %%DATADIR%%/addons/metadata.common.last.fm/addon.xml
+%%DATADIR%%/addons/metadata.common.last.fm/icon.png
 %%DATADIR%%/addons/metadata.common.last.fm/lastfm.xml
+%%DATADIR%%/addons/metadata.common.musicbrainz.org/addon.xml
+%%DATADIR%%/addons/metadata.common.musicbrainz.org/musicbrainz.xml
+%%DATADIR%%/addons/metadata.common.theaudiodb.com/addon.xml
+%%DATADIR%%/addons/metadata.common.theaudiodb.com/icon.png
+%%DATADIR%%/addons/metadata.common.theaudiodb.com/tadb.xml
 %%DATADIR%%/addons/metadata.common.themoviedb.org/addon.xml
+%%DATADIR%%/addons/metadata.common.themoviedb.org/icon.png
 %%DATADIR%%/addons/metadata.common.themoviedb.org/tmdb.xml
+%%DATADIR%%/addons/metadata.musicvideos.last.fm/addon.xml
+%%DATADIR%%/addons/metadata.musicvideos.last.fm/icon.png
+%%DATADIR%%/addons/metadata.musicvideos.last.fm/lastfmmusicvideos.xml
+%%DATADIR%%/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)/strings.xml
+%%DATADIR%%/addons/metadata.musicvideos.last.fm/resources/language/English/strings.xml
+%%DATADIR%%/addons/metadata.musicvideos.last.fm/resources/settings.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/addon.xml
 %%DATADIR%%/addons/metadata.themoviedb.org/changelog.txt
 %%DATADIR%%/addons/metadata.themoviedb.org/icon.png
@@ -116,64 +159,61 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Swedish/strings.xml
 %%DATADIR%%/addons/metadata.tvdb.com/resources/settings.xml
 %%DATADIR%%/addons/metadata.tvdb.com/tvdb.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/addon.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/icon.png
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/English/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/resources/settings.xml
-%%DATADIR%%/addons/metadata.yahoomusic.com/yahoomusic.xml
 %%DATADIR%%/addons/repository.xbmc.org/addon.xml
 %%DATADIR%%/addons/repository.xbmc.org/icon.png
-%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.euphoria/addon.xml
-%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.euphoria/icon.png
-%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.plasma/addon.xml
-%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.plasma/icon.png
-%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.solarwinds/addon.xml
-%%RSXS%%%%DATADIR%%/addons/screensaver.rsxs.solarwinds/icon.png
+%%DATADIR%%/addons/screensaver.rsxs.euphoria/addon.xml
+%%DATADIR%%/addons/screensaver.rsxs.euphoria/icon.png
+%%DATADIR%%/addons/screensaver.rsxs.plasma/addon.xml
+%%DATADIR%%/addons/screensaver.rsxs.plasma/icon.png
+%%DATADIR%%/addons/screensaver.rsxs.solarwinds/addon.xml
+%%DATADIR%%/addons/screensaver.rsxs.solarwinds/icon.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.black/addon.xml
 %%DATADIR%%/addons/screensaver.xbmc.builtin.black/icon.png
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/addon.xml
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/icon.png
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/French/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/German/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Swedish/strings.xml
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Albanian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Czech/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Danish/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/French/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Galician/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/German/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Greek/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Italian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Korean/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Polish/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Russian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Thai/strings.po
+%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Ukrainian/strings.po
 %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/settings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/addon.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/icon.png
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/English/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/French/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/German/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Swedish/strings.xml
-%%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/settings.xml
 %%DATADIR%%/addons/script.module.pil/addon.xml
 %%DATADIR%%/addons/script.module.pysqlite/addon.xml
 %%DATADIR%%/addons/script.module.pysqlite/lib/pysqlite2/__init__.py
@@ -192,6 +232,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/DialogButtonMenu.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogContentSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogContextMenu.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogExtendedProgressBar.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogFavourites.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogFileStacking.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogGamepad.xml
@@ -199,12 +240,20 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/DialogKaraokeSongSelector.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogKeyboard.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogMediaFilter.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogMediaSource.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogMusicScan.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogMuteBug.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogNetworkSetup.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogNumeric.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogOK.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRChannelManager.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRChannelsOSD.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGroupManager.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideInfo.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideOSD.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRGuideSearch.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRRecordingInfo.xml
+%%DATADIR%%/addons/skin.confluence/720p/DialogPVRTimerSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPeripheralManager.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPeripheralSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogPictureInfo.xml
@@ -215,7 +264,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/DialogSongInfo.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogTextViewer.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogVideoInfo.xml
-%%DATADIR%%/addons/skin.confluence/720p/DialogVideoScan.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogVolumeBar.xml
 %%DATADIR%%/addons/skin.confluence/720p/DialogYesNo.xml
 %%DATADIR%%/addons/skin.confluence/720p/FileBrowser.xml
@@ -236,6 +284,7 @@ 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/MyPics.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyPrograms.xml
 %%DATADIR%%/addons/skin.confluence/720p/MyVideoNav.xml
@@ -249,6 +298,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/720p/SettingsProfile.xml
 %%DATADIR%%/addons/skin.confluence/720p/SettingsScreenCalibration.xml
 %%DATADIR%%/addons/skin.confluence/720p/SettingsSystemInfo.xml
+%%DATADIR%%/addons/skin.confluence/720p/SkinSettings.xml
 %%DATADIR%%/addons/skin.confluence/720p/SlideShow.xml
 %%DATADIR%%/addons/skin.confluence/720p/SmartPlaylistEditor.xml
 %%DATADIR%%/addons/skin.confluence/720p/SmartPlaylistRule.xml
@@ -262,77 +312,90 @@ 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/ViewsPictures.xml
 %%DATADIR%%/addons/skin.confluence/720p/ViewsVideoLibrary.xml
 %%DATADIR%%/addons/skin.confluence/720p/VisualisationPresetList.xml
-%%DATADIR%%/addons/skin.confluence/720p/custom_SkinSetting_1111.xml
+%%DATADIR%%/addons/skin.confluence/720p/custom_SideMenuHelp.xml
 %%DATADIR%%/addons/skin.confluence/720p/defaults.xml
 %%DATADIR%%/addons/skin.confluence/720p/includes.xml
+%%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/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+/MapsVideo.xml
-%%DATADIR%%/addons/skin.confluence/720p/weather+/WeekendForecast.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/addons.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/appearance.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/media-overlay.png
-%%DATADIR%%/addons/skin.confluence/backgrounds/music.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/network.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/pictures.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/playdisc.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/programs.jpg
+%%DATADIR%%/addons/skin.confluence/backgrounds/SKINDEFAULT.jpg
+%%DATADIR%%/addons/skin.confluence/backgrounds/media-overlay.jpg
 %%DATADIR%%/addons/skin.confluence/backgrounds/settings.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/skinsetting.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/system.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/videos.jpg
-%%DATADIR%%/addons/skin.confluence/backgrounds/weather.jpg
+%%DATADIR%%/addons/skin.confluence/backgrounds/tv.jpg
 %%DATADIR%%/addons/skin.confluence/build.bat
 %%DATADIR%%/addons/skin.confluence/changelog.txt
 %%DATADIR%%/addons/skin.confluence/colors/defaults.xml
-%%DATADIR%%/addons/skin.confluence/fonts/DefaultCaps.ttf
-%%DATADIR%%/addons/skin.confluence/fonts/DejaVuSans-Bold-Caps.ttf
-%%DATADIR%%/addons/skin.confluence/fonts/DejaVuSans-Bold.ttf
-%%DATADIR%%/addons/skin.confluence/fonts/DejaVuSans.ttf
+%%DATADIR%%/addons/skin.confluence/fonts/NOTICE.txt
+%%DATADIR%%/addons/skin.confluence/fonts/README.txt
+%%DATADIR%%/addons/skin.confluence/fonts/Roboto-Bold.ttf
+%%DATADIR%%/addons/skin.confluence/fonts/Roboto-Regular.ttf
 %%DATADIR%%/addons/skin.confluence/icon.png
-%%DATADIR%%/addons/skin.confluence/language/Afrikaans/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Arabic/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Catalan/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Chinese (Traditional)/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Czech/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Danish/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Dutch/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/English/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Finnish/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/French/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/German/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Greek/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Hungarian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Icelandic/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Italian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Japanese/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Korean/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Lithuanian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Norwegian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Polish/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Portuguese/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Romanian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Russian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Serbian (Cyrillic)/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Serbian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Slovak/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Slovenian/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Spanish/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Swedish/strings.xml
-%%DATADIR%%/addons/skin.confluence/language/Turkish/strings.xml
-%%DATADIR%%/addons/skin.confluence/media/ArrowDown.png
-%%DATADIR%%/addons/skin.confluence/media/ArrowUp.png
+%%DATADIR%%/addons/skin.confluence/language/Afrikaans/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Albanian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Arabic/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Basque/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Belarusian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Bosnian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Bulgarian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Catalan/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Croatian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Czech/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Danish/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Dutch/strings.po
+%%DATADIR%%/addons/skin.confluence/language/English (US)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/English/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Esperanto/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Estonian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Finnish/strings.po
+%%DATADIR%%/addons/skin.confluence/language/French/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Galician/strings.po
+%%DATADIR%%/addons/skin.confluence/language/German/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Greek/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Hebrew/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Hindi (Devanagiri)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Hungarian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Icelandic/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Indonesian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Italian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Japanese/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Korean/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Latvian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Lithuanian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Macedonian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Malayalam/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Norwegian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Persian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Polish/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Portuguese/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Romanian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Russian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Serbian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Slovak/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Slovenian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Spanish/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Swedish/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Thai/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Turkish/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Ukrainian/strings.po
+%%DATADIR%%/addons/skin.confluence/language/Vietnamese/strings.po
 %%DATADIR%%/addons/skin.confluence/media/CalibrateBottomRight.png
 %%DATADIR%%/addons/skin.confluence/media/CalibratePixelRatio.png
 %%DATADIR%%/addons/skin.confluence/media/CalibrateSubtitles.png
@@ -381,6 +444,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultIconError.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultIconInfo.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultIconWarning.png
+%%DATADIR%%/addons/skin.confluence/media/DefaultInProgressShows.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultMovies.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultMusicAlbums.png
 %%DATADIR%%/addons/skin.confluence/media/DefaultMusicArtists.png
@@ -413,6 +477,7 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/DialogContextBottom.png
 %%DATADIR%%/addons/skin.confluence/media/DialogContextMiddle.png
 %%DATADIR%%/addons/skin.confluence/media/DialogContextTop.png
+%%DATADIR%%/addons/skin.confluence/media/Fanart_Diffuse.png
 %%DATADIR%%/addons/skin.confluence/media/Fanart_Fallback_Music_Small.jpg
 %%DATADIR%%/addons/skin.confluence/media/Fanart_Fallback_Small.jpg
 %%DATADIR%%/addons/skin.confluence/media/GlassOverlay.png
@@ -421,9 +486,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/HasSub.png
 %%DATADIR%%/addons/skin.confluence/media/HomeBack.png
 %%DATADIR%%/addons/skin.confluence/media/HomeBladeSub.png
-%%DATADIR%%/addons/skin.confluence/media/HomeButtonsBack.png
-%%DATADIR%%/addons/skin.confluence/media/HomeIcon-Focus.png
-%%DATADIR%%/addons/skin.confluence/media/HomeIcon.png
 %%DATADIR%%/addons/skin.confluence/media/HomeNowPlayingBack.png
 %%DATADIR%%/addons/skin.confluence/media/HomeOverlay1.png
 %%DATADIR%%/addons/skin.confluence/media/HomeSeperator.png
@@ -450,7 +512,6 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/MediaItemDetailBG.png
 %%DATADIR%%/addons/skin.confluence/media/MenuItemFO.png
 %%DATADIR%%/addons/skin.confluence/media/MenuItemNF.png
-%%DATADIR%%/addons/skin.confluence/media/NowPlayingIcon.png
 %%DATADIR%%/addons/skin.confluence/media/OSD16x.png
 %%DATADIR%%/addons/skin.confluence/media/OSD2x.png
 %%DATADIR%%/addons/skin.confluence/media/OSD32x.png
@@ -460,6 +521,12 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/OSDAudioNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDBookmarksFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDBookmarksNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDChannelDownFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDChannelDownNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDChannelListFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDChannelListNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDChannelUPFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDChannelUPNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDDvdFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDDvdNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDForwardFO.png
@@ -489,10 +556,10 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRandomOffNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRandomOnFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRandomOnNF.png
-%%DATADIR%%/addons/skin.confluence/media/OSDRecord2.png
-%%DATADIR%%/addons/skin.confluence/media/OSDRecordFO.png
-%%DATADIR%%/addons/skin.confluence/media/OSDRecordNF.png
-%%DATADIR%%/addons/skin.confluence/media/OSDRecordOff.png
+%%DATADIR%%/addons/skin.confluence/media/OSDRecordOffFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDRecordOffNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDRecordOnFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDRecordOnNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRepeatAllFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRepeatAllNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDRepeatFO.png
@@ -508,15 +575,21 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/OSDStopNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDSubtitlesFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDSubtitlesNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDTeleTextFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDTeleTextNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDVideoFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDVideoNF.png
 %%DATADIR%%/addons/skin.confluence/media/OSDVizFO.png
 %%DATADIR%%/addons/skin.confluence/media/OSDVizNF.png
+%%DATADIR%%/addons/skin.confluence/media/OSDepgFO.png
+%%DATADIR%%/addons/skin.confluence/media/OSDepgNF.png
 %%DATADIR%%/addons/skin.confluence/media/OverlayDialogBackground.png
-%%DATADIR%%/addons/skin.confluence/media/OverlayHD.png
 %%DATADIR%%/addons/skin.confluence/media/OverlayLocked.png
 %%DATADIR%%/addons/skin.confluence/media/OverlayRAR.png
 %%DATADIR%%/addons/skin.confluence/media/OverlayWatched.png
+%%DATADIR%%/addons/skin.confluence/media/OverlayWatching.png
+%%DATADIR%%/addons/skin.confluence/media/PVR-HasTimer.png
+%%DATADIR%%/addons/skin.confluence/media/PVR-IsRecording.png
 %%DATADIR%%/addons/skin.confluence/media/RecentAddedBack.png
 %%DATADIR%%/addons/skin.confluence/media/ScrollBarH.png
 %%DATADIR%%/addons/skin.confluence/media/ScrollBarH_bar.png
@@ -534,8 +607,9 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/ThumbBG.png
 %%DATADIR%%/addons/skin.confluence/media/ThumbBorder.png
 %%DATADIR%%/addons/skin.confluence/media/ThumbShadow.png
-%%DATADIR%%/addons/skin.confluence/media/VolumeIcon-Mute.png
 %%DATADIR%%/addons/skin.confluence/media/VolumeIcon.png
+%%DATADIR%%/addons/skin.confluence/media/arrow-big-left.png
+%%DATADIR%%/addons/skin.confluence/media/arrow-big-right.png
 %%DATADIR%%/addons/skin.confluence/media/black-back.png
 %%DATADIR%%/addons/skin.confluence/media/black-back2.png
 %%DATADIR%%/addons/skin.confluence/media/busy.png
@@ -546,6 +620,23 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/media/dialogheader.png
 %%DATADIR%%/addons/skin.confluence/media/diffuse_mirror2.png
 %%DATADIR%%/addons/skin.confluence/media/diffuse_mirror3.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/0.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/112.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/128.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/144.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/16.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/160.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/176.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/192.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/208.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/224.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/240.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/32.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/48.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/64.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/80.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/96.png
+%%DATADIR%%/addons/skin.confluence/media/epg-genres/genre-numbers.txt
 %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/1.33.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/1.66.png
 %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio/1.78.png
@@ -622,20 +713,28 @@ share/icons/hicolor/48x48/apps/xbmc.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
+%%DATADIR%%/addons/skin.confluence/media/floor_button.png
+%%DATADIR%%/addons/skin.confluence/media/floor_buttonFO.png
 %%DATADIR%%/addons/skin.confluence/media/folder-focus.png
-%%DATADIR%%/addons/skin.confluence/media/header.png
-%%DATADIR%%/addons/skin.confluence/media/home-favourites-FO.png
-%%DATADIR%%/addons/skin.confluence/media/home-favourites.png
-%%DATADIR%%/addons/skin.confluence/media/home-power-FO.png
-%%DATADIR%%/addons/skin.confluence/media/home-power.png
+%%DATADIR%%/addons/skin.confluence/media/gradient.png
+%%DATADIR%%/addons/skin.confluence/media/hint-overlay.png
 %%DATADIR%%/addons/skin.confluence/media/icon-mute.png
 %%DATADIR%%/addons/skin.confluence/media/icon-rss.png
 %%DATADIR%%/addons/skin.confluence/media/icon-video.png
 %%DATADIR%%/addons/skin.confluence/media/icon-weather.png
-%%DATADIR%%/addons/skin.confluence/media/lastfm-hate-focus.png
-%%DATADIR%%/addons/skin.confluence/media/lastfm-hate-nofocus.png
-%%DATADIR%%/addons/skin.confluence/media/lastfm-love-focus.png
-%%DATADIR%%/addons/skin.confluence/media/lastfm-love-nofocus.png
+%%DATADIR%%/addons/skin.confluence/media/icon_addons.png
+%%DATADIR%%/addons/skin.confluence/media/icon_back.png
+%%DATADIR%%/addons/skin.confluence/media/icon_favourites.png
+%%DATADIR%%/addons/skin.confluence/media/icon_home.png
+%%DATADIR%%/addons/skin.confluence/media/icon_music.png
+%%DATADIR%%/addons/skin.confluence/media/icon_pictures.png
+%%DATADIR%%/addons/skin.confluence/media/icon_player.png
+%%DATADIR%%/addons/skin.confluence/media/icon_power.png
+%%DATADIR%%/addons/skin.confluence/media/icon_search.png
+%%DATADIR%%/addons/skin.confluence/media/icon_system.png
+%%DATADIR%%/addons/skin.confluence/media/icon_video.png
+%%DATADIR%%/addons/skin.confluence/media/icon_volume.png
+%%DATADIR%%/addons/skin.confluence/media/icon_weather.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
@@ -674,96 +773,262 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/skin.confluence/sounds/sounds.xml
 %%DATADIR%%/addons/visualization.dxspectrum/addon.xml
 %%DATADIR%%/addons/visualization.dxspectrum/icon.png
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/English/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/French/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/German/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Swedish/strings.xml
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Basque/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Bosnian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Czech/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Danish/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/English/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Esperanto/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/French/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Galician/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/German/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Greek/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hindi (Devanagiri)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Italian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Korean/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Polish/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Russian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Serbian (Cyrillic)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Serbian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Thai/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/visualization.dxspectrum/resources/language/Ukrainian/strings.po
 %%DATADIR%%/addons/visualization.dxspectrum/resources/settings.xml
 %%DATADIR%%/addons/visualization.glspectrum/addon.xml
 %%DATADIR%%/addons/visualization.glspectrum/icon.png
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/English/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/French/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/German/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/visualization.glspectrum/resources/language/Swedish/strings.xml
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Basque/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Bosnian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Czech/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Danish/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/English/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Esperanto/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/French/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Galician/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/German/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Greek/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Hindi (Devanagiri)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Italian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Korean/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Polish/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Russian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Serbian (Cyrillic)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Serbian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Thai/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/visualization.glspectrum/resources/language/Ukrainian/strings.po
 %%DATADIR%%/addons/visualization.glspectrum/resources/settings.xml
-%%DATADIR%%/addons/visualization.itunes/addon.xml
 %%DATADIR%%/addons/visualization.milkdrop/addon.xml
 %%DATADIR%%/addons/visualization.milkdrop/icon.png
 %%DATADIR%%/addons/visualization.milkdrop/presets/WA51-presets(265).zip
 %%DATADIR%%/addons/visualization.milkdrop/presets/Winamp-presets(436).zip
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/English/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/French/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/German/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/visualization.milkdrop/resources/language/Swedish/strings.xml
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Czech/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Danish/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/English/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/French/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Galician/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/German/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Greek/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Italian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Korean/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Polish/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Russian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/visualization.milkdrop/resources/language/Ukrainian/strings.po
 %%DATADIR%%/addons/visualization.milkdrop/resources/settings.xml
 %%DATADIR%%/addons/visualization.projectm/addon.xml
 %%DATADIR%%/addons/visualization.projectm/icon.png
-%%DATADIR%%/addons/visualization.projectm/resources/language/Bulgarian/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/English/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/French/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/German/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Hungarian/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Korean/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Polish/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Romanian/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Russian/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Slovenian/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Spanish/strings.xml
-%%DATADIR%%/addons/visualization.projectm/resources/language/Swedish/strings.xml
+%%DATADIR%%/addons/visualization.projectm/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Basque/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Bosnian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Czech/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Danish/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/English/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Esperanto/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/French/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Galician/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/German/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Greek/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Hindi (Devanagiri)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Indonesian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Italian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Korean/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/Norwegian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Polish/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Russian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Serbian (Cyrillic)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Serbian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Thai/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/visualization.projectm/resources/language/Ukrainian/strings.po
 %%DATADIR%%/addons/visualization.projectm/resources/presets.zip
 %%DATADIR%%/addons/visualization.projectm/resources/settings.xml
 %%DATADIR%%/addons/visualization.waveform/addon.xml
 %%DATADIR%%/addons/visualization.waveform/icon.png
 %%DATADIR%%/addons/weather.wunderground/LICENSE.txt
+%%DATADIR%%/addons/weather.wunderground/README.txt
 %%DATADIR%%/addons/weather.wunderground/addon.xml
 %%DATADIR%%/addons/weather.wunderground/changelog.txt
 %%DATADIR%%/addons/weather.wunderground/default.py
+%%DATADIR%%/addons/weather.wunderground/fanart.jpg
 %%DATADIR%%/addons/weather.wunderground/icon.png
-%%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml
-%%DATADIR%%/addons/weather.wunderground/resources/language/Dutch/strings.xml
-%%DATADIR%%/addons/weather.wunderground/resources/language/English/strings.xml
-%%DATADIR%%/addons/weather.wunderground/resources/language/Finnish/strings.xml
-%%DATADIR%%/addons/weather.wunderground/resources/language/German/strings.xml
-%%DATADIR%%/addons/weather.wunderground/resources/language/Swedish/strings.xml
+%%DATADIR%%/addons/weather.wunderground/resources/language/Afrikaans/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Arabic/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Basque/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Belarusian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Bosnian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Bulgarian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Catalan/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Simple)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Traditional)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Croatian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Czech/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Danish/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Dutch/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/English (US)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/English/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Estonian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Finnish/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/French/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Galician/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/German/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Greek/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Hebrew/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Hungarian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Icelandic/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Italian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Japanese/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Korean/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Lithuanian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Macedonian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Norwegian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Polish/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Portuguese (Brazil)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Portuguese/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Romanian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Russian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Serbian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Serbian (Cyrillic)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Slovak/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Slovenian/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Spanish (Argentina)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Spanish (Mexico)/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Spanish/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Swedish/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Thai/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Turkish/strings.po
+%%DATADIR%%/addons/weather.wunderground/resources/language/Ukrainian/strings.po
 %%DATADIR%%/addons/weather.wunderground/resources/lib/utilities.py
+%%DATADIR%%/addons/weather.wunderground/resources/lib/wunderground/__init__.py
+%%DATADIR%%/addons/weather.wunderground/resources/lib/wunderground/wunderground.py
+%%DATADIR%%/addons/weather.wunderground/resources/logo/logo.jpg
 %%DATADIR%%/addons/weather.wunderground/resources/settings.xml
 %%DATADIR%%/addons/webinterface.default/addon.xml
 %%DATADIR%%/addons/webinterface.default/css/core.css
@@ -776,14 +1041,15 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/webinterface.default/images/close-button.png
 %%DATADIR%%/addons/webinterface.default/images/remote.jpg
 %%DATADIR%%/addons/webinterface.default/index.html
-%%DATADIR%%/addons/webinterface.default/js/Core.js
-%%DATADIR%%/addons/webinterface.default/js/Launcher.js
 %%DATADIR%%/addons/webinterface.default/js/MediaLibrary.js
 %%DATADIR%%/addons/webinterface.default/js/NowPlayingManager.js
 %%DATADIR%%/addons/webinterface.default/js/iscroll-min.js
-%%DATADIR%%/addons/webinterface.default/js/jquery-1.5.2.js
-%%DATADIR%%/addons/webinterface.default/js/jquery-1.5.2.min.js
-%%DATADIR%%/addons/webinterface.default/js/jquery.lazyload.js
+%%DATADIR%%/addons/webinterface.default/js/jquery-1.8.2.min.js
+%%DATADIR%%/addons/webinterface.default/js/json2.js
+%%DATADIR%%/addons/webinterface.default/js/xbmc.core.js
+%%DATADIR%%/addons/webinterface.default/js/xbmc.init.js
+%%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/metadata.xsd
 %%DATADIR%%/addons/xbmc.addon/repository.xsd
@@ -797,99 +1063,111 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/addons/xbmc.python/pluginsource.xsd
 %%DATADIR%%/addons/xbmc.python/script.xsd
 %%DATADIR%%/language/Afrikaans/langinfo.xml
-%%DATADIR%%/language/Afrikaans/strings.xml
+%%DATADIR%%/language/Afrikaans/strings.po
 %%DATADIR%%/language/Arabic/langinfo.xml
-%%DATADIR%%/language/Arabic/strings.xml
+%%DATADIR%%/language/Arabic/strings.po
 %%DATADIR%%/language/Basque/langinfo.xml
-%%DATADIR%%/language/Basque/strings.xml
+%%DATADIR%%/language/Basque/strings.po
+%%DATADIR%%/language/Belarusian/strings.po
 %%DATADIR%%/language/Bosnian/langinfo.xml
-%%DATADIR%%/language/Bosnian/strings.xml
+%%DATADIR%%/language/Bosnian/strings.po
 %%DATADIR%%/language/Bulgarian/langinfo.xml
-%%DATADIR%%/language/Bulgarian/strings.xml
+%%DATADIR%%/language/Bulgarian/strings.po
 %%DATADIR%%/language/Catalan/langinfo.xml
-%%DATADIR%%/language/Catalan/strings.xml
+%%DATADIR%%/language/Catalan/strings.po
 %%DATADIR%%/language/Chinese (Simple)/langinfo.xml
-%%DATADIR%%/language/Chinese (Simple)/strings.xml
+%%DATADIR%%/language/Chinese (Simple)/strings.po
 %%DATADIR%%/language/Chinese (Traditional)/langinfo.xml
-%%DATADIR%%/language/Chinese (Traditional)/strings.xml
+%%DATADIR%%/language/Chinese (Traditional)/strings.po
 %%DATADIR%%/language/Croatian/langinfo.xml
-%%DATADIR%%/language/Croatian/strings.xml
+%%DATADIR%%/language/Croatian/strings.po
 %%DATADIR%%/language/Czech/langinfo.xml
-%%DATADIR%%/language/Czech/strings.xml
+%%DATADIR%%/language/Czech/strings.po
 %%DATADIR%%/language/Danish/langinfo.xml
-%%DATADIR%%/language/Danish/strings.xml
+%%DATADIR%%/language/Danish/strings.po
 %%DATADIR%%/language/Dutch/langinfo.xml
-%%DATADIR%%/language/Dutch/strings.xml
+%%DATADIR%%/language/Dutch/strings.po
 %%DATADIR%%/language/English (US)/langinfo.xml
-%%DATADIR%%/language/English (US)/strings.xml
+%%DATADIR%%/language/English (US)/strings.po
 %%DATADIR%%/language/English/langinfo.xml
-%%DATADIR%%/language/English/strings.xml
+%%DATADIR%%/language/English/strings.po
 %%DATADIR%%/language/Esperanto/langinfo.xml
-%%DATADIR%%/language/Esperanto/strings.xml
+%%DATADIR%%/language/Esperanto/strings.po
+%%DATADIR%%/language/Estonian/langinfo.xml
+%%DATADIR%%/language/Estonian/strings.po
 %%DATADIR%%/language/Finnish/langinfo.xml
-%%DATADIR%%/language/Finnish/strings.xml
+%%DATADIR%%/language/Finnish/strings.po
 %%DATADIR%%/language/French/langinfo.xml
-%%DATADIR%%/language/French/strings.xml
+%%DATADIR%%/language/French/strings.po
+%%DATADIR%%/language/Galician/langinfo.xml
+%%DATADIR%%/language/Galician/strings.po
 %%DATADIR%%/language/German/keyboardmap.xml
 %%DATADIR%%/language/German/langinfo.xml
-%%DATADIR%%/language/German/strings.xml
+%%DATADIR%%/language/German/strings.po
 %%DATADIR%%/language/Greek/langinfo.xml
-%%DATADIR%%/language/Greek/strings.xml
+%%DATADIR%%/language/Greek/strings.po
 %%DATADIR%%/language/Hebrew/langinfo.xml
-%%DATADIR%%/language/Hebrew/strings.xml
+%%DATADIR%%/language/Hebrew/strings.po
 %%DATADIR%%/language/Hindi (Devanagiri)/langinfo.xml
-%%DATADIR%%/language/Hindi (Devanagiri)/strings.xml
+%%DATADIR%%/language/Hindi (Devanagiri)/strings.po
 %%DATADIR%%/language/Hungarian/langinfo.xml
-%%DATADIR%%/language/Hungarian/strings.xml
+%%DATADIR%%/language/Hungarian/strings.po
 %%DATADIR%%/language/Icelandic/langinfo.xml
-%%DATADIR%%/language/Icelandic/strings.xml
+%%DATADIR%%/language/Icelandic/strings.po
 %%DATADIR%%/language/Indonesian/langinfo.xml
-%%DATADIR%%/language/Indonesian/strings.xml
+%%DATADIR%%/language/Indonesian/strings.po
 %%DATADIR%%/language/Italian/langinfo.xml
-%%DATADIR%%/language/Italian/strings.xml
+%%DATADIR%%/language/Italian/strings.po
 %%DATADIR%%/language/Japanese/langinfo.xml
-%%DATADIR%%/language/Japanese/strings.xml
+%%DATADIR%%/language/Japanese/strings.po
 %%DATADIR%%/language/Korean/langinfo.xml
-%%DATADIR%%/language/Korean/strings.xml
+%%DATADIR%%/language/Korean/strings.po
 %%DATADIR%%/language/Lithuanian/langinfo.xml
-%%DATADIR%%/language/Lithuanian/strings.xml
+%%DATADIR%%/language/Lithuanian/strings.po
+%%DATADIR%%/language/Macedonian/langinfo.xml
+%%DATADIR%%/language/Macedonian/strings.po
 %%DATADIR%%/language/Maltese/langinfo.xml
-%%DATADIR%%/language/Maltese/strings.xml
+%%DATADIR%%/language/Maltese/strings.po
 %%DATADIR%%/language/Norwegian/langinfo.xml
-%%DATADIR%%/language/Norwegian/strings.xml
+%%DATADIR%%/language/Norwegian/strings.po
 %%DATADIR%%/language/Polish/langinfo.xml
-%%DATADIR%%/language/Polish/strings.xml
+%%DATADIR%%/language/Polish/strings.po
 %%DATADIR%%/language/Portuguese (Brazil)/langinfo.xml
-%%DATADIR%%/language/Portuguese (Brazil)/strings.xml
+%%DATADIR%%/language/Portuguese (Brazil)/strings.po
 %%DATADIR%%/language/Portuguese/langinfo.xml
-%%DATADIR%%/language/Portuguese/strings.xml
+%%DATADIR%%/language/Portuguese/strings.po
 %%DATADIR%%/language/Romanian/langinfo.xml
-%%DATADIR%%/language/Romanian/strings.xml
+%%DATADIR%%/language/Romanian/strings.po
 %%DATADIR%%/language/Russian/langinfo.xml
-%%DATADIR%%/language/Russian/strings.xml
+%%DATADIR%%/language/Russian/strings.po
 %%DATADIR%%/language/Serbian (Cyrillic)/langinfo.xml
-%%DATADIR%%/language/Serbian (Cyrillic)/strings.xml
+%%DATADIR%%/language/Serbian (Cyrillic)/strings.po
 %%DATADIR%%/language/Serbian/langinfo.xml
-%%DATADIR%%/language/Serbian/strings.xml
+%%DATADIR%%/language/Serbian/strings.po
 %%DATADIR%%/language/Slovak/langinfo.xml
-%%DATADIR%%/language/Slovak/strings.xml
+%%DATADIR%%/language/Slovak/strings.po
 %%DATADIR%%/language/Slovenian/langinfo.xml
-%%DATADIR%%/language/Slovenian/strings.xml
+%%DATADIR%%/language/Slovenian/strings.po
+%%DATADIR%%/language/Spanish (Argentina)/langinfo.xml
+%%DATADIR%%/language/Spanish (Argentina)/strings.po
 %%DATADIR%%/language/Spanish (Mexico)/langinfo.xml
-%%DATADIR%%/language/Spanish (Mexico)/strings.xml
+%%DATADIR%%/language/Spanish (Mexico)/strings.po
 %%DATADIR%%/language/Spanish/langinfo.xml
-%%DATADIR%%/language/Spanish/strings.xml
+%%DATADIR%%/language/Spanish/strings.po
 %%DATADIR%%/language/Swedish/langinfo.xml
-%%DATADIR%%/language/Swedish/strings.xml
+%%DATADIR%%/language/Swedish/strings.po
 %%DATADIR%%/language/Thai/langinfo.xml
-%%DATADIR%%/language/Thai/strings.xml
+%%DATADIR%%/language/Thai/strings.po
 %%DATADIR%%/language/Turkish/langinfo.xml
-%%DATADIR%%/language/Turkish/strings.xml
+%%DATADIR%%/language/Turkish/strings.po
 %%DATADIR%%/language/Ukrainian/langinfo.xml
-%%DATADIR%%/language/Ukrainian/strings.xml
+%%DATADIR%%/language/Ukrainian/strings.po
+%%DATADIR%%/media/AppIcon.png
 %%DATADIR%%/media/Fonts/arial.ttf
 %%DATADIR%%/media/Fonts/teletext.ttf
 %%DATADIR%%/media/Splash.png
+%%DATADIR%%/media/icon-flat-120x120.png
+%%DATADIR%%/media/icon-flat-256x256.png
 %%DATADIR%%/media/icon.png
 %%DATADIR%%/media/icon32x32.png
 %%DATADIR%%/media/weather.zip
@@ -917,6 +1195,49 @@ share/icons/hicolor/48x48/apps/xbmc.png
 %%DATADIR%%/system/keymaps/mouse.xml
 %%DATADIR%%/system/keymaps/nyxboard/keyboard.xml
 %%DATADIR%%/system/keymaps/remote.xml
+%%DATADIR%%/system/library/video/addons.xml
+%%DATADIR%%/system/library/video/files.xml
+%%DATADIR%%/system/library/video/inprogressshows.xml
+%%DATADIR%%/system/library/video/movies/actors.xml
+%%DATADIR%%/system/library/video/movies/country.xml
+%%DATADIR%%/system/library/video/movies/directors.xml
+%%DATADIR%%/system/library/video/movies/genres.xml
+%%DATADIR%%/system/library/video/movies/index.xml
+%%DATADIR%%/system/library/video/movies/sets.xml
+%%DATADIR%%/system/library/video/movies/studios.xml
+%%DATADIR%%/system/library/video/movies/tags.xml
+%%DATADIR%%/system/library/video/movies/titles.xml
+%%DATADIR%%/system/library/video/movies/years.xml
+%%DATADIR%%/system/library/video/musicvideos/albums.xml
+%%DATADIR%%/system/library/video/musicvideos/artists.xml
+%%DATADIR%%/system/library/video/musicvideos/directors.xml
+%%DATADIR%%/system/library/video/musicvideos/genres.xml
+%%DATADIR%%/system/library/video/musicvideos/index.xml
+%%DATADIR%%/system/library/video/musicvideos/studios.xml
+%%DATADIR%%/system/library/video/musicvideos/tags.xml
+%%DATADIR%%/system/library/video/musicvideos/titles.xml
+%%DATADIR%%/system/library/video/musicvideos/years.xml
+%%DATADIR%%/system/library/video/playlists.xml
+%%DATADIR%%/system/library/video/recentlyaddedepisodes.xml
+%%DATADIR%%/system/library/video/recentlyaddedmovies.xml
+%%DATADIR%%/system/library/video/recentlyaddedmusicvideos.xml
+%%DATADIR%%/system/library/video/tvshows/actors.xml
+%%DATADIR%%/system/library/video/tvshows/genres.xml
+%%DATADIR%%/system/library/video/tvshows/index.xml
+%%DATADIR%%/system/library/video/tvshows/studios.xml
+%%DATADIR%%/system/library/video/tvshows/tags.xml
+%%DATADIR%%/system/library/video/tvshows/titles.xml
+%%DATADIR%%/system/library/video/tvshows/years.xml
+%%DATADIR%%/system/library/video_flat/addons.xml
+%%DATADIR%%/system/library/video_flat/files.xml
+%%DATADIR%%/system/library/video_flat/inprogressshows.xml
+%%DATADIR%%/system/library/video_flat/movies.xml
+%%DATADIR%%/system/library/video_flat/musicvideos.xml
+%%DATADIR%%/system/library/video_flat/playlists.xml
+%%DATADIR%%/system/library/video_flat/recentlyaddedepisodes.xml
+%%DATADIR%%/system/library/video_flat/recentlyaddedmovies.xml
+%%DATADIR%%/system/library/video_flat/recentlyaddedmusicvideos.xml
+%%DATADIR%%/system/library/video_flat/tvshows.xml
 %%DATADIR%%/system/peripherals.xml
 %%DATADIR%%/system/playercorefactory.xml
 %%DATADIR%%/system/players/dvdplayer/etc/fonts/conf.avail/10-autohint.conf
@@ -1011,6 +1332,12 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/system/players/dvdplayer/etc
 @dirrm %%DATADIR%%/system/players/dvdplayer
 @dirrm %%DATADIR%%/system/players
+@dirrm %%DATADIR%%/system/library/video_flat
+@dirrm %%DATADIR%%/system/library/video/tvshows
+@dirrm %%DATADIR%%/system/library/video/musicvideos
+@dirrm %%DATADIR%%/system/library/video/movies
+@dirrm %%DATADIR%%/system/library/video
+@dirrm %%DATADIR%%/system/library
 @dirrm %%DATADIR%%/system/keymaps/nyxboard
 @dirrm %%DATADIR%%/system/keymaps
 @dirrm %%DATADIR%%/system
@@ -1023,6 +1350,7 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/language/Thai
 @dirrm %%DATADIR%%/language/Swedish
 @dirrm %%DATADIR%%/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/language/Spanish
 @dirrm %%DATADIR%%/language/Slovenian
 @dirrm %%DATADIR%%/language/Slovak
@@ -1035,6 +1363,7 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/language/Polish
 @dirrm %%DATADIR%%/language/Norwegian
 @dirrm %%DATADIR%%/language/Maltese
+@dirrm %%DATADIR%%/language/Macedonian
 @dirrm %%DATADIR%%/language/Lithuanian
 @dirrm %%DATADIR%%/language/Korean
 @dirrm %%DATADIR%%/language/Japanese
@@ -1046,8 +1375,10 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/language/Hebrew
 @dirrm %%DATADIR%%/language/Greek
 @dirrm %%DATADIR%%/language/German
+@dirrm %%DATADIR%%/language/Galician
 @dirrm %%DATADIR%%/language/French
 @dirrm %%DATADIR%%/language/Finnish
+@dirrm %%DATADIR%%/language/Estonian
 @dirrm %%DATADIR%%/language/Esperanto
 @dirrm %%DATADIR%%/language/English (US)
 @dirrm %%DATADIR%%/language/English
@@ -1060,6 +1391,7 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/language/Catalan
 @dirrm %%DATADIR%%/language/Bulgarian
 @dirrm %%DATADIR%%/language/Bosnian
+@dirrm %%DATADIR%%/language/Belarusian
 @dirrm %%DATADIR%%/language/Basque
 @dirrm %%DATADIR%%/language/Arabic
 @dirrm %%DATADIR%%/language/Afrikaans
@@ -1074,90 +1406,253 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/webinterface.default/images
 @dirrm %%DATADIR%%/addons/webinterface.default/css
 @dirrm %%DATADIR%%/addons/webinterface.default
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Ukrainian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Turkish
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Thai
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Spanish (Argentina)
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Spanish
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Slovenian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Slovak
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Serbian (Cyrillic)
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Serbian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Russian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Romanian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Portuguese (Brazil)
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Portuguese
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Polish
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Lithuanian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Korean
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Japanese
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Italian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Icelandic
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Greek
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/German
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Galician
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/French
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Finnish
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Estonian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/English (US)
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/English
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Danish
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Czech
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Croatian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Traditional)
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Catalan
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Bosnian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Basque
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Arabic
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/language/Afrikaans
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/language
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib/wunderground
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources/lib
+@dirrm %%DATADIR%%/addons/weather.wunderground/resources/logo
 @dirrm %%DATADIR%%/addons/weather.wunderground/resources
 @dirrm %%DATADIR%%/addons/weather.wunderground
 @dirrm %%DATADIR%%/addons/visualization.waveform
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Ukrainian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Turkish
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Thai
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Spanish
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Slovenian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Slovak
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Serbian (Cyrillic)
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Serbian
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Russian
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Romanian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese (Brazil)
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Portuguese
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Polish
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Lithuanian
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Korean
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Japanese
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Italian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Indonesian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Icelandic
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Hindi (Devanagiri)
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Greek
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/German
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Galician
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/French
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Finnish
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Estonian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Esperanto
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/English (US)
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/English
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Danish
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Czech
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Croatian
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Catalan
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Bosnian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Basque
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Arabic
+@dirrm %%DATADIR%%/addons/visualization.projectm/resources/language/Afrikaans
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources/language
 @dirrm %%DATADIR%%/addons/visualization.projectm/resources
 @dirrm %%DATADIR%%/addons/visualization.projectm
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Ukrainian
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Spanish
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovenian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Slovak
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Russian
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Romanian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese (Brazil)
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Portuguese
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Polish
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Lithuanian
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Korean
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Japanese
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Italian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Icelandic
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Greek
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/German
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Galician
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/French
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Finnish
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Estonian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/English (US)
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/English
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Danish
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Czech
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Croatian
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Catalan
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Arabic
+@dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language/Afrikaans
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources/language
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/resources
 @dirrm %%DATADIR%%/addons/visualization.milkdrop/presets
 @dirrm %%DATADIR%%/addons/visualization.milkdrop
-@dirrm %%DATADIR%%/addons/visualization.itunes
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Ukrainian
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Turkish
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Thai
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Spanish
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovenian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Slovak
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Serbian (Cyrillic)
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Serbian
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Russian
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Romanian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Portuguese (Brazil)
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Portuguese
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Polish
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Lithuanian
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Korean
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Japanese
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Italian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Indonesian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Icelandic
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Hindi (Devanagiri)
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Greek
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/German
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Galician
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/French
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Finnish
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Estonian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Esperanto
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/English (US)
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/English
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Danish
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Czech
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Croatian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Chinese (Traditional)
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Catalan
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Basque
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Bosnian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Arabic
+@dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language/Afrikaans
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources/language
 @dirrm %%DATADIR%%/addons/visualization.glspectrum/resources
 @dirrm %%DATADIR%%/addons/visualization.glspectrum
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Ukrainian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Turkish
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Thai
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Spanish
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovenian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Slovak
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Serbian (Cyrillic)
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Serbian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Russian
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Romanian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese (Brazil)
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Portuguese
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Polish
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Lithuanian
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Korean
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Japanese
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Italian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Indonesian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Icelandic
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hindi (Devanagiri)
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Greek
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/German
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Galician
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/French
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Finnish
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Estonian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Esperanto
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/English (US)
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/English
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Danish
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Czech
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Croatian
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Catalan
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Bosnian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Basque
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Arabic
+@dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language/Afrikaans
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources/language
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum/resources
 @dirrm %%DATADIR%%/addons/visualization.dxspectrum
@@ -1168,11 +1663,17 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/audio
 @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging/aspectratio
 @dirrm %%DATADIR%%/addons/skin.confluence/media/flagging
+@dirrm %%DATADIR%%/addons/skin.confluence/media/epg-genres
 @dirrm %%DATADIR%%/addons/skin.confluence/media/LeftRating
 @dirrm %%DATADIR%%/addons/skin.confluence/media/CenterRating
 @dirrm %%DATADIR%%/addons/skin.confluence/media
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Vietnamese
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Ukrainian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Turkish
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Thai
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Swedish
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Spanish
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Slovenian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Slovak
@@ -1183,32 +1684,48 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Portuguese (Brazil)
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Portuguese
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Polish
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Persian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Norwegian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Malayalam
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Macedonian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Lithuanian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Latvian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Korean
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Japanese
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Italian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Indonesian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Icelandic
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Hungarian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Hindi (Devanagiri)
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Hebrew
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Greek
 @dirrm %%DATADIR%%/addons/skin.confluence/language/German
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Galician
 @dirrm %%DATADIR%%/addons/skin.confluence/language/French
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Finnish
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Estonian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Esperanto
+@dirrm %%DATADIR%%/addons/skin.confluence/language/English (US)
 @dirrm %%DATADIR%%/addons/skin.confluence/language/English
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Dutch
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Danish
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Czech
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Croatian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Chinese (Traditional)
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Chinese (Simple)
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Catalan
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Bulgarian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Bosnian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Belarusian
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Basque
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Arabic
+@dirrm %%DATADIR%%/addons/skin.confluence/language/Albanian
 @dirrm %%DATADIR%%/addons/skin.confluence/language/Afrikaans
 @dirrm %%DATADIR%%/addons/skin.confluence/language
 @dirrm %%DATADIR%%/addons/skin.confluence/fonts
 @dirrm %%DATADIR%%/addons/skin.confluence/colors
 @dirrm %%DATADIR%%/addons/skin.confluence/backgrounds
-@dirrm %%DATADIR%%/addons/skin.confluence/720p/weather+
+@dirrm %%DATADIR%%/addons/skin.confluence/720p/weather
 @dirrm %%DATADIR%%/addons/skin.confluence/720p
 @dirrm %%DATADIR%%/addons/skin.confluence
 @dirrm %%DATADIR%%/addons/script.module.pil
@@ -1218,58 +1735,56 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/script.module.simplejson/lib/simplejson
 @dirrm %%DATADIR%%/addons/script.module.simplejson/lib
 @dirrm %%DATADIR%%/addons/script.module.simplejson
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Swedish
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Spanish
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Russian
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Romanian
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Polish
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Korean
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Hungarian
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/German
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/French
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Finnish
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/English
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Dutch
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources/language
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow/resources
-@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.slideshow
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Ukrainian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Thai
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish (Argentina)
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Spanish
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Slovak
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Russian
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Romanian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese (Brazil)
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Polish
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Lithuanian
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Korean
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Japanese
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Italian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Icelandic
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Greek
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/German
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Galician
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/French
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Finnish
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Estonian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English (US)
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/English
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Danish
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Czech
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Croatian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Traditional)
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Catalan
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Arabic
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Albanian
+@dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Afrikaans
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.dim
 @dirrm %%DATADIR%%/addons/screensaver.xbmc.builtin.black
-%%RSXS%%@dirrm %%DATADIR%%/addons/screensaver.rsxs.solarwinds
-%%RSXS%%@dirrm %%DATADIR%%/addons/screensaver.rsxs.plasma
-%%RSXS%%@dirrm %%DATADIR%%/addons/screensaver.rsxs.euphoria
+@dirrm %%DATADIR%%/addons/screensaver.rsxs.solarwinds
+@dirrm %%DATADIR%%/addons/screensaver.rsxs.plasma
+@dirrm %%DATADIR%%/addons/screensaver.rsxs.euphoria
 @dirrm %%DATADIR%%/addons/repository.xbmc.org
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Swedish
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Portuguese
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Polish
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Korean
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Hungarian
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Finnish
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/English
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language/Dutch
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources/language
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com/resources
-@dirrm %%DATADIR%%/addons/metadata.yahoomusic.com
 @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Swedish
 @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Spanish
 @dirrm %%DATADIR%%/addons/metadata.tvdb.com/resources/language/Russian
@@ -1304,46 +1819,63 @@ share/xsessions/XBMC.desktop
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources/language
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org/resources
 @dirrm %%DATADIR%%/addons/metadata.themoviedb.org
+@dirrm %%DATADIR%%/addons/metadata.musicvideos.last.fm/resources/language/English
+@dirrm %%DATADIR%%/addons/metadata.musicvideos.last.fm/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/metadata.musicvideos.last.fm/resources/language
+@dirrm %%DATADIR%%/addons/metadata.musicvideos.last.fm/resources
+@dirrm %%DATADIR%%/addons/metadata.musicvideos.last.fm
 @dirrm %%DATADIR%%/addons/metadata.common.themoviedb.org
+@dirrm %%DATADIR%%/addons/metadata.common.theaudiodb.com
+@dirrm %%DATADIR%%/addons/metadata.common.musicbrainz.org
 @dirrm %%DATADIR%%/addons/metadata.common.last.fm
 @dirrm %%DATADIR%%/addons/metadata.common.imdb.com
 @dirrm %%DATADIR%%/addons/metadata.common.htbackdrops.com
 @dirrm %%DATADIR%%/addons/metadata.common.hdtrailers.net
+@dirrm %%DATADIR%%/addons/metadata.common.fanart.tv
+@dirrm %%DATADIR%%/addons/metadata.common.amazon.de
 @dirrm %%DATADIR%%/addons/metadata.common.allmusic.com
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Swedish
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Spanish
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Russian
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Portuguese
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Polish
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Korean
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Hungarian
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/German
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/French
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Finnish
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/English
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Dutch
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Chinese (Simple)
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language/Bulgarian
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources/language
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com/resources
-@dirrm %%DATADIR%%/addons/metadata.artists.allmusic.com
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Swedish
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Spanish
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Russian
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Portuguese
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Polish
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Korean
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Hungarian
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/German
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/French
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Finnish
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/English
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Dutch
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Chinese (Simple)
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language/Bulgarian
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources/language
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com/resources
-@dirrm %%DATADIR%%/addons/metadata.albums.allmusic.com
+@dirrm %%DATADIR%%/addons/metadata.artists.universal/resources/language/English
+@dirrm %%DATADIR%%/addons/metadata.artists.universal/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/metadata.artists.universal/resources/language
+@dirrm %%DATADIR%%/addons/metadata.artists.universal/resources
+@dirrm %%DATADIR%%/addons/metadata.artists.universal
+@dirrm %%DATADIR%%/addons/metadata.artists.theaudiodb.com/resources/language/English
+@dirrm %%DATADIR%%/addons/metadata.artists.theaudiodb.com/resources/language
+@dirrm %%DATADIR%%/addons/metadata.artists.theaudiodb.com/resources
+@dirrm %%DATADIR%%/addons/metadata.artists.theaudiodb.com
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Swedish
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish (Mexico)
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish (Argentina)
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Spanish
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Slovak
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Russian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Portuguese (Brazil)
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Portuguese
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Polish
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Norwegian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Macedonian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Lithuanian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Korean
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Italian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Hungarian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Hebrew
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Greek
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/German
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/French
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/English
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Dutch
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Danish
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Czech
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Simple)
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Catalan
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Bulgarian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language/Belarusian
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources/language
+@dirrm %%DATADIR%%/addons/metadata.album.universal/resources
+@dirrm %%DATADIR%%/addons/metadata.album.universal
+@dirrm %%DATADIR%%/addons/library.xbmc.pvr
+@dirrm %%DATADIR%%/addons/library.xbmc.gui
+@dirrm %%DATADIR%%/addons/library.xbmc.addon
 @dirrm %%DATADIR%%/addons
 @dirrm share/xbmc
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -1362,8 +1894,11 @@ share/xsessions/XBMC.desktop
 @dirrm lib/xbmc/addons/visualization.waveform
 @dirrm lib/xbmc/addons/visualization.projectm
 @dirrm lib/xbmc/addons/visualization.glspectrum
-%%RSXS%%@dirrm lib/xbmc/addons/screensaver.rsxs.solarwinds
-%%RSXS%%@dirrm lib/xbmc/addons/screensaver.rsxs.plasma
-%%RSXS%%@dirrm lib/xbmc/addons/screensaver.rsxs.euphoria
+@dirrm lib/xbmc/addons/screensaver.rsxs.solarwinds
+@dirrm lib/xbmc/addons/screensaver.rsxs.plasma
+@dirrm lib/xbmc/addons/screensaver.rsxs.euphoria
+@dirrm lib/xbmc/addons/library.xbmc.pvr
+@dirrm lib/xbmc/addons/library.xbmc.gui
+@dirrm lib/xbmc/addons/library.xbmc.addon
 @dirrm lib/xbmc/addons
 @dirrm lib/xbmc