From owner-svn-ports-all@FreeBSD.ORG Tue Dec 18 13:43:04 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B109B786; Tue, 18 Dec 2012 13:43:04 +0000 (UTC) (envelope-from jadawin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 945528FC0C; Tue, 18 Dec 2012 13:43:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBIDh4in053562; Tue, 18 Dec 2012 13:43:04 GMT (envelope-from jadawin@svn.freebsd.org) Received: (from jadawin@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBIDh3vh053555; Tue, 18 Dec 2012 13:43:03 GMT (envelope-from jadawin@svn.freebsd.org) Message-Id: <201212181343.qBIDh3vh053555@svn.freebsd.org> From: Philippe Audeoud Date: Tue, 18 Dec 2012 13:43:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309182 - in head/multimedia/xbmc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Dec 2012 13:43:04 -0000 Author: jadawin Date: Tue Dec 18 13:43:02 2012 New Revision: 309182 URL: http://svnweb.freebsd.org/changeset/ports/309182 Log: - Update to 12.rc1 PR: ports/173599 Submitted by: Mickael Maillot (maintainer) Added: head/multimedia/xbmc/files/patch-clang (contents, props changed) head/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp (contents, props changed) head/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp (contents, props changed) Deleted: head/multimedia/xbmc/files/patch-Makefile.in head/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__cpluff.c head/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__logging.c head/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__pinfo.c head/multimedia/xbmc/files/patch-lib__cpluff__libcpluff__psymbol.c head/multimedia/xbmc/files/patch-lib__cximage-6.0__raw__dcr.c head/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__event.cpp head/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6510__mos6510.h head/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos6526__mos6526.h head/multimedia/xbmc/files/patch-lib__libsidplay2__libsidplay__src__mos656x__mos656x.h head/multimedia/xbmc/files/patch-lib__timidity__interface__w32g.h head/multimedia/xbmc/files/patch-lib__timidity__timidity__gogo_a.c head/multimedia/xbmc/files/patch-m4__ax_python_devel.m4 head/multimedia/xbmc/files/patch-tools__TexturePacker__XBTFWriter.cpp head/multimedia/xbmc/files/patch-xbmc__addons__Addon.cpp head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h head/multimedia/xbmc/files/patch-xbmc__cores__dvdplayer__DVDDemuxers__DVDDemuxFFmpeg.cpp head/multimedia/xbmc/files/patch-xbmc__filesystem__SAPDirectory.cpp head/multimedia/xbmc/files/patch-xbmc__interfaces__python__XBPython.cpp head/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c head/multimedia/xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h head/multimedia/xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp head/multimedia/xbmc/files/patch-xbmc__linux__Makefile.in head/multimedia/xbmc/files/patch-xbmc__linux__PlatformDefs.h head/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.cpp head/multimedia/xbmc/files/patch-xbmc__linux__XThreadUtils.h head/multimedia/xbmc/files/patch-xbmc__network__Network.cpp head/multimedia/xbmc/files/patch-xbmc__network__Socket.h head/multimedia/xbmc/files/patch-xbmc__network__linux__NetworkLinux.cpp head/multimedia/xbmc/files/patch-xbmc__storage__IoSupport.cpp head/multimedia/xbmc/files/patch-xbmc__threads__Thread.h head/multimedia/xbmc/files/patch-xbmc__utils__StdString.h head/multimedia/xbmc/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__fftsg.cpp head/multimedia/xbmc/files/patch-xbmc__windowing__X11__XRandR.cpp Modified: head/multimedia/xbmc/Makefile (contents, props changed) head/multimedia/xbmc/distinfo (contents, props changed) head/multimedia/xbmc/files/patch-configure.in (contents, props changed) head/multimedia/xbmc/pkg-plist (contents, props changed) Modified: head/multimedia/xbmc/Makefile ============================================================================== --- head/multimedia/xbmc/Makefile Tue Dec 18 13:41:28 2012 (r309181) +++ head/multimedia/xbmc/Makefile Tue Dec 18 13:43:02 2012 (r309182) @@ -1,15 +1,8 @@ -# New ports collection makefile for: xbmc -# Date created: 2010-09-16 -# Whom: Mickael Maillot -# # $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}/converte 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/ 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/ 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/ 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 +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 .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}/n 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 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 + ${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 -pre-configure: - cd ${WRKSRC} && ./bootstrap +post-install: + @${INSTALL_MAN} ${WRKSRC}/docs/manpages/xbmc.bin.1 ${MAN1PREFIX}/man/man1 .include Modified: head/multimedia/xbmc/distinfo ============================================================================== --- head/multimedia/xbmc/distinfo Tue Dec 18 13:41:28 2012 (r309181) +++ head/multimedia/xbmc/distinfo Tue Dec 18 13:43:02 2012 (r309182) @@ -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 Added: head/multimedia/xbmc/files/patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/xbmc/files/patch-clang Tue Dec 18 13:43:02 2012 (r309182) @@ -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 Modified: head/multimedia/xbmc/files/patch-configure.in ============================================================================== --- head/multimedia/xbmc/files/patch-configure.in Tue Dec 18 13:41:28 2012 (r309181) +++ head/multimedia/xbmc/files/patch-configure.in Tue Dec 18 13:43:02 2012 (r309182) @@ -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 Added: head/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/xbmc/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp Tue Dec 18 13:43:02 2012 (r309182) @@ -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()); Added: head/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp Tue Dec 18 13:43:02 2012 (r309182) @@ -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(); Modified: head/multimedia/xbmc/pkg-plist ============================================================================== --- head/multimedia/xbmc/pkg-plist Tue Dec 18 13:41:28 2012 (r309181) +++ head/multimedia/xbmc/pkg-plist Tue Dec 18 13:43:02 2012 (r309182) @@ -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%%-freeb 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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***