Attachment #161291 for bug #202812

View | Details | Raw Unified | Return to bug 202812
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	kodi
DISTVERSION=	15.1
PORTREVISION=	2
CATEGORIES=	multimedia
KODI_COMMIT=	f4dda26
MASTER_SITES=	https://codeload.github.com/xbmc/xbmc/tar.gz/${KODI_COMMIT}?dummy=/ \
		GH:ffmpeg
DISTFILES=	${DISTVERSION}-Isengard${EXTRACT_SUFX} \
		${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
EXTRACT_ONLY=	${DISTVERSION}-Isengard${EXTRACT_SUFX}

MAINTAINER=	mickael.maillot@gmail.com
COMMENT=	Award winning media center application

USE_GITHUB=	yes
GH_ACCOUNT=	xbmc
GH_PROJECT=	ffmpeg
GH_TAGNAME=	2.6.4-Isengard

USES=		autoreconf:build gettext gmake iconv jpeg libtool \
		pkgconfig python:2
GNU_CONFIGURE=	yes
USE_XORG=	xmu xrandr xt xtst
USE_GL=		glu glew
USE_SDL=	image sdl2
USE_JAVA=	yes
USE_LDCONFIG=	yes
JAVA_BUILD=	jre
NOPRECIOUSMAKEVARS=	yes
INSTALLS_ICONS=	yes

KODI_ARCH_i386=	x86
KODI_ARCH_amd64=x86_64

WRKSRC=		${WRKDIR}/xbmc-${KODI_COMMIT}

PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}


NONFREE_DESC=	Enable non-free components (rar, ccx, ffmpeg)
SFTP_DESC=	SSH SFTP support via libssh

OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI LIBBLURAY LIRC MYSQL \
			NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER

AIRPLAY_LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist

AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
AVAHI_CONFIGURE_ENABLE=	avahi

CEC_BROKEN=		libcec >= 3.0.0 has not been ported yet
CEC_BUILD_DEPENDS=	libcec>=3.0.0:${PORTSDIR}/multimedia/libcec
CEC_LIB_DEPENDS=	libcec.so:${PORTSDIR}/multimedia/libcec
CEC_CONFIGURE_ENABLE=	libcec



LIRC_RUN_DEPENDS=	lircd:${PORTSDIR}/comms/lirc

MYSQL_USE=		MYSQL=yes
MYSQL_CONFIGURE_ENABLE=	mysql

NFS_LIB_DEPENDS=	libnfs.so:${PORTSDIR}/net/libnfs


CONFIGURE_ARGS+=	--disable-debug --disable-alsa --disable-pulse

.include <bsd.port.pre.mk>
.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
USE_GCC=		yes
.endif

post-extract:
	${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
	${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \

		 -C ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}

post-patch:
	${REINPLACE_CMD} 's;"event\.h";"sidplay/event.h";' \
		${WRKSRC}/lib/libsidplay2/libsidplay/src/event.cpp \
		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6510/mos6510.h \
		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6526/mos6526.h \
		${WRKSRC}/lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
	${REINPLACE_CMD} 's;make;gmake;' \
		${WRKSRC}/bootstrap \
		${WRKSRC}/codegenerator.mk \
		${WRKSRC}/xbmc/Makefile.in
		${WRKSRC}/tools/TexturePacker/Makefile.in
	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk

pre-configure:

		| ${XARGS} ${STRIP_CMD}
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (14.2-Helix.tar.gz) = d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4	1	SHA256 (15.1-Isengard.tar.gz) = 6bf415258a3dffd4843e9446a62d9392997556240b7db703acb44d2bef3454d5
2	SIZE (14.2-Helix.tar.gz) = 70703786	2	SIZE (15.1-Isengard.tar.gz) = 61476469
3	SHA256 (ffmpeg-2.4.6-Helix.tar.gz) = 0872316475fc6d546be63cf9f4d6fe8e29c7f873f9a3344aa577b1f7c517b7cf	3	SHA256 (ffmpeg-2.6.4-Isengard.tar.gz) = 2487a6d4ad5701ad22582fc064ce39b60c383eec4958ca1e3218379035fa523f
4	SIZE (ffmpeg-2.4.6-Helix.tar.gz) = 9041228	4	SIZE (ffmpeg-2.6.4-Isengard.tar.gz) = 9365476




--- configure.ac.orig	2015-03-31 16:37:07 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
@@ -808,10 +810,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
@@ -944,6 +952,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++])
@@ -1240,7 +1249,7 @@
 )
 
 #Check to see if libs are needed for functions that are often built-in to libc
-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))
+AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))
 AC_SEARCH_LIBS([dlopen],dl)
 AC_SEARCH_LIBS([clock_gettime],rt)
 AC_SEARCH_LIBS([dn_expand],  resolv)
@@ -1740,7 +1749,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"
@@ -1751,7 +1760,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
@@ -1778,7 +1787,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
@@ -1791,7 +1800,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
 
@@ -2204,7 +2213,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],
@@ -2215,7 +2224,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
@@ -2479,6 +2488,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 \




--- configure.in.orig	2015-03-26 19:25:20.000000000 +0100
+++ configure.in	2015-04-08 15:23:22.000000000 +0200
@@ -628,10 +628,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
@@ -788,10 +790,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
@@ -924,6 +932,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++])
@@ -1191,7 +1200,7 @@
 )
 
 #Check to see if libs are needed for functions that are often built-in to libc
-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))
+AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))
 AC_SEARCH_LIBS([dlopen],dl)
 AC_SEARCH_LIBS([clock_gettime],rt)
 AC_SEARCH_LIBS([dn_expand],  resolv)
@@ -1706,7 +1715,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"
@@ -1717,7 +1726,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
@@ -1744,7 +1753,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
@@ -1757,7 +1766,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
 
@@ -2415,6 +2424,8 @@
   LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
 fi
 
+LIBS=$(echo "$LIBS" | tr "\n" " ")
+
 USE_PVR_ADDONS=0
 DISABLE_PVR_ADDON_CONFIG=1
 if [[ -f "pvr-addons/Makefile.am" ]]; then

Lines 1-5 Link Here

(-)files/patch-ffmpegx86 (-2 / +2 lines)
1	--- tools/depends/target/ffmpeg/ffmpeg-2.4.6-Helix/libavutil/x86/asm.h.orig 2014-12-25 13:59:22.000000000 +0100	1	--- tools/depends/target/ffmpeg/ffmpeg-2.6.4-Isengard/libavutil/x86/asm.h.orig 2014-12-25 12:59:22 UTC
2	+++ tools/depends/target/ffmpeg/ffmpeg-2.4.6-Helix/libavutil/x86/asm.h 2014-12-25 14:00:04.000000000 +0100	2	+++ tools/depends/target/ffmpeg/ffmpeg-2.6.4-Isengard/libavutil/x86/asm.h
3	@@ -71,7 +71,7 @@	3	@@ -71,7 +71,7 @@
4	typedef int x86_reg;	4	typedef int x86_reg;
5	#endif	5	#endif




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

   int pos = 0;
   while ((tmp & 0x1) == 0x0)
   {
diff --git xbmc/cores/AudioEngine/Utils/AEELDParser.cpp xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
index af4715c..0879bd5 100644
--- xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
+++ xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
@@ -23,6 +23,7 @@
 #include "utils/EndianSwap.h"
 #include <string.h>
 #include <algorithm>
+#include <functional>
 
 #include <stdio.h>
 




--- project/cmake/scripts/common/prepare-env.cmake.orig	2014-12-19 08:42:16.000000000 +0100
+++ project/cmake/scripts/common/prepare-env.cmake	2014-12-21 20:51:17.000000000 +0100
@@ -45,12 +45,12 @@
 get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
 
 # generate the proper kodi-config.cmake file
-configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
+#configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
 # copy cmake helpers to lib/kodi
-file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
+#file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
 
 # generate xbmc-config.cmake for backwards compatibility to xbmc
-configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
+#configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
 
 ### copy all the addon binding header files to include/kodi
 # parse addon-bindings.mk to get the list of header files to copy
@@ -61,17 +61,6 @@
   string(REPLACE "+=" ";" binding "${binding}")
   list(GET binding 1 header)
   # copy the header file to include/kodi
-  file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR})
+  #file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR})
 
