libFLAC.so:audio/flac \

		libcrossguid.so:devel/libcrossguid \

		libdcadec.so:multimedia/libdcadec \

		liblzo2.so:archivers/lzo2 \

diff --git Makefile.include.in Makefile.include.in

index 6ee228a..daeb046 100644

--- Makefile.include.in

+++ Makefile.include.in

@@ -43,7 +43,8 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui

 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon

 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr

 INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec

-INCLUDES+=$(sort @INCLUDES@)

+#INCLUDES+=$(sort @INCLUDES@)

+INCLUDES+=@INCLUDES@

 INCLUDES+=-I@abs_top_srcdir@/xbmc/linux

 INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer

 DEFINES+= \

@@ -91,22 +92,22 @@ GEN_DEPS=\

 %.o: %.cpp

 	@rm -f $@

-	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \

+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \

 	&& $(GEN_DEPS)

 %.o: %.cc

 	@rm -f $@

-	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \

+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \

 	&& $(GEN_DEPS)

 %.o: %.c

 	@rm -f $@

-	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \

+	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \

 	&& $(GEN_DEPS)

 %.o: %.C

 	@rm -f $@

-	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \

+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \

 	&& $(GEN_DEPS)

 %.o: %.S

diff --git lib/cpluff/configure.ac lib/cpluff/configure.ac

index bb69d19a..4316766 100644

--- lib/cpluff/configure.ac

+++ lib/cpluff/configure.ac

@@ -109,12 +109,12 @@ if test "$enable_threads" != no; then

     AC_LINK_IFELSE(

 [AC_LANG_SOURCE([#include <pthread.h>

-int main(int argc, char **argv) {

+[int main(int argc, char **argv) {

 	pthread_mutex_t mutex;

 	pthread_mutex_init(&mutex, NULL);

 	return 0;

-}

+}]

 ])], [AC_MSG_RESULT([yes])

 cp_threads=Posix], AC_MSG_RESULT([no]))

   fi

@@ -126,10 +126,10 @@ cp_threads=Posix], AC_MSG_RESULT([no]))

     AC_LINK_IFELSE(

 [AC_LANG_SOURCE([#include <windows.h>

-int main(int argc, char **argv) {

+[int main(int argc, char **argv) {

   CreateMutex(NULL, FALSE, NULL);

   return 0;

-}

+}]

 ])], [AC_MSG_RESULT([yes])

 cp_threads=Windows], AC_MSG_RESULT([no]))

   fi

      target_platform=target_linux

--- configure.ac.orig	2015-08-16 14:37:32 UTC

+++ configure.ac

@@ -636,10 +636,12 @@

   i386-*-freebsd*)

      ARCH="x86-freebsd"

      MAKE="gmake"

+     USE_STATIC_FFMPEG=1

      ;;

   amd64-*-freebsd*)

      ARCH="x86_64-freebsd"

      MAKE="gmake"

+     USE_STATIC_FFMPEG=1

      ;;

   arm-apple-darwin*)

      use_joystick=no

@@ -824,10 +826,16 @@

 # platform specific flags

 if echo "$ARCH" | grep -q "freebsd" ; then

   LOCALBASE="${LOCALBASE:-/usr/local}"

-  CFLAGS="$CFLAGS -I$LOCALBASE/include"

-  CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"

-  CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"

+  CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"

+  CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"

+  CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"

   LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"

+  CC_FOR_BUILD="$CC"

+  CXX_FOR_BUILD="$CXX"

+  CFLAGS_FOR_BUILD="$CFLAGS"

+  CXXFLAGS_FOR_BUILD="$CXXFLAGS"

+  LDFLAGS_FOR_BUILD="$LDFLAGS"

+  FFMPEG_OPTS="--cc=$CC --cxx=$CXX"

 fi

 if test "$host_vendor" = "apple" ; then

   # standard application paths

@@ -960,6 +968,7 @@

 # Check inotify availability

 AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)

+AC_CHECK_LIB([inotify], [main],,)

 # Checks for boost headers using CXX instead of CC

 AC_LANG_PUSH([C++])

@@ -1257,12 +1266,13 @@

 )

 #Check to see if libs are needed for functions that are often built-in to libc