-  # auto-generate header files for backwards comaptibility to xbmc with deprecation warning
-  get_filename_component(headerfile ${header} NAME)
-  file(WRITE ${XBMC_INCLUDE_DIR}/${headerfile}
-"#pragma once
-#define DEPRECATION_WARNING \"Including xbmc/${headerfile} has been deprecated, please use kodi/${headerfile}\"
-#ifdef _MSC_VER
-  #pragma message(\"WARNING: \" DEPRECATION_WARNING)
-#else
-  #warning DEPRECATION_WARNING
-#endif
-#include \"kodi/${headerfile}\"")
 endforeach()
\ No newline at end of file




diff --git lib/libsidplay2/Makefile.in lib/libsidplay2/Makefile.in
index 5dda4c9..14247e8 100644
--- lib/libsidplay2/Makefile.in
+++ lib/libsidplay2/Makefile.in
@@ -3,7 +3,7 @@ ARCH=@ARCH@
 SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
          -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \
          -Ibuilders/resid-builder/include/sidplay/builders \
-         -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC
+         -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC
 CFLAGS += $(SIDFLAGS)
 CXXFLAGS += $(SIDFLAGS)
 ifeq ($(ARCH), powerpc-osx)
@@ -54,13 +54,18 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so
 
 $(SLIB): $(OBJS)
 ifeq ($(findstring osx,$(ARCH)), osx)
-	$(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+	$(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
 		-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
 		@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
+	$(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
 		`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
 endif
 
 include @abs_top_srcdir@/Makefile.include
 
+%.o: %.cpp
+	@rm -f $@
+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \
+	&& $(GEN_DEPS)
+
diff --git lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
index 5a0f1d7..cd134dd 100644
--- lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
+++ lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
@@ -24,7 +24,7 @@
 
 #include <vector>
 #include "sidbuilder.h"
-#include "event.h"
+#include "sidplay/event.h"
 
 
 /***************************************************************************
diff --git lib/libsidplay2/libsidplay/include/sidplay/c64env.h lib/libsidplay2/libsidplay/include/sidplay/c64env.h
index a33664d..3779609 100644
--- lib/libsidplay2/libsidplay/include/sidplay/c64env.h
+++ lib/libsidplay2/libsidplay/include/sidplay/c64env.h
@@ -19,7 +19,7 @@
 #define _c64env_h_
 
 #include "sidtypes.h"
-#include "event.h"
+#include "sidplay/event.h"
  
 /* An implementation of of this class can be created to perform the C64
    specifics.  A pointer to this child class can then be passed to
diff --git lib/libsidplay2/libsidplay/include/sidplay/sid2types.h lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
index 0911012..30b0bfe 100644
--- lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
+++ lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
@@ -19,7 +19,7 @@
 #define _sid2types_h_
 
 #include "sidtypes.h"
-#include "event.h"
+#include "sidplay/event.h"
 
 class   sidbuilder;
 struct  SidTuneInfo;
diff --git lib/libsidplay2/libsidplay/src/event.cpp lib/libsidplay2/libsidplay/src/event.cpp
index bfa715c..218e1d6 100644
--- lib/libsidplay2/libsidplay/src/event.cpp
+++ lib/libsidplay2/libsidplay/src/event.cpp
@@ -50,7 +50,7 @@
  ***************************************************************************/
 
 #include <string.h>
-#include "event.h"
+#include "sidplay/event.h"
 
 #define EVENT_TIMEWARP_COUNT 0x0FFFFF
 
diff --git lib/libsidplay2/libsidplay/src/mos6510/mos6510.h lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
index 9516df5..d5f94ba 100644
--- lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
+++ lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
@@ -36,7 +36,7 @@
 #include "config.h"
 #include "component.h"
 #include "sidenv.h"
-#include "event.h"
+#include "sidplay/event.h"
 
 #undef  MOS6510_VERSION
 #undef  MOS6510_DATE
diff --git lib/libsidplay2/libsidplay/src/mos6526/mos6526.h lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
index 1cb665c..e6c740f 100644
--- lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
+++ lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
@@ -85,7 +85,7 @@
 #define _mos6526_h_
 
 #include "component.h"
-#include "event.h"
+#include "sidplay/event.h"
 
 class MOS6526: public component
 {
diff --git lib/libsidplay2/libsidplay/src/mos656x/mos656x.h lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
index ef81202..00e4029 100644
--- lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
+++ lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
@@ -19,7 +19,7 @@
 #define _mos656x_h_
 
 #include "component.h"
-#include "event.h"
+#include "sidplay/event.h"
 
 typedef enum
 {
diff --git lib/libsidplay2/libsidplay/src/sid6526/sid6526.h lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
index e1fb9c1..f2c0e2b 100644
--- lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
+++ lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
@@ -38,7 +38,7 @@
 #define _sid6526_h_
 
 #include "component.h"
-#include "event.h"
+#include "sidplay/event.h"
 #include "c64env.h"
 
 class SID6526: public component
diff --git lib/libsidplay2/libsidplay/src/xsid/xsid.h lib/libsidplay2/libsidplay/src/xsid/xsid.h
index 572b813..54313a2 100644
--- lib/libsidplay2/libsidplay/src/xsid/xsid.h
+++ lib/libsidplay2/libsidplay/src/xsid/xsid.h
@@ -106,7 +106,7 @@ programmed with.
 
 #include "config.h"
 #include "sidbuilder.h"
-#include "event.h"
+#include "sidplay/event.h"
 
 // XSID configuration settings
 //#define XSID_DEBUG 1




--- tools/depends/target/ffmpeg/autobuild.sh.orig	2015-03-31 16:37:07 UTC
+++ tools/depends/target/ffmpeg/autobuild.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

 
 CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
 ./configure --prefix=$FFMPEG_PREFIX \
@@ -161,11 +170,11 @@
 	--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




--- 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)

Line 0 Link Here

(-)files/patch-xbmc__cores__dvdplayer__DVDDemuxSPU.cpp (+10 lines)
	1	--- xbmc/cores/dvdplayer/DVDDemuxSPU.cpp.orig 2015-06-23 09:40:13 UTC
	2	+++ xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
	3	@@ -18,6 +18,7 @@
	4	*
	5	*/
	6
	7	+#include <stdlib.h>
	8	#include "DVDDemuxSPU.h"
	9	#include "DVDClock.h"
	10	#include "utils/log.h"

Line 0 Link Here

(-)files/patch-xbmc__dialogs__GUIDialogGamepad.cpp (+10 lines)
	1	--- xbmc/dialogs/GUIDialogGamepad.cpp.orig 2015-04-13 10:34:31 UTC
	2	+++ xbmc/dialogs/GUIDialogGamepad.cpp
	3	@@ -18,6 +18,7 @@
	4	*
	5	*/
	6
	7	+#include <stdlib.h>
	8	#include "GUIDialogGamepad.h"
	9	#include "utils/md5.h"
	10	#include "utils/StringUtils.h"

Line 0 Link Here

(-)files/patch-xbmc__dialogs__GUIDialogNumeric.cpp (+10 lines)
	1	--- xbmc/dialogs/GUIDialogNumeric.cpp.orig 2015-04-13 10:36:23 UTC
	2	+++ xbmc/dialogs/GUIDialogNumeric.cpp
	3	@@ -18,6 +18,7 @@
	4	*
	5	*/
	6
	7	+#include <stdlib.h>
	8	#include "GUIDialogNumeric.h"
	9	#include "guilib/GUILabelControl.h"
	10	#include "utils/md5.h"

Line 0 Link Here

(-)files/patch-xbmc__guilib__GUIAction.cpp (+10 lines)
	1	--- xbmc/guilib/GUIAction.cpp.orig 2015-04-13 12:41:36 UTC
	2	+++ xbmc/guilib/GUIAction.cpp
	3	@@ -18,6 +18,7 @@
	4	*
	5	*/
	6
	7	+#include <stdlib.h>
	8	#include "GUIAction.h"
	9	#include "utils/StringUtils.h"
	10	#include "GUIWindowManager.h"

Line 0 Link Here

(-)files/patch-xbmc__guilib__GUISpinControl.cpp (+10 lines)
	1	--- xbmc/guilib/GUISpinControl.cpp.orig 2015-04-13 12:48:49 UTC
	2	+++ xbmc/guilib/GUISpinControl.cpp
	3	@@ -22,6 +22,7 @@
	4	#include "input/Key.h"
	5	#include "utils/StringUtils.h"
	6	#include <stdio.h>
	7	+#include <stdlib.h>
	8
	9	using namespace std;
	10

Line 0 Link Here

(-)files/patch-xbmc__guilib__TextureBundleXPR.h (+10 lines)
	1	--- xbmc/guilib/TextureBundleXPR.h.orig 2015-08-08 17:27:25 UTC
	2	+++ xbmc/guilib/TextureBundleXPR.h
	3	@@ -24,6 +24,7 @@
	4	#include <string>
	5	#include <stdint.h>
	6	#include <vector>
	7	+#include <ctime>
	8
	9	class CAutoTexBuffer;
	10	class CBaseTexture;

Line 0 Link Here

(-)files/patch-xbmc__guilib__XBTF.h (+10 lines)
	1	--- xbmc/guilib/XBTF.h.orig 2015-08-08 15:41:42 UTC
	2	+++ xbmc/guilib/XBTF.h
	3	@@ -22,6 +22,7 @@
	4
	5	#include <string>
	6	#include <vector>
	7	+#include <ctime>
	8	#include <stdint.h>
	9
	10	#define XBTF_MAGIC "XBTF"

Line 0 Link Here

(-)files/patch-xbmc__interfaces__legacy__Dialog.cpp (+10 lines)
	1	--- xbmc/interfaces/legacy/Dialog.cpp.orig 2015-04-13 10:42:40 UTC
	2	+++ xbmc/interfaces/legacy/Dialog.cpp
	3	@@ -19,6 +19,7 @@
	4	*/
	5	#include "LanguageHook.h"
	6
	7	+#include <stdlib.h>
	8	#include "dialogs/GUIDialogOK.h"
	9	#include "dialogs/GUIDialogYesNo.h"
	10	#include "dialogs/GUIDialogSelect.h"

Line 0 Link Here

(-)files/patch-xbmc__linux__XFileUtils.cpp (+10 lines)
	1	--- xbmc/linux/XFileUtils.cpp.orig 2014-12-20 16:29:11 UTC
	2	+++ xbmc/linux/XFileUtils.cpp
	3	@@ -36,6 +36,7 @@
	4	#endif
	5	#include <dirent.h>
	6	#include <errno.h>
	7	+#include <stdlib.h>
	8
	9	#if defined(TARGET_ANDROID)
	10	#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"

Line 0 Link Here

(-)files/patch-xbmc__pvr__PVRActionListener.cpp (+10 lines)
	1	--- xbmc/pvr/PVRActionListener.cpp.orig 2015-04-13 10:38:08 UTC
	2	+++ xbmc/pvr/PVRActionListener.cpp
	3	@@ -32,6 +32,7 @@
	4	#include "settings/Settings.h"
	5	#include "utils/log.h"
	6	#include "utils/StringUtils.h"
	7	+#include <stdlib.h>
	8
	9	#include "pvr/PVRManager.h"
	10	#include "pvr/channels/PVRChannelGroupsContainer.h"

Line 0 Link Here

(-)files/patch-xbmc__settings__AdvancedSettings.cpp (+11 lines)
	1	--- xbmc/settings/AdvancedSettings.cpp.orig 2015-04-21 18:46:28 UTC
	2	+++ xbmc/settings/AdvancedSettings.cpp
	3	@@ -208,7 +208,7 @@
	4	m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\$\$\\[\\]\\-])[ _\\.\$\$\\[\\]\\-]+(19[0-9][0-9]\|20[0-1][0-9])([ _\\,\\.\$\$\\[\\]\\-]\|[^0-9]$)";
	5
	6	m_videoCleanStringRegExps.clear();
	7	- 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]\|\\[.*\\])([ _\\,\\.\$\$\\[\\]\\-]\|$)");
	8	+ 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]\|\\[.*\\])([ _\\,\\.\$\$\\[\\]\\-]\|$)");
	9	m_videoCleanStringRegExps.push_back("(\\[.*\\])");
	10
	11	m_moviesExcludeFromScanRegExps.clear();

Line 0 Link Here

(-)files/patch-xbmc__storage__linux__DeviceKitDisksProvider.cpp (+10 lines)
	1	--- xbmc/storage/linux/DeviceKitDisksProvider.cpp.orig 2015-04-13 10:45:50 UTC
	2	+++ xbmc/storage/linux/DeviceKitDisksProvider.cpp
	3	@@ -19,6 +19,7 @@
	4	*/
	5	#include "DeviceKitDisksProvider.h"
	6	#ifdef HAS_DBUS
	7	+#include <stdlib.h>
	8	#include "settings/AdvancedSettings.h"
	9	#include "guilib/LocalizeStrings.h"
	10	#include "utils/log.h"

Line 0 Link Here

(-)files/patch-xbmc__storage__linux__UDisksProvider.cpp (+10 lines)
	1	--- xbmc/storage/linux/UDisksProvider.cpp.orig 2015-04-13 12:39:11 UTC
	2	+++ xbmc/storage/linux/UDisksProvider.cpp
	3	@@ -19,6 +19,7 @@
	4	*/
	5	#include "UDisksProvider.h"
	6	#ifdef HAS_DBUS
	7	+#include <stdlib.h>
	8	#include "settings/AdvancedSettings.h"
	9	#include "guilib/LocalizeStrings.h"
	10	#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>

Line 0 Link Here

(-)files/patch-xbmc__utils__CharsetConverter.cpp (+11 lines)
	1	--- xbmc/utils/CharsetConverter.cpp.orig 2015-08-10 08:41:28 UTC
	2	+++ xbmc/utils/CharsetConverter.cpp
	3	@@ -67,7 +67,7 @@
	4	#define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
	5	#define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
	6	#define UTF8_SOURCE "UTF-8"
	7	- #define WCHAR_CHARSET "WCHAR_T"
	8	+ #define WCHAR_CHARSET UTF32_CHARSET
	9	#if __STDC_ISO_10646__
	10	#ifdef SIZEOF_WCHAR_T
	11	#if SIZEOF_WCHAR_T == 4

Line 0 Link Here

(-)files/patch-xbmc__windowing__WinEventsX11.cpp (+10 lines)
	1	--- xbmc/windowing/WinEventsX11.cpp.orig 2015-04-13 10:40:08 UTC
	2	+++ xbmc/windowing/WinEventsX11.cpp
	3	@@ -23,6 +23,7 @@
	4
	5	#ifdef HAS_X11_WIN_EVENTS
	6
	7	+#include <locale.h>
	8	#include "WinEvents.h"
	9	#include "WinEventsX11.h"
	10	#include "Application.h"

Lines 1-10 Link Here

(-)files/patch-xbmc_cores_DllLoader_dll__tracker.cpp (-10 lines)
1	--- xbmc/cores/DllLoader/dll_tracker.cpp.orig 2014-12-20 16:26:59 UTC
2	+++ xbmc/cores/DllLoader/dll_tracker.cpp
3	@@ -24,6 +24,7 @@
4	#include "DllLoader.h"
5	#include "threads/SingleLock.h"
6	#include "utils/log.h"
7	+#include "stdlib.h"
8
9	#ifdef _cplusplus
10	extern "C"

Lines 1-10 Link Here

(-)files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp (-10 lines)
1	--- xbmc/cores/DllLoader/dll_tracker_file.cpp.orig 2014-12-20 16:27:04 UTC
2	+++ xbmc/cores/DllLoader/dll_tracker_file.cpp
3	@@ -23,6 +23,7 @@
4	#include "DllLoader.h"
5	#include "threads/SingleLock.h"
6	#include "utils/log.h"
7	+#include "stdlib.h"
8
9	#ifdef TARGET_POSIX
10	#define dll_open open

Lines 1-10 Link Here

(-)files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp (-10 lines)
1	--- xbmc/cores/DllLoader/exports/emu_kernel32.cpp.orig 2014-12-20 16:28:10 UTC
2	+++ xbmc/cores/DllLoader/exports/emu_kernel32.cpp
3	@@ -38,6 +38,7 @@
4	#define __except catch
5	#endif
6
7	+#include <stdlib.h>
8	#include <string.h>
9	#include <vector>
10	using namespace std;

Lines 1-10 Link Here

(-)files/patch-xbmc_filesystem_iso9660.cpp (-10 lines)
1	--- xbmc/filesystem/iso9660.cpp.orig 2014-12-20 16:28:43 UTC
2	+++ xbmc/filesystem/iso9660.cpp
3	@@ -52,6 +52,7 @@ ISO9660
4	#include "storage/DetectDVDType.h" // for MODE2_DATA_SIZE etc.
5	#endif
6	#include <cdio/bytesex.h>
7	+#include <stdlib.h>
8	//#define _DEBUG_OUTPUT 1
9
10	static CCriticalSection m_critSection;

Lines 1-10 Link Here

(-)files/patch-xbmc_linux_XFileUtils.cpp (-10 lines)
1	--- xbmc/linux/XFileUtils.cpp.orig 2014-12-20 16:29:11 UTC
2	+++ xbmc/linux/XFileUtils.cpp
3	@@ -36,6 +36,7 @@
4	#endif
5	#include <dirent.h>
6	#include <errno.h>
7	+#include <stdlib.h>
8
9	#if defined(TARGET_ANDROID)
10	#include <sys/file.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>

Return to bug 202812

Lines 1-14 Link Here

(-)Makefile (-20 / +21 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= kodi	3	PORTNAME= kodi
4	DISTVERSION= 14.2	4	DISTVERSION= 15.1
5	PORTREVISION= 2
6	CATEGORIES= multimedia	5	CATEGORIES= multimedia
7	MASTER_SITES= https://codeload.github.com/xbmc/xbmc/tar.gz/${DISTVERSION}-Helix?dummy=/ \	6	KODI_COMMIT= f4dda26
		7	MASTER_SITES= https://codeload.github.com/xbmc/xbmc/tar.gz/${KODI_COMMIT}?dummy=/ \
8	GH:ffmpeg	8	GH:ffmpeg
9	DISTFILES= ${DISTVERSION}-Helix${EXTRACT_SUFX} \	9	DISTFILES= ${DISTVERSION}-Isengard${EXTRACT_SUFX} \
10	${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg	10	${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg
11	EXTRACT_ONLY= ${DISTVERSION}-Helix${EXTRACT_SUFX}	11	EXTRACT_ONLY= ${DISTVERSION}-Isengard${EXTRACT_SUFX}
12		12
13	MAINTAINER= mickael.maillot@gmail.com	13	MAINTAINER= mickael.maillot@gmail.com
14	COMMENT= Award winning media center application	14	COMMENT= Award winning media center application
Lines 58-72 Link Here
58	USE_GITHUB= yes	58	USE_GITHUB= yes
59	GH_ACCOUNT= xbmc	59	GH_ACCOUNT= xbmc
60	GH_PROJECT= ffmpeg	60	GH_PROJECT= ffmpeg
61	GH_TAGNAME= 2.4.6-Helix	61	GH_TAGNAME= 2.6.4-Isengard
62		62
63	USES= autoreconf:build gettext gmake iconv:wchar_t jpeg libtool \	63	USES= autoreconf:build gettext gmake iconv jpeg libtool \
64	pkgconfig python:2	64	pkgconfig python:2
65	GNU_CONFIGURE= yes	65	GNU_CONFIGURE= yes
66	USE_XORG= xt xmu xtst xrandr	66	USE_XORG= xmu xrandr xt xtst
67	USE_GL= glu glew	67	USE_GL= glu glew
68	USE_SDL= image sdl2	68	USE_SDL= image sdl2
69	USE_JAVA= yes	69	USE_JAVA= yes
		70	USE_LDCONFIG= yes
70	JAVA_BUILD= jre	71	JAVA_BUILD= jre
71	NOPRECIOUSMAKEVARS= yes	72	NOPRECIOUSMAKEVARS= yes
72	INSTALLS_ICONS= yes	73	INSTALLS_ICONS= yes
Lines 75-81 Link Here
75	KODI_ARCH_i386= x86	76	KODI_ARCH_i386= x86
76	KODI_ARCH_amd64=x86_64	77	KODI_ARCH_amd64=x86_64
77		78
78	WRKSRC= ${WRKDIR}/xbmc-${DISTVERSION}-Helix	79	WRKSRC= ${WRKDIR}/xbmc-${KODI_COMMIT}
79		80
80	PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}}	81	PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}}
81		82
Lines 89-95 Link Here
89	NONFREE_DESC= Enable non-free components (rar, ccx, ffmpeg)	90	NONFREE_DESC= Enable non-free components (rar, ccx, ffmpeg)
90	SFTP_DESC= SSH SFTP support via libssh	91	SFTP_DESC= SSH SFTP support via libssh
91		92
92	OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC MYSQL \	93	OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI LIBBLURAY LIRC MYSQL \
93	NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER	94	NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER
94		95
95	AIRPLAY_LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist	96	AIRPLAY_LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist
Lines 101-107 Link Here
101	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app	102	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app
102	AVAHI_CONFIGURE_ENABLE= avahi	103	AVAHI_CONFIGURE_ENABLE= avahi
103		104
104	CEC_BUILD_DEPENDS= libcec>=2.2.0:${PORTSDIR}/multimedia/libcec	105	CEC_BROKEN= libcec >= 3.0.0 has not been ported yet
		106	CEC_BUILD_DEPENDS= libcec>=3.0.0:${PORTSDIR}/multimedia/libcec
105	CEC_LIB_DEPENDS= libcec.so:${PORTSDIR}/multimedia/libcec	107	CEC_LIB_DEPENDS= libcec.so:${PORTSDIR}/multimedia/libcec
106	CEC_CONFIGURE_ENABLE= libcec	108	CEC_CONFIGURE_ENABLE= libcec
107		109
Lines 110-116 Link Here
110		112
111	LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comms/lirc	113	LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comms/lirc
112		114
113	MYSQL_USE= MYSQL=yes	115	MYSQL_USE= MYSQL=yes
114	MYSQL_CONFIGURE_ENABLE= mysql	116	MYSQL_CONFIGURE_ENABLE= mysql
115		117
116	NFS_LIB_DEPENDS= libnfs.so:${PORTSDIR}/net/libnfs	118	NFS_LIB_DEPENDS= libnfs.so:${PORTSDIR}/net/libnfs
Lines 142-147 Link Here
142		144
143	CONFIGURE_ARGS+= --disable-debug --disable-alsa --disable-pulse	145	CONFIGURE_ARGS+= --disable-debug --disable-alsa --disable-pulse
144		146
		147	.include <bsd.port.pre.mk>
		148	.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
		149	USE_GCC= yes
		150	.endif
		151
145	post-extract:	152	post-extract:
146	${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}	153	${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
147	${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \	154	${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \
Lines 148-163 Link Here
148	-C ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}	155	-C ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME}
149		156
150	post-patch:	157	post-patch:
151	${REINPLACE_CMD} 's;"event\.h";"sidplay/event.h";' \
152	${WRKSRC}/lib/libsidplay2/libsidplay/src/event.cpp \
153	${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6510/mos6510.h \
154	${WRKSRC}/lib/libsidplay2/libsidplay/src/mos6526/mos6526.h \
155	${WRKSRC}/lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
156	${REINPLACE_CMD} 's;make;gmake;' \	158	${REINPLACE_CMD} 's;make;gmake;' \
157	${WRKSRC}/bootstrap \	159	${WRKSRC}/bootstrap \
158	${WRKSRC}/codegenerator.mk \	160	${WRKSRC}/codegenerator.mk \
159	${WRKSRC}/xbmc/Makefile.in \	161	${WRKSRC}/xbmc/Makefile.in
160	${WRKSRC}/tools/TexturePacker/Makefile.in
161	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk	162	${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk
162		163
163	pre-configure:	164	pre-configure:
Lines 171-174 Link Here
171	\| ${XARGS} ${STRIP_CMD}	172	\| ${XARGS} ${STRIP_CMD}
172	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr	173	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr
173		174
174	.include <bsd.port.mk>	175	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-configure.ac (+115 lines)
		1	--- configure.ac.orig 2015-03-31 16:37:07 UTC
		2	+++ configure.ac
		3	@@ -636,10 +636,12 @@
		4	i386--freebsd)
		5	ARCH="x86-freebsd"
		6	MAKE="gmake"
		7	+ USE_STATIC_FFMPEG=1
		8	;;
		9	amd64--freebsd)
		10	ARCH="x86_64-freebsd"
		11	MAKE="gmake"
		12	+ USE_STATIC_FFMPEG=1
		13	;;
		14	arm-apple-darwin*)
		15	use_joystick=no
		16	@@ -808,10 +810,16 @@
		17	# platform specific flags
		18	if echo "$ARCH" \| grep -q "freebsd" ; then
		19	LOCALBASE="${LOCALBASE:-/usr/local}"
		20	- CFLAGS="$CFLAGS -I$LOCALBASE/include"
		21	- CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"
		22	- CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"
		23	+ CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"
		24	+ CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"
		25	+ CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"
		26	LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
		27	+ CC_FOR_BUILD="$CC"
		28	+ CXX_FOR_BUILD="$CXX"
		29	+ CFLAGS_FOR_BUILD="$CFLAGS"
		30	+ CXXFLAGS_FOR_BUILD="$CXXFLAGS"
		31	+ LDFLAGS_FOR_BUILD="$LDFLAGS"
		32	+ FFMPEG_OPTS="--cc=$CC --cxx=$CXX"
		33	fi
		34	if test "$host_vendor" = "apple" ; then
		35	# standard application paths
		36	@@ -944,6 +952,7 @@
		37
		38	# Check inotify availability
		39	AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
		40	+AC_CHECK_LIB([inotify], [main],,)
		41
		42	# Checks for boost headers using CXX instead of CC
		43	AC_LANG_PUSH([C++])
		44	@@ -1240,7 +1249,7 @@
		45	)
		46
		47	#Check to see if libs are needed for functions that are often built-in to libc
		48	-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))
		49	+AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))
		50	AC_SEARCH_LIBS([dlopen],dl)
		51	AC_SEARCH_LIBS([clock_gettime],rt)
		52	AC_SEARCH_LIBS([dn_expand], resolv)
		53	@@ -1740,7 +1749,7 @@
		54
		55	if test "$cross_compiling" != "yes"; then
		56	if test "$use_debug" != "yes"; then
		57	- FFMPEG_OPTS="-r"
		58	+ FFMPEG_OPTS="${FFMPEG_OPTS} -r"
		59	fi
		60	if test "$use_optimizations" != "yes"; then
		61	FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
		62	@@ -1751,7 +1760,7 @@
		63	SAVE_LIBS="$LIBS"
		64	# check for system installed ffmpeg. We require minimum versions.
65	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
66	- [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
67	+ [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
68	[FFMPEG_FOUND="false"])
69
70	if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
71	@@ -1778,7 +1787,7 @@
72	elif test "$with_ffmpeg" = "force"; then
73	# always build our ffmpeg
74	AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
75	- CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS}
76	+ CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} \|\| exit 1
77	export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
78
79	elif test "$with_ffmpeg" != "no"; then
80	@@ -1791,7 +1800,7 @@
81
82	if test "$FFMPEG_FOUND" != "true"; then
83	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
84	- [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
85	+ [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
86	[AC_MSG_ERROR("ffmpeg not found")])
87	fi
88
89	@@ -2204,7 +2213,7 @@
90	# we don't compile with default upstream squish, so we use our own one
91	# even on non unified deps platforms
92	if test "$cross_compiling" != "yes"; then
93	- make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
94	+ $MAKE -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
95	export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
96	fi
97	PKG_CHECK_MODULES([SQUISH], [squish],
98	@@ -2215,7 +2224,7 @@
99	AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
100	[$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
101	if test "$TEXTUREPACKER" = "none"; then
102	- make -C ${abs_top_srcdir}/tools/depends/native/TexturePacker
103	+ $MAKE -C ${abs_top_srcdir}/tools/depends/native/TexturePacker
104	TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
105	fi
106	if test -x "$TEXTUREPACKER"; then
107	@@ -2479,6 +2488,8 @@
108	LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
109	fi
110
111	+LIBS=$(echo "$LIBS" \| tr "\n" " ")
112	+
113	OUTPUT_FILES="Makefile \
114	Makefile.include \
115	addons/skin.confluence/media/Makefile \

Lines 1-97 Link Here

(-)files/patch-configure.in (-97 lines)
1	--- configure.in.orig 2015-03-26 19:25:20.000000000 +0100
2	+++ configure.in 2015-04-08 15:23:22.000000000 +0200
3	@@ -628,10 +628,12 @@
4	i386--freebsd)
5	ARCH="x86-freebsd"
6	MAKE="gmake"
7	+ USE_STATIC_FFMPEG=1
8	;;
9	amd64--freebsd)
10	ARCH="x86_64-freebsd"
11	MAKE="gmake"
12	+ USE_STATIC_FFMPEG=1
13	;;
14	arm-apple-darwin*)
15	use_joystick=no
16	@@ -788,10 +790,16 @@
17	# platform specific flags
18	if echo "$ARCH" \| grep -q "freebsd" ; then
19	LOCALBASE="${LOCALBASE:-/usr/local}"
20	- CFLAGS="$CFLAGS -I$LOCALBASE/include"
21	- CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include"
22	- CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include"
23	+ CFLAGS="$CFLAGS -idirafter$LOCALBASE/include"
24	+ CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include"
25	+ CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include"
26	LDFLAGS="$LDFLAGS -L$LOCALBASE/lib"
27	+ CC_FOR_BUILD="$CC"
28	+ CXX_FOR_BUILD="$CXX"
29	+ CFLAGS_FOR_BUILD="$CFLAGS"
30	+ CXXFLAGS_FOR_BUILD="$CXXFLAGS"
31	+ LDFLAGS_FOR_BUILD="$LDFLAGS"
32	+ FFMPEG_OPTS="--cc=$CC --cxx=$CXX"
33	fi
34	if test "$host_vendor" = "apple" ; then
35	# standard application paths
36	@@ -924,6 +932,7 @@
37
38	# Check inotify availability
39	AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
40	+AC_CHECK_LIB([inotify], [main],,)
41
42	# Checks for boost headers using CXX instead of CC
43	AC_LANG_PUSH([C++])
44	@@ -1191,7 +1200,7 @@
45	)
46
47	#Check to see if libs are needed for functions that are often built-in to libc
48	-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library)))
49	+AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library))
50	AC_SEARCH_LIBS([dlopen],dl)
51	AC_SEARCH_LIBS([clock_gettime],rt)
52	AC_SEARCH_LIBS([dn_expand], resolv)
53	@@ -1706,7 +1715,7 @@
54
55	if test "$cross_compiling" != "yes"; then
56	if test "$use_debug" != "yes"; then
57	- FFMPEG_OPTS="-r"
58	+ FFMPEG_OPTS="${FFMPEG_OPTS} -r"
59	fi
60	if test "$use_optimizations" != "yes"; then
61	FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
62	@@ -1717,7 +1726,7 @@
63	SAVE_LIBS="$LIBS"
64	# check for system installed ffmpeg. We require minimum versions.
65	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
66	- [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
67	+ [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
68	[FFMPEG_FOUND="false"])
69
70	if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
71	@@ -1744,7 +1753,7 @@
72	elif test "$with_ffmpeg" = "force"; then
73	# always build our ffmpeg
74	AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
75	- CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS}
76	+ CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} \|\| exit 1
77	export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
78
79	elif test "$with_ffmpeg" != "no"; then
80	@@ -1757,7 +1766,7 @@
81
82	if test "$FFMPEG_FOUND" != "true"; then
83	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
84	- [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"],
85	+ [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"],
86	[AC_MSG_ERROR("ffmpeg not found")])
87	fi
88
89	@@ -2415,6 +2424,8 @@
90	LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
91	fi
92
93	+LIBS=$(echo "$LIBS" \| tr "\n" " ")
94	+
95	USE_PVR_ADDONS=0
96	DISABLE_PVR_ADDON_CONFIG=1
97	if [[ -f "pvr-addons/Makefile.am" ]]; then

Lines 1-3 Link Here

(-)files/patch-freebsd (-12 / +13 lines)
		1	diff --git lib/cpluff/autogen.sh lib/cpluff/autogen.sh
		2	index ee0a418..efd5291 100755
		3	--- lib/cpluff/autogen.sh
		4	+++ lib/cpluff/autogen.sh
		5	@@ -15,7 +15,7 @@ fi
		6
		7	# Generate files in top level directory
		8	cd "$basedir"
		9	-autopoint
		10	+#autopoint
		11	rm -f ABOUT-NLS
		12	test -d auxliary \|\| mkdir auxliary
		13	libtoolize --automake -f
1	diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile	14	diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile
2	index 0e08dcf..e94d78f 100644	15	index 0e08dcf..e94d78f 100644
3	--- tools/depends/target/ffmpeg/Makefile	16	--- tools/depends/target/ffmpeg/Makefile
Lines 27-41 Link Here
27	int pos = 0;	40	int pos = 0;
28	while ((tmp & 0x1) == 0x0)	41	while ((tmp & 0x1) == 0x0)
29	{	42	{
30	diff --git xbmc/cores/AudioEngine/Utils/AEELDParser.cpp xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
31	index af4715c..0879bd5 100644
32	--- xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
33	+++ xbmc/cores/AudioEngine/Utils/AEELDParser.cpp
34	@@ -23,6 +23,7 @@
35	#include "utils/EndianSwap.h"
36	#include <string.h>
37	#include <algorithm>
38	+#include <functional>
39
40	#include <stdio.h>
41

Lines 1-38 Link Here

(-)files/patch-project__cmake__scripts__common__prepare-env.cmake (-38 lines)
1	--- project/cmake/scripts/common/prepare-env.cmake.orig 2014-12-19 08:42:16.000000000 +0100
2	+++ project/cmake/scripts/common/prepare-env.cmake 2014-12-21 20:51:17.000000000 +0100
3	@@ -45,12 +45,12 @@
4	get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
5
6	# generate the proper kodi-config.cmake file
7	-configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
8	+#configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY)
9	# copy cmake helpers to lib/kodi
10	-file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
11	+#file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR})
12
13	# generate xbmc-config.cmake for backwards compatibility to xbmc
14	-configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
15	+#configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
16
17	### copy all the addon binding header files to include/kodi
18	# parse addon-bindings.mk to get the list of header files to copy
19	@@ -61,17 +61,6 @@
20	string(REPLACE "+=" ";" binding "${binding}")
21	list(GET binding 1 header)
22	# copy the header file to include/kodi
23	- file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR})
24	+ #file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR})
25
26	- # auto-generate header files for backwards comaptibility to xbmc with deprecation warning
27	- get_filename_component(headerfile ${header} NAME)
28	- file(WRITE ${XBMC_INCLUDE_DIR}/${headerfile}
29	-"#pragma once
30	-#define DEPRECATION_WARNING \"Including xbmc/${headerfile} has been deprecated, please use kodi/${headerfile}\"
31	-#ifdef _MSC_VER
32	- #pragma message(\"WARNING: \" DEPRECATION_WARNING)
33	-#else
34	- #warning DEPRECATION_WARNING
35	-#endif
36	-#include \"kodi/${headerfile}\"")
37	endforeach()
38	\ No newline at end of file

Lines 1-151 Link Here

(-)files/patch-sidplay (-151 lines)
1	diff --git lib/libsidplay2/Makefile.in lib/libsidplay2/Makefile.in
2	index 5dda4c9..14247e8 100644
3	--- lib/libsidplay2/Makefile.in
4	+++ lib/libsidplay2/Makefile.in
5	@@ -3,7 +3,7 @@ ARCH=@ARCH@
6	SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
7	-DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \
8	-Ibuilders/resid-builder/include/sidplay/builders \
9	- -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC
10	+ -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC
11	CFLAGS += $(SIDFLAGS)
12	CXXFLAGS += $(SIDFLAGS)
13	ifeq ($(ARCH), powerpc-osx)
14	@@ -54,13 +54,18 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so
15
16	$(SLIB): $(OBJS)
17	ifeq ($(findstring osx,$(ARCH)), osx)
18	- $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
19	+ $(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
20	-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
21	@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
22	else
23	- $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
24	+ $(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
25	`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
26	endif
27
28	include @abs_top_srcdir@/Makefile.include
29
30	+%.o: %.cpp
31	+ @rm -f $@
32	+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \
33	+ && $(GEN_DEPS)
34	+
35	diff --git lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
36	index 5a0f1d7..cd134dd 100644
37	--- lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
38	+++ lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h
39	@@ -24,7 +24,7 @@
40
41	#include <vector>
42	#include "sidbuilder.h"
43	-#include "event.h"
44	+#include "sidplay/event.h"
45
46
47	/***************************************************************************
48	diff --git lib/libsidplay2/libsidplay/include/sidplay/c64env.h lib/libsidplay2/libsidplay/include/sidplay/c64env.h
49	index a33664d..3779609 100644
50	--- lib/libsidplay2/libsidplay/include/sidplay/c64env.h
51	+++ lib/libsidplay2/libsidplay/include/sidplay/c64env.h
52	@@ -19,7 +19,7 @@
53	#define _c64env_h_
54
55	#include "sidtypes.h"
56	-#include "event.h"
57	+#include "sidplay/event.h"
58
59	/* An implementation of of this class can be created to perform the C64
60	specifics. A pointer to this child class can then be passed to
61	diff --git lib/libsidplay2/libsidplay/include/sidplay/sid2types.h lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
62	index 0911012..30b0bfe 100644
63	--- lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
64	+++ lib/libsidplay2/libsidplay/include/sidplay/sid2types.h
65	@@ -19,7 +19,7 @@
66	#define _sid2types_h_
67
68	#include "sidtypes.h"
69	-#include "event.h"
70	+#include "sidplay/event.h"
71
72	class sidbuilder;
73	struct SidTuneInfo;
74	diff --git lib/libsidplay2/libsidplay/src/event.cpp lib/libsidplay2/libsidplay/src/event.cpp
75	index bfa715c..218e1d6 100644
76	--- lib/libsidplay2/libsidplay/src/event.cpp
77	+++ lib/libsidplay2/libsidplay/src/event.cpp
78	@@ -50,7 +50,7 @@
79	***************************************************************************/
80
81	#include <string.h>
82	-#include "event.h"
83	+#include "sidplay/event.h"
84
85	#define EVENT_TIMEWARP_COUNT 0x0FFFFF
86
87	diff --git lib/libsidplay2/libsidplay/src/mos6510/mos6510.h lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
88	index 9516df5..d5f94ba 100644
89	--- lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
90	+++ lib/libsidplay2/libsidplay/src/mos6510/mos6510.h
91	@@ -36,7 +36,7 @@
92	#include "config.h"
93	#include "component.h"
94	#include "sidenv.h"
95	-#include "event.h"
96	+#include "sidplay/event.h"
97
98	#undef MOS6510_VERSION
99	#undef MOS6510_DATE
100	diff --git lib/libsidplay2/libsidplay/src/mos6526/mos6526.h lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
101	index 1cb665c..e6c740f 100644
102	--- lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
103	+++ lib/libsidplay2/libsidplay/src/mos6526/mos6526.h
104	@@ -85,7 +85,7 @@
105	#define _mos6526_h_
106
107	#include "component.h"
108	-#include "event.h"
109	+#include "sidplay/event.h"
110
111	class MOS6526: public component
112	{
113	diff --git lib/libsidplay2/libsidplay/src/mos656x/mos656x.h lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
114	index ef81202..00e4029 100644
115	--- lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
116	+++ lib/libsidplay2/libsidplay/src/mos656x/mos656x.h
117	@@ -19,7 +19,7 @@
118	#define _mos656x_h_
119
120	#include "component.h"
121	-#include "event.h"
122	+#include "sidplay/event.h"
123
124	typedef enum
125	{
126	diff --git lib/libsidplay2/libsidplay/src/sid6526/sid6526.h lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
127	index e1fb9c1..f2c0e2b 100644
128	--- lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
129	+++ lib/libsidplay2/libsidplay/src/sid6526/sid6526.h
130	@@ -38,7 +38,7 @@
131	#define _sid6526_h_
132
133	#include "component.h"
134	-#include "event.h"
135	+#include "sidplay/event.h"
136	#include "c64env.h"
137
138	class SID6526: public component
139	diff --git lib/libsidplay2/libsidplay/src/xsid/xsid.h lib/libsidplay2/libsidplay/src/xsid/xsid.h
140	index 572b813..54313a2 100644
141	--- lib/libsidplay2/libsidplay/src/xsid/xsid.h
142	+++ lib/libsidplay2/libsidplay/src/xsid/xsid.h
143	@@ -106,7 +106,7 @@ programmed with.
144
145	#include "config.h"
146	#include "sidbuilder.h"
147	-#include "event.h"
148	+#include "sidplay/event.h"
149
150	// XSID configuration settings
151	//#define XSID_DEBUG 1

Lines 1-5 Link Here

(-)files/patch-tools__depends__target__ffmpeg__autobuild.sh (-6 / +6 lines)
1	--- tools/depends/target/ffmpeg/autobuild.sh.orig 2014-12-23 00:11:35.000000000 +0100	1	--- tools/depends/target/ffmpeg/autobuild.sh.orig 2015-03-31 16:37:07 UTC
2	+++ tools/depends/target/ffmpeg/autobuild.sh 2014-12-24 16:22:20.000000000 +0100	2	+++ tools/depends/target/ffmpeg/autobuild.sh
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/bin/bash	4	-#!/bin/bash
5	+#!/bin/sh	5	+#!/bin/sh
Lines 65-72 Link Here
65		65
66	CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \	66	CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
67	./configure --prefix=$FFMPEG_PREFIX \	67	./configure --prefix=$FFMPEG_PREFIX \
68	@@ -157,11 +166,11 @@	68	@@ -161,11 +170,11 @@
69	--enable-zlib \	69	--disable-mipsdspr2 \
70	${FLAGS}	70	${FLAGS}
71		71
72	-make -j ${BUILDTHREADS}	72	-make -j ${BUILDTHREADS}
Lines 73-81 Link Here
73	+gmake -j ${BUILDTHREADS}	73	+gmake -j ${BUILDTHREADS}
74	if [ $? -eq 0 ]	74	if [ $? -eq 0 ]
75	then	75	then
76	[ ${SUDO} ] && echo "Root priviledges are required to install to ${FFMPEG_PREFIX}"	76	[ ${SUDO} ] && echo "Root privileges are required to install to ${FFMPEG_PREFIX}"
77	- ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed	77	- ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed
78	+ ${SUDO} gmake install && echo "$VERSION" > ../.ffmpeg-installed	78	+ ${SUDO} gmake install && echo "$VERSION" > ../.ffmpeg-installed
79	else	79	else
80	echo "ERROR: building ffmpeg failed"	80	echo "ERROR: Building ffmpeg failed"
81	exit 1	81	exit 1

Line 0 Link Here

(-)files/patch-xbmc__LangInfo.cpp (+13 lines)
	1	--- xbmc/LangInfo.cpp.orig 2015-07-21 18:41:29 UTC
	2	+++ xbmc/LangInfo.cpp
	3	@@ -275,8 +275,8 @@
	4	// decimal separator is changed depending of the current language
	5	// (ie. "," in French or Dutch instead of "."). This breaks atof() and
	6	// others similar functions.
	7	-#if defined(TARGET_FREEBSD) \|\| defined(TARGET_DARWIN_OSX) \|\| defined(__UCLIBC__)
	8	- // on FreeBSD, darwin and uClibc-based systems libstdc++ is compiled with
	9	+#if defined(TARGET_DARWIN_OSX) \|\| defined(__UCLIBC__)
	10	+ // on darwin and uClibc-based systems libstdc++ is compiled with
	11	// "generic" locale support
	12	if (setlocale(LC_COLLATE, strLocale.c_str()) == NULL
	13	\|\| setlocale(LC_CTYPE, strLocale.c_str()) == NULL)

Line 0 Link Here

(-)files/patch-xbmc__main__main.cpp (+18 lines)
	1	--- xbmc/main/main.cpp.orig 2015-04-13 12:43:35 UTC
	2	+++ xbmc/main/main.cpp
	3	@@ -28,6 +28,7 @@
	4	#ifdef TARGET_POSIX
	5	#include <sys/resource.h>
	6	#include <signal.h>
	7	+#include <locale.h>
	8	#endif
	9	#if defined(TARGET_DARWIN_OSX)
	10	#include "Util.h"
	11	@@ -35,7 +36,6 @@
	12	#ifdef HAS_SDL
	13	#include <SDL/SDL.h>
	14	#endif
	15	-#include <locale.h>
	16	#endif
	17	#ifdef HAS_LIRC
	18	#include "input/linux/LIRC.h"

Line 0 Link Here

(-)files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp (+13 lines)
	1	--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2014-12-22 23:11:35 UTC
	2	+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp
	3	@@ -31,9 +31,8 @@
	4	#include <sys/param.h>
	5	#if __FreeBSD_version < 900031
	6	#include <sys/thr.h>
	7	-#else
	8	-#include <pthread_np.h>
	9	#endif
	10	+#include <pthread_np.h>
	11	#endif
	12
	13	#include <signal.h>

Lines 2-11 Link Here

(-)pkg-plist (-579 / +502 lines)
2	bin/kodi-standalone	2	bin/kodi-standalone
3	bin/xbmc	3	bin/xbmc
4	bin/xbmc-standalone	4	bin/xbmc-standalone
		5	include/kodi/AEChannelData.h
5	include/kodi/DVDDemuxPacket.h	6	include/kodi/DVDDemuxPacket.h
		7	include/kodi/kodi_audiodec_dll.h
		8	include/kodi/kodi_audiodec_types.h
		9	include/kodi/libKODI_guilib.h
6	include/kodi/libXBMC_addon.h	10	include/kodi/libXBMC_addon.h
7	include/kodi/libXBMC_codec.h	11	include/kodi/libXBMC_codec.h
8	include/kodi/libXBMC_gui.h
9	include/kodi/libXBMC_pvr.h	12	include/kodi/libXBMC_pvr.h
10	include/kodi/xbmc_addon_cpp_dll.h	13	include/kodi/xbmc_addon_cpp_dll.h
11	include/kodi/xbmc_addon_dll.h	14	include/kodi/xbmc_addon_dll.h
Lines 23-31 Link Here
23	include/kodi/xbmc_vis_types.h	26	include/kodi/xbmc_vis_types.h
24	include/xbmc	27	include/xbmc
25	lib/kodi/addon-helpers.cmake	28	lib/kodi/addon-helpers.cmake
		29	lib/kodi/addons/library.kodi.guilib/libKODI_guilib-%%ARCH%%-freebsd.so
26	lib/kodi/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so	30	lib/kodi/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so
27	lib/kodi/addons/library.xbmc.codec/libXBMC_codec-%%ARCH%%-freebsd.so	31	lib/kodi/addons/library.xbmc.codec/libXBMC_codec-%%ARCH%%-freebsd.so
28	lib/kodi/addons/library.xbmc.gui/libXBMC_gui-%%ARCH%%-freebsd.so
29	lib/kodi/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so	32	lib/kodi/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so
30	lib/kodi/addons/screensaver.rsxs.euphoria/Euphoria.xbs	33	lib/kodi/addons/screensaver.rsxs.euphoria/Euphoria.xbs
31	lib/kodi/addons/screensaver.rsxs.plasma/Plasma.xbs	34	lib/kodi/addons/screensaver.rsxs.plasma/Plasma.xbs
Lines 35-40 Link Here
35	lib/kodi/addons/visualization.projectm/projectM.vis	38	lib/kodi/addons/visualization.projectm/projectM.vis
36	lib/kodi/addons/visualization.waveform/Waveform.vis	39	lib/kodi/addons/visualization.waveform/Waveform.vis
37	lib/kodi/addoptions.cmake	40	lib/kodi/addoptions.cmake
		41	lib/kodi/check_target_platform.cmake
		42	lib/kodi/handle-depends.cmake
38	lib/kodi/kodi-config.cmake	43	lib/kodi/kodi-config.cmake
39	lib/kodi/kodi-xrandr	44	lib/kodi/kodi-xrandr
40	lib/kodi/kodi.bin	45	lib/kodi/kodi.bin
Lines 41-56 Link Here
41	lib/kodi/prepare-env.cmake	46	lib/kodi/prepare-env.cmake
42	lib/kodi/system/ImageLib-%%ARCH%%-freebsd.so	47	lib/kodi/system/ImageLib-%%ARCH%%-freebsd.so
43	lib/kodi/system/hdhomerun-%%ARCH%%-freebsd.so	48	lib/kodi/system/hdhomerun-%%ARCH%%-freebsd.so

Lines 1-13 Link Here

(-)files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp (-13 lines)
1	--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2014-12-22 23:11:35 UTC
2	+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp
3	@@ -31,9 +31,8 @@
4	#include <sys/param.h>
5	#if __FreeBSD_version < 900031
6	#include <sys/thr.h>
7	-#else
8	-#include <pthread_np.h>
9	#endif
10	+#include <pthread_np.h>
11	#endif
12
13	#include <signal.h>