-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))

+AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))

 AC_SEARCH_LIBS([dlopen],dl)

 AC_SEARCH_LIBS([clock_gettime],rt)

 AC_SEARCH_LIBS([dn_expand],  resolv)

 AC_SEARCH_LIBS([_dn_expand], resolv)

 AC_SEARCH_LIBS([__dn_expand],resolv)

+AC_SEARCH_LIBS([__atomic_load_8], [atomic])

 # platform dependent libraries

 if test "$host_vendor" = "apple" ; then

@@ -1727,7 +1737,7 @@

   if test "$cross_compiling" != "yes"; then

     if test "$use_debug" != "yes"; then

-      FFMPEG_OPTS="-r"

+      FFMPEG_OPTS="${FFMPEG_OPTS} -r"

     fi

     if test "$use_optimizations" != "yes"; then

       FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"

@@ -1738,7 +1748,7 @@

       SAVE_LIBS="$LIBS"

       # check for system installed ffmpeg. We require minimum versions.

       PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],

-        [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],

+        [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],

         [FFMPEG_FOUND="false"])

       if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then

@@ -1765,7 +1775,7 @@

     elif test "$with_ffmpeg" = "force"; then

       # always build our ffmpeg

       AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")

-      CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS}

+      CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} || exit 1

       export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"

     elif test "$with_ffmpeg" != "no"; then

@@ -1778,7 +1788,7 @@

 if test "$FFMPEG_FOUND" != "true"; then

   PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],

-    [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"], 

+    [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"], 

     [AC_MSG_ERROR("ffmpeg not found")])

 fi

@@ -2173,7 +2183,7 @@

 # we don't compile with default upstream squish, so we use our own one

 # even on non unified deps platforms

 if test "$cross_compiling" != "yes"; then

-  make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}

+  $MAKE -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}

   export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"

 fi

 PKG_CHECK_MODULES([SQUISH], [squish],

@@ -2184,7 +2194,7 @@

   AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],

     [$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])

   if test "$TEXTUREPACKER" = "none"; then

-    make -C ${abs_top_srcdir}/tools/depends/native/TexturePacker

+    $MAKE -C ${abs_top_srcdir}/tools/depends/native/TexturePacker

     TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"

   fi

   if test -x "$TEXTUREPACKER"; then

@@ -2448,6 +2458,8 @@

   LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"

 fi

+LIBS=$(echo "$LIBS" | tr "\n" " ")

+

 OUTPUT_FILES="Makefile \

     Makefile.include \

     addons/skin.confluence/media/Makefile \

--- tools/depends/target/ffmpeg/FFmpeg-2.6.4-Isengard/libavutil/x86/asm.h.orig	2015-08-02 10:35:17 UTC

+++ tools/depends/target/ffmpeg/FFmpeg-2.6.4-Isengard/libavutil/x86/asm.h

@@ -71,7 +71,7 @@ typedef int32_t x86_reg;

 typedef int x86_reg;

 #endif

-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))

+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))

 #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))

 #if ARCH_X86_64 && defined(PIC)

diff --git lib/cpluff/autogen.sh lib/cpluff/autogen.sh

index ee0a418..efd5291 100755

--- lib/cpluff/autogen.sh

+++ lib/cpluff/autogen.sh

@@ -15,7 +15,7 @@ fi

 # Generate files in top level directory

 cd "$basedir"

-autopoint

+#autopoint

 rm -f ABOUT-NLS

 test -d auxliary || mkdir auxliary

 libtoolize --automake -f

diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile

index 0e08dcf..e94d78f 100644

--- tools/depends/target/ffmpeg/Makefile

+++ tools/depends/target/ffmpeg/Makefile

@@ -21,6 +21,11 @@ ffmpg_config += --enable-encoder=wmav2 --enable-protocol=http

 ifeq ($(CROSS_COMPILING), yes)

   ffmpg_config += --arch=$(CPU) --enable-cross-compile

 endif

+ifeq ($(OS), freebsd)

+  ffmpg_config += --target-os=$(OS) --cpu=$(CPU)

+  ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls

+  ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis

+endif

 ifeq ($(OS), linux)

   ffmpg_config += --target-os=$(OS) --cpu=$(CPU)

   ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls

diff --git xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp

index 2b6e646..babfe89 100644

--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp

+++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp

@@ -289,6 +289,8 @@ bool CAESinkOSS::Initialize(AEAudioFormat &format, std::string &device)

 #endif

   int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES;

+  if (AE_IS_RAW_HD(format.m_dataFormat) && m_initFormat.m_dataFormat != AE_FMT_LPCM)

+    tmp *= 8;

   int pos = 0;

   while ((tmp & 0x1) == 0x0)

   {

--- lib/cpluff/autogen.sh.orig	2016-02-20 15:21:19 UTC

+++ lib/cpluff/autogen.sh

@@ -15,7 +15,7 @@ fi

 # Generate files in top level directory

 cd "$basedir"

-autopoint

+#autopoint

 rm -f ABOUT-NLS

 test -d auxliary || mkdir auxliary

 libtoolize --automake -f

--- lib/cpluff/configure.ac.orig	2016-02-20 15:21:19 UTC

+++ lib/cpluff/configure.ac

@@ -109,12 +109,12 @@ if test "$enable_threads" != no; then

     AC_LINK_IFELSE(

 [AC_LANG_SOURCE([#include <pthread.h>

-int main(int argc, char **argv) {

+[int main(int argc, char **argv) {

 	pthread_mutex_t mutex;

 	pthread_mutex_init(&mutex, NULL);

 	return 0;

-}

+}]

 ])], [AC_MSG_RESULT([yes])

 cp_threads=Posix], AC_MSG_RESULT([no]))

   fi

@@ -126,10 +126,10 @@ cp_threads=Posix], AC_MSG_RESULT([no]))

     AC_LINK_IFELSE(

 [AC_LANG_SOURCE([#include <windows.h>

-int main(int argc, char **argv) {

+[int main(int argc, char **argv) {

   CreateMutex(NULL, FALSE, NULL);

   return 0;

-}

+}]

 ])], [AC_MSG_RESULT([yes])

 cp_threads=Windows], AC_MSG_RESULT([no]))

   fi

--- lib/cximage-6.0/raw/dcraw.c.orig	2015-03-26 18:25:20 UTC

+++ lib/cximage-6.0/raw/dcraw.c

@@ -820,7 +820,8 @@ struct jhead {

 int CLASS ljpeg_start (struct jhead *jh, int info_only)

 {

-  int c, tag, len;

+  int c, tag;

+  ushort len;

   uchar data[0x10000], *dp;

   init_decoder();

--- tools/depends/target/ffmpeg/autobuild.sh.orig	2015-08-16 14:37:32 UTC

+++ tools/depends/target/ffmpeg/autobuild.sh

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/sh

 #

 #      Copyright (C) 2005-2013 Team XBMC

 #      http://xbmc.org

@@ -27,7 +27,8 @@ BASE_URL=$(grep "BASE_URL=" FFMPEG-VERSI

 VERSION=$(grep "VERSION=" FFMPEG-VERSION | sed 's/VERSION=//g')

 ARCHIVE=ffmpeg-${VERSION}.tar.gz

-function usage {

+usage()

+{

   echo "usage $(basename $0) 

        [-p | --prefix]    ... ffmepg install prefix

        [-d | --download]  ... no build, download tarfile only

@@ -82,6 +83,14 @@ do

       FLAGS="$FLAGS --extra-cxxflags=\"${1#*=}\""

       shift

       ;;

+    --cc=*)

+      FLAGS="$FLAGS --cc=${1#*=}"

+      shift

+      ;;

+    --cxx=*)

+      FLAGS="$FLAGS --cxx=${1#*=}"

+      shift

+      ;;

     -j)

       BUILDTHREADS=$2

       shift 2

@@ -100,7 +109,7 @@ do

   esac

 done

-BUILDTHREADS=${BUILDTHREADS:-$(grep -c "^processor" /proc/cpuinfo)}

+BUILDTHREADS=${BUILDTHREADS:-$(sysctl -n hw.ncpu)}

 [ ${BUILDTHREADS} -eq 0 ] && BUILDTHREADS=1

 [ -z ${VERSION} ] && exit 3

@@ -110,10 +119,10 @@ then

   [ "$VERSION" == "$CURVER" ] && exit 0

 fi

-[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz

+#[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz

 [ $downloadonly ] && exit 0

-[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1

+#[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1

 if [ -d ${FFMPEG_PREFIX} ]

 then

   [ -w ${FFMPEG_PREFIX} ] || SUDO="sudo"

@@ -121,9 +130,9 @@ else

   [ -w $(dirname ${FFMPEG_PREFIX}) ] || SUDO="sudo"

 fi

-mkdir ffmpeg-${VERSION}

-cd ffmpeg-${VERSION} || exit 2

-tar --strip-components=1 -xf ../${ARCHIVE}

+#mkdir ffmpeg-${VERSION}

+cd FFmpeg-${VERSION} || exit 2

+#tar --strip-components=1 -xf ../${ARCHIVE}

 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \

 ./configure --prefix=$FFMPEG_PREFIX \

@@ -161,11 +170,11 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LD

 	--disable-mipsdspr2 \

         ${FLAGS}

-make -j ${BUILDTHREADS} 

+gmake -j ${BUILDTHREADS} 

 if [ $? -eq 0 ]

 then

   [ ${SUDO} ] && echo "Root privileges are required to install to ${FFMPEG_PREFIX}"

-  ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed

+  ${SUDO} gmake install && echo "$VERSION" > ../.ffmpeg-installed

 else

   echo "ERROR: Building ffmpeg failed"

   exit 1

--- tools/depends/target/ffmpeg/FFmpeg-2.8.6-Jarvis-16.0/libavutil/x86/asm.h.orig	2016-02-03 20:33:07 UTC

+++ tools/depends/target/ffmpeg/FFmpeg-2.8.6-Jarvis-16.0/libavutil/x86/asm.h

@@ -72,7 +72,7 @@ typedef int32_t x86_reg;

 typedef int x86_reg;

 #endif

-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))

+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))

 #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))

 #if ARCH_X86_64 && defined(PIC)

--- tools/depends/target/ffmpeg/Makefile.orig	2016-02-20 15:21:19 UTC

+++ tools/depends/target/ffmpeg/Makefile

@@ -24,6 +24,11 @@ ffmpg_config += --enable-libdcadec

 ifeq ($(CROSS_COMPILING), yes)

   ffmpg_config += --arch=$(CPU) --enable-cross-compile

 endif

+ifeq ($(OS), freebsd)

+  ffmpg_config += --target-os=$(OS) --cpu=$(CPU)

+  ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls

+  ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis

+endif

 ifeq ($(OS), linux)

   ffmpg_config += --target-os=$(OS) --cpu=$(CPU)

   ffmpg_config += --enable-vdpau --enable-vaapi

--- tools/depends/target/ffmpeg/autobuild.sh.orig	2016-02-20 15:21:19 UTC

+++ tools/depends/target/ffmpeg/autobuild.sh

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/sh

 #

 #      Copyright (C) 2005-2013 Team XBMC

 #      http://xbmc.org

@@ -27,7 +27,8 @@ BASE_URL=$(grep "BASE_URL=" FFMPEG-VERSI

 VERSION=$(grep "VERSION=" FFMPEG-VERSION | sed 's/VERSION=//g')

 ARCHIVE=ffmpeg-${VERSION}.tar.gz

-function usage {

+usage()

+{

   echo "usage $(basename $0) 

        [-p | --prefix]    ... ffmepg install prefix

        [-d | --download]  ... no build, download tarfile only

@@ -82,6 +83,14 @@ do

       FLAGS="$FLAGS --extra-cxxflags=\"${1#*=}\""

       shift

       ;;

+    --cc=*)

+      FLAGS="$FLAGS --cc=${1#*=}"

+      shift

+      ;;

+    --cxx=*)

+      FLAGS="$FLAGS --cxx=${1#*=}"

+      shift

+      ;;

     -j)

       BUILDTHREADS=$2

       shift 2

@@ -100,7 +109,7 @@ do

   esac

 done

-BUILDTHREADS=${BUILDTHREADS:-$(grep -c "^processor" /proc/cpuinfo)}

+BUILDTHREADS=${BUILDTHREADS:-$(sysctl -n hw.ncpu)}

 [ ${BUILDTHREADS} -eq 0 ] && BUILDTHREADS=1

 [ -z ${VERSION} ] && exit 3

@@ -110,10 +119,10 @@ then

   [ "$VERSION" == "$CURVER" ] && exit 0

 fi

-[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz

+#[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz

 [ $downloadonly ] && exit 0

-[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1

+#[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1

 if [ -d ${FFMPEG_PREFIX} ]

 then

   [ -w ${FFMPEG_PREFIX} ] || SUDO="sudo"

@@ -121,9 +130,9 @@ else

   [ -w $(dirname ${FFMPEG_PREFIX}) ] || SUDO="sudo"

 fi

-mkdir ffmpeg-${VERSION}

-cd ffmpeg-${VERSION} || exit 2

-tar --strip-components=1 -xf ../${ARCHIVE}

+#mkdir ffmpeg-${VERSION}

+cd FFmpeg-${VERSION} || exit 2

+#tar --strip-components=1 -xf ../${ARCHIVE}

 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \

 ./configure --prefix=$FFMPEG_PREFIX \

@@ -162,11 +171,11 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LD

 	--enable-libdcadec \

         ${FLAGS}

-make -j ${BUILDTHREADS} 

+gmake -j ${BUILDTHREADS} 

 if [ $? -eq 0 ]

 then

   [ ${SUDO} ] && echo "Root privileges are required to install to ${FFMPEG_PREFIX}"

-  ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed

+  ${SUDO} gmake install && echo "$VERSION" > ../.ffmpeg-installed

 else

   echo "ERROR: Building ffmpeg failed"

   exit 1

--- xbmc/LangInfo.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/LangInfo.cpp

@@ -282,8 +282,8 @@ void CLangInfo::CRegion::SetGlobalLocale

   // decimal separator is changed depending of the current language

   // (ie. "," in French or Dutch instead of "."). This breaks atof() and

   // others similar functions.

-#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN_OSX) || defined(__UCLIBC__)

-  // on FreeBSD, darwin and uClibc-based systems libstdc++ is compiled with

+#if defined(TARGET_DARWIN_OSX) || defined(__UCLIBC__)

+  // on darwin and uClibc-based systems libstdc++ is compiled with

   // "generic" locale support

   if (setlocale(LC_COLLATE, strLocale.c_str()) == NULL

   || setlocale(LC_CTYPE, strLocale.c_str()) == NULL)

--- xbmc/LangInfo.cpp.orig	2015-07-21 18:41:29 UTC

+++ xbmc/LangInfo.cpp

@@ -275,8 +275,8 @@

   // decimal separator is changed depending of the current language

   // (ie. "," in French or Dutch instead of "."). This breaks atof() and

   // others similar functions.

-#if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN_OSX) || defined(__UCLIBC__)

-  // on FreeBSD, darwin and uClibc-based systems libstdc++ is compiled with

+#if defined(TARGET_DARWIN_OSX) || defined(__UCLIBC__)

+  // on darwin and uClibc-based systems libstdc++ is compiled with

   // "generic" locale support

   if (setlocale(LC_COLLATE, strLocale.c_str()) == NULL

   || setlocale(LC_CTYPE, strLocale.c_str()) == NULL)

--- xbmc/cores/dvdplayer/DVDDemuxSPU.cpp.orig	2015-06-23 09:40:13 UTC

+++ xbmc/cores/dvdplayer/DVDDemuxSPU.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "DVDDemuxSPU.h"

 #include "DVDClock.h"

 #include "utils/log.h"

--- xbmc/dialogs/GUIDialogGamepad.cpp.orig	2015-04-13 10:34:31 UTC

+++ xbmc/dialogs/GUIDialogGamepad.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIDialogGamepad.h"

 #include "utils/md5.h"

 #include "utils/StringUtils.h"

--- xbmc/dialogs/GUIDialogNumeric.cpp.orig	2015-04-13 10:36:23 UTC

+++ xbmc/dialogs/GUIDialogNumeric.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIDialogNumeric.h"

 #include "guilib/GUILabelControl.h"

 #include "utils/md5.h"

--- xbmc/guilib/GUIAction.cpp.orig	2015-04-13 12:41:36 UTC

+++ xbmc/guilib/GUIAction.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIAction.h"

 #include "utils/StringUtils.h"

 #include "GUIWindowManager.h"

--- xbmc/guilib/GUISpinControl.cpp.orig	2015-04-13 12:48:49 UTC

+++ xbmc/guilib/GUISpinControl.cpp

@@ -22,6 +22,7 @@

 #include "input/Key.h"

 #include "utils/StringUtils.h"

 #include <stdio.h>

+#include <stdlib.h>

 using namespace std;

--- xbmc/guilib/TextureBundleXPR.h.orig	2015-08-08 17:27:25 UTC

+++ xbmc/guilib/TextureBundleXPR.h

@@ -24,6 +24,7 @@

 #include <string>

 #include <stdint.h>

 #include <vector>

+#include <ctime>

 class CAutoTexBuffer;

 class CBaseTexture;

--- xbmc/guilib/XBTF.h.orig	2015-08-08 15:41:42 UTC

+++ xbmc/guilib/XBTF.h

@@ -22,6 +22,7 @@

 #include <string>

 #include <vector>

+#include <ctime>

 #include <stdint.h>

 #define XBTF_MAGIC "XBTF"

--- xbmc/interfaces/legacy/Dialog.cpp.orig	2015-04-13 10:42:40 UTC

+++ xbmc/interfaces/legacy/Dialog.cpp

@@ -19,6 +19,7 @@

  */

 #include "LanguageHook.h"

+#include <stdlib.h>

 #include "dialogs/GUIDialogOK.h"

 #include "dialogs/GUIDialogYesNo.h"

 #include "dialogs/GUIDialogSelect.h"

--- xbmc/linux/XFileUtils.cpp.orig	2014-12-20 16:29:11 UTC

+++ xbmc/linux/XFileUtils.cpp

@@ -36,6 +36,7 @@

 #endif

 #include <dirent.h>

 #include <errno.h>

+#include <stdlib.h>

 #if defined(TARGET_ANDROID)

 #include <sys/file.h>

--- xbmc/main/main.cpp.orig	2015-04-13 12:43:35 UTC

+++ xbmc/main/main.cpp

@@ -28,6 +28,7 @@

 #ifdef TARGET_POSIX

 #include <sys/resource.h>

 #include <signal.h>

+#include <locale.h>

 #endif

 #if defined(TARGET_DARWIN_OSX)

   #include "Util.h"

@@ -35,7 +36,6 @@

   #ifdef HAS_SDL

     #include <SDL/SDL.h>

   #endif

-#include <locale.h>

 #endif

 #ifdef HAS_LIRC

 #include "input/linux/LIRC.h"

--- xbmc/pvr/PVRActionListener.cpp.orig	2015-04-13 10:38:08 UTC

+++ xbmc/pvr/PVRActionListener.cpp

@@ -32,6 +32,7 @@

 #include "settings/Settings.h"

 #include "utils/log.h"

 #include "utils/StringUtils.h"

+#include <stdlib.h>

 #include "pvr/PVRManager.h"

 #include "pvr/channels/PVRChannelGroupsContainer.h"

--- xbmc/settings/AdvancedSettings.cpp.orig	2015-04-21 18:46:28 UTC

+++ xbmc/settings/AdvancedSettings.cpp

@@ -208,7 +208,7 @@

   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-1][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)";

   m_videoCleanStringRegExps.clear();

-  m_videoCleanStringRegExps.push_back("[ _\\,\\.\\(\\)\\[\\]\\-](ac3|dts|custom|dc|remastered|divx|divx5|dsr|dsrip|dutch|dvd|dvd5|dvd9|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|extended|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|3d|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");

+  m_videoCleanStringRegExps.push_back("[ _\\,\\.\\(\\)\\[\\]\\-](ac3|dts|custom|dc|remastered|divx|divx5|dsr|dsrip|dutch|dvd|dvd5|dvd9|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|french|multi|german|read.nfo|nfofix|unrated|extended|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|3d|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");

   m_videoCleanStringRegExps.push_back("(\\[.*\\])");

   m_moviesExcludeFromScanRegExps.clear();

--- xbmc/storage/linux/DeviceKitDisksProvider.cpp.orig	2015-04-13 10:45:50 UTC

+++ xbmc/storage/linux/DeviceKitDisksProvider.cpp

@@ -19,6 +19,7 @@

  */

 #include "DeviceKitDisksProvider.h"

 #ifdef HAS_DBUS

+#include <stdlib.h>

 #include "settings/AdvancedSettings.h"

 #include "guilib/LocalizeStrings.h"

 #include "utils/log.h"

--- xbmc/storage/linux/UDisksProvider.cpp.orig	2015-04-13 12:39:11 UTC

+++ xbmc/storage/linux/UDisksProvider.cpp

@@ -19,6 +19,7 @@

  */

 #include "UDisksProvider.h"

 #ifdef HAS_DBUS

+#include <stdlib.h>

 #include "settings/AdvancedSettings.h"

 #include "guilib/LocalizeStrings.h"

 #include "utils/log.h"

--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig	2014-12-22 23:11:35 UTC

+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp

@@ -31,9 +31,8 @@

 #include <sys/param.h>

 #if __FreeBSD_version < 900031

 #include <sys/thr.h>

-#else

-#include <pthread_np.h>

 #endif

+#include <pthread_np.h>

 #endif

 #include <signal.h>

--- xbmc/utils/CharsetConverter.cpp.orig	2015-08-10 08:41:28 UTC

+++ xbmc/utils/CharsetConverter.cpp

@@ -67,7 +67,7 @@

   #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX

   #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX

   #define UTF8_SOURCE "UTF-8"

-  #define WCHAR_CHARSET "WCHAR_T"

+  #define WCHAR_CHARSET UTF32_CHARSET

   #if __STDC_ISO_10646__

     #ifdef SIZEOF_WCHAR_T

       #if SIZEOF_WCHAR_T == 4

--- xbmc/windowing/WinEventsX11.cpp.orig	2015-04-13 10:40:08 UTC

+++ xbmc/windowing/WinEventsX11.cpp

@@ -23,6 +23,7 @@

 #ifdef HAS_X11_WIN_EVENTS

+#include <locale.h>

 #include "WinEvents.h"

 #include "WinEventsX11.h"

 #include "Application.h"

--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp

@@ -289,6 +289,8 @@ bool CAESinkOSS::Initialize(AEAudioForma

 #endif

   int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES;

+  if (AE_IS_RAW_HD(format.m_dataFormat) && m_initFormat.m_dataFormat != AE_FMT_LPCM)

+    tmp *= 8;

   int pos = 0;

   while ((tmp & 0x1) == 0x0)

   {

--- xbmc/cores/dvdplayer/DVDDemuxSPU.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/cores/dvdplayer/DVDDemuxSPU.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "DVDDemuxSPU.h"

 #include "DVDClock.h"

 #include "utils/log.h"

--- xbmc/dialogs/GUIDialogGamepad.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/dialogs/GUIDialogGamepad.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIDialogGamepad.h"

 #include "utils/md5.h"

 #include "utils/StringUtils.h"

--- xbmc/dialogs/GUIDialogNumeric.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/dialogs/GUIDialogNumeric.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIDialogNumeric.h"

 #include <cassert>

--- xbmc/guilib/GUIAction.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/guilib/GUIAction.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIAction.h"

 #include "utils/StringUtils.h"

 #include "GUIWindowManager.h"

--- xbmc/guilib/GUISpinControl.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/guilib/GUISpinControl.cpp

@@ -22,6 +22,7 @@

 #include "input/Key.h"

 #include "utils/StringUtils.h"

 #include <stdio.h>

+#include <stdlib.h>

 #define SPIN_BUTTON_DOWN 1

 #define SPIN_BUTTON_UP   2

--- xbmc/guilib/TextureBundleXPR.h.orig	2016-02-20 15:21:19 UTC

+++ xbmc/guilib/TextureBundleXPR.h

@@ -24,6 +24,7 @@

 #include <string>

 #include <stdint.h>

 #include <vector>

+#include <ctime>

 class CAutoTexBuffer;

 class CBaseTexture;

--- xbmc/guilib/XBTF.h.orig	2016-02-20 15:21:19 UTC

+++ xbmc/guilib/XBTF.h

@@ -22,6 +22,7 @@

 #include <map>

 #include <string>

 #include <vector>

+#include <ctime>

 #include <stdint.h>

--- xbmc/interfaces/builtins/GUIContainerBuiltins.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/interfaces/builtins/GUIContainerBuiltins.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "GUIContainerBuiltins.h"

 #include "guilib/GUIWindowManager.h"

--- xbmc/interfaces/builtins/WeatherBuiltins.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/interfaces/builtins/WeatherBuiltins.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "WeatherBuiltins.h"

 #include "guilib/GUIWindowManager.h"

--- xbmc/interfaces/legacy/Dialog.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/interfaces/legacy/Dialog.cpp

@@ -19,6 +19,7 @@

  */

 #include "LanguageHook.h"

+#include <stdlib.h>

 #include "dialogs/GUIDialogOK.h"

 #include "dialogs/GUIDialogYesNo.h"

 #include "dialogs/GUIDialogSelect.h"

--- xbmc/linux/XFileUtils.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/linux/XFileUtils.cpp

@@ -37,6 +37,7 @@

 #endif

 #include <dirent.h>

 #include <errno.h>

+#include <stdlib.h>

 #if defined(TARGET_ANDROID)

 #include <sys/file.h>

--- xbmc/main/main.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/main/main.cpp

@@ -28,6 +28,7 @@

 #ifdef TARGET_POSIX

 #include <sys/resource.h>

 #include <signal.h>

+#include <locale.h>

 #endif

 #if defined(TARGET_DARWIN_OSX)

   #include "Util.h"

@@ -35,7 +36,6 @@

   #ifdef HAS_SDL

     #include <SDL/SDL.h>

   #endif

-#include <locale.h>

 #endif

 #ifdef HAS_LIRC

 #include "input/linux/LIRC.h"

--- xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp

@@ -25,6 +25,7 @@

 #include "profiles/ProfilesManager.h"

 #include "storage/MediaManager.h"

 #include "utils/log.h"

+#include <stdlib.h>

 using namespace MUSIC_INFO;

--- xbmc/pvr/PVRActionListener.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/pvr/PVRActionListener.cpp

@@ -28,6 +28,7 @@

 #include "settings/Settings.h"

 #include "utils/log.h"

 #include "utils/StringUtils.h"

+#include <stdlib.h>

 #include "pvr/PVRManager.h"

 #include "pvr/channels/PVRChannelGroupsContainer.h"

--- xbmc/pvr/recordings/PVRRecording.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/pvr/recordings/PVRRecording.cpp

@@ -18,6 +18,7 @@

  *

  */

+#include <stdlib.h>

 #include "dialogs/GUIDialogOK.h"

 #include "epg/Epg.h"

 #include "epg/EpgContainer.h"

--- xbmc/settings/AdvancedSettings.cpp.orig	2016-02-20 15:21:19 UTC

+++ xbmc/settings/AdvancedSettings.cpp

@@ -203,7 +203,7 @@ void CAdvancedSettings::Initialize()

   m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-9][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)?";

   m_videoCleanStringRegExps.clear();

-  m_videoCleanStringRegExps.push_back("[ _\\,\\.\\(\\)\\[\\]\\-](ac3|dts|custom|dc|remastered|divx|divx5|dsr|dsrip|dutch|dvd|dvd5|dvd9|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|extended|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|3d|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");

+  m_videoCleanStringRegExps.push_back("[ _\\,\\.\\(\\)\\[\\]\\-](ac3|dts|custom|dc|remastered|divx|divx5|dsr|dsrip|dutch|dvd|dvd5|dvd9|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|french|multi|german|read.nfo|nfofix|unrated|extended|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|3d|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");

   m_videoCleanStringRegExps.push_back("(\\[.*\\])");