Date: Sat, 28 Feb 2015 15:06:55 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380146 - in head: . multimedia multimedia/kodi multimedia/kodi/files multimedia/xbmc Message-ID: <201502281506.t1SF6tLx015015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Feb 28 15:06:54 2015 New Revision: 380146 URL: https://svnweb.freebsd.org/changeset/ports/380146 QAT: https://qat.redports.org/buildarchive/r380146/ Log: - Rename XBMC to Kodi following upstream - Update to 14.0 Changes: http://kodi.tv/introducing-kodi-14/ PR: 196299 Differential Revision: https://reviews.freebsd.org/D1900 Submitted by: mickael.maillot@gmail.com (maintainer) Reviewed by: bapt Added: head/multimedia/kodi/ - copied from r380145, head/multimedia/xbmc/ head/multimedia/kodi/files/patch-Makefile.include.in (contents, props changed) head/multimedia/kodi/files/patch-ffmpegx86 - copied, changed from r380145, head/multimedia/xbmc/files/patch-lib__ffmpeg__libavutil__x86__asm.h head/multimedia/kodi/files/patch-freebsd (contents, props changed) head/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake (contents, props changed) head/multimedia/kodi/files/patch-sidplay (contents, props changed) head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh (contents, props changed) head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp - copied, changed from r380145, head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp - copied, changed from r380145, head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp (contents, props changed) head/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp (contents, props changed) head/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp (contents, props changed) head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp - copied, changed from r380145, head/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp Deleted: head/multimedia/kodi/files/patch-lib__ffmpeg__libavutil__x86__asm.h head/multimedia/kodi/files/patch-libcec22 head/multimedia/kodi/files/patch-xbmc__cores__AudioEngine__Sinks__AESinkOSS.cpp head/multimedia/kodi/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp head/multimedia/kodi/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp head/multimedia/kodi/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp head/multimedia/kodi/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__Common.hpp head/multimedia/xbmc/ Modified: head/MOVED head/multimedia/Makefile head/multimedia/kodi/Makefile head/multimedia/kodi/distinfo head/multimedia/kodi/files/patch-configure.in head/multimedia/kodi/pkg-descr head/multimedia/kodi/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Feb 28 14:55:08 2015 (r380145) +++ head/MOVED Sat Feb 28 15:06:54 2015 (r380146) @@ -7427,3 +7427,4 @@ japanese/mozc-additions||2015-02-15|Obso math/ruby-numru_units|math/rubygem-numru-units|2015-02-22|Long time broken. Please use math/rubygem-numru-units instead lang/ruby19|lang/ruby20|2015-02-24|Upstream support ended February 23, 2015 games/trigger|games/trigger-rally|2015-02-26|Follow upstream naming +multimedia/xbmc|multimedia/kodi|2015-02-28|Project renamed Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Sat Feb 28 14:55:08 2015 (r380145) +++ head/multimedia/Makefile Sat Feb 28 15:06:54 2015 (r380146) @@ -161,6 +161,7 @@ SUBDIR += kdenlive SUBDIR += kissdx SUBDIR += kmplayer-kde4 + SUBDIR += kodi SUBDIR += kplayer-kde4 SUBDIR += libaacs SUBDIR += libass @@ -409,7 +410,6 @@ SUBDIR += x265 SUBDIR += xanim SUBDIR += xawtv - SUBDIR += xbmc SUBDIR += xbmc-addon-pvr SUBDIR += xfce4-parole SUBDIR += xine Modified: head/multimedia/kodi/Makefile ============================================================================== --- head/multimedia/xbmc/Makefile Sat Feb 28 14:55:08 2015 (r380145) +++ head/multimedia/kodi/Makefile Sat Feb 28 15:06:54 2015 (r380146) @@ -1,10 +1,14 @@ # $FreeBSD$ -PORTNAME= xbmc -DISTVERSION= 13.2 -PORTREVISION= 7 +PORTNAME= kodi +DISTVERSION= 14.0 +PORTREVISION= 0 CATEGORIES= multimedia -MASTER_SITES= http://mirrors.xbmc.org/releases/source/ +MASTER_SITES= http://mirrors.kodi.tv/releases/source/ \ + GH:ffmpeg +DISTFILES= ${DISTVERSION}-Helix${EXTRACT_SUFX} \ + ${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg +EXTRACT_ONLY= ${DISTVERSION}-Helix${EXTRACT_SUFX} MAINTAINER= mickael.maillot@gmail.com COMMENT= Award winning media center application @@ -25,17 +29,18 @@ LIB_DEPENDS= libass.so:${PORTSDIR}/multi libcdio.so:${PORTSDIR}/sysutils/libcdio \ libcurl.so:${PORTSDIR}/ftp/curl \ libdbus-1.so:${PORTSDIR}/devel/dbus \ + libdrm.so:${PORTSDIR}/graphics/libdrm \ libenca.so:${PORTSDIR}/converters/enca \ libGLEW.so:${PORTSDIR}/graphics/glew \ libFLAC.so:${PORTSDIR}/audio/flac \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ + libgnutls.so:${PORTSDIR}/security/gnutls \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libjasper.so:${PORTSDIR}/graphics/jasper \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libltdl.so:${PORTSDIR}/devel/libltdl \ - libmad.so:${PORTSDIR}/audio/libmad \ libmodplug.so:${PORTSDIR}/audio/libmodplug \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libpcre.so:${PORTSDIR}/devel/pcre \ @@ -49,48 +54,46 @@ LIB_DEPENDS= libass.so:${PORTSDIR}/multi libyajl.so:${PORTSDIR}/devel/yajl RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ glxinfo:${PORTSDIR}/graphics/mesa-demos \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ + python:${PORTSDIR}/lang/python \ xdpyinfo:${PORTSDIR}/x11/xdpyinfo +USE_GITHUB= yes +GH_ACCOUNT= xbmc +GH_PROJECT= ffmpeg +GH_COMMIT= 8865ab5 +GH_TAGNAME= 2.4.4-Helix + USES= gettext gmake iconv:wchar_t libtool:build pkgconfig python:2 USE_AUTOTOOLS= autoconf:env automake:env GNU_CONFIGURE= yes USE_XORG= xt xmu xtst USE_GL= glu -USE_SDL= image sdl +USE_SDL= image sdl2 USE_JAVA= yes JAVA_BUILD= jre NOPRECIOUSMAKEVARS= yes INSTALLS_ICONS= yes ONLY_FOR_ARCHS= i386 amd64 -DESKTOP_ENTRIES="XBMC" \ - "${COMMENT}" \ - "${DATADIR}/media/icon.png" \ - "xbmc" \ - "AudioVideo;Video;" \ - true - -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-Gotham +WRKSRC= ${WRKDIR}/xbmc-${DISTVERSION}-Helix OPTIONS_SUB= yes -OPTIONS_DEFINE= AIRPLAY AIRTUNES AVAHI CEC DOCS LAME \ - LIBBLURAY HAL LIRC MYSQL NONFREE PULSEAUDIO RTMP SFTP \ - SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR +OPTIONS_DEFINE= AIRPLAY AIRTUNES AVAHI CEC DOCS \ + LIBBLURAY LIRC MYSQL NONFREE RTMP SFTP \ + SMB VAAPI VDPAU WEBSERVER XRANDR AIRPLAY_DESC= AirPlay support via libplist -AIRTUNES_DESC= AirTunes support via libshairport +AIRTUNES_DESC= AirTunes support via libshairplay CEC_DESC= CEC adapter support NONFREE_DESC= Enable non-free components (rar, ccx, ffmpeg) SFTP_DESC= SSH SFTP support via libssh -VORBIS_DESC= Ogg Vorbis audio encoder -OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY HAL LIRC MYSQL \ - RTMP SFTP SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR +OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC MYSQL \ + RTMP SFTP SMB VAAPI VDPAU WEBSERVER XRANDR AIRPLAY_LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist AIRPLAY_CONFIGURE_ENABLE= airplay -AIRTUNES_LIB_DEPENDS= libshairport.so:${PORTSDIR}/audio/libshairport +AIRTUNES_LIB_DEPENDS= libshairplay.so:${PORTSDIR}/audio/shairplay AIRTUNES_CONFIGURE_ENABLE= airtunes AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app @@ -103,12 +106,6 @@ CEC_CONFIGURE_ENABLE= libcec LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray -HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal -HAL_CONFIGURE_ENABLE= hal - -LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame -LAME_CONFIGURE_ENABLE= libmp3lame - LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comms/lirc MYSQL_USE= MYSQL=yes @@ -116,9 +113,6 @@ MYSQL_CONFIGURE_ENABLE= mysql NONFREE_CONFIGURE_ENABLE= non-free -PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio -PULSEAUDIO_CONFIGURE_ENABLE= pulse - RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= rtmp @@ -132,9 +126,6 @@ VAAPI_CONFIGURE_ENABLE= vaapi VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau -VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis -VORBIS_CONFIGURE_ENABLE= libvorbisenc - WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd WEBSERVER_CONFIGURE_ENABLE= webserver @@ -145,7 +136,7 @@ SFTP_CONFIGURE_ENABLE= ssh XRANDR_USE= XORG=xrandr XRANDR_CONFIGURE_ENABLE= xrandr -CONFIGURE_ARGS+= --disable-debug --disable-nfs --disable-alsa +CONFIGURE_ARGS+= --disable-debug --disable-nfs --disable-alsa --disable-pulse .include <bsd.port.options.mk> @@ -166,6 +157,11 @@ NO_CDROM= Restricted binary distribution NO_PACKAGE= ${NO_CDROM} .endif +post-extract: + ${MKDIR} ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME} + ${TAR} --strip-components=1 -xf ${DISTDIR}/${GH_PROJECT}-${GH_TAGNAME}.tar.gz \ + -C ${WRKSRC}/tools/depends/target/ffmpeg/${GH_PROJECT}-${GH_TAGNAME} + post-patch: ${REINPLACE_CMD} 's;"event\.h";"sidplay/event.h";' \ ${WRKSRC}/lib/libsidplay2/libsidplay/src/event.cpp \ @@ -174,24 +170,23 @@ post-patch: ${WRKSRC}/lib/libsidplay2/libsidplay/src/mos656x/mos656x.h ${REINPLACE_CMD} 's;make;gmake;' \ ${WRKSRC}/bootstrap \ + ${WRKSRC}/codegenerator.mk \ + ${WRKSRC}/xbmc/Makefile.in \ ${WRKSRC}/tools/TexturePacker/Makefile.in ${REINPLACE_CMD} 's;which swig;&2.0;' ${WRKSRC}/codegenerator.mk ${REINPLACE_CMD} '/^autopoint/d' ${WRKSRC}/lib/cpluff/autogen.sh - ${REINPLACE_CMD} 's;static weak_ptr;static boost::weak_ptr;' \ - ${WRKSRC}/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp run-autotools: cd ${WRKSRC} && ${SH} ./bootstrap - ${REINPLACE_CMD} "s;'' iconv;iconv;" ${WRKSRC}/configure post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/manpages/xbmc.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - (cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf xbmc.bin.1.gz xbmc.1.gz) - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xbmc/xbmc.bin - ${FIND} ${STAGEDIR}${PREFIX}/lib/xbmc -name '*.so' -or -name '*.xbs' -or -name '*.vis' \ + ${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + (cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz) + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi.bin + ${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' -or -name '*.xbs' -or -name '*.vis' \ | ${XARGS} ${STRIP_CMD} .if ${PORT_OPTIONS:MXRANDR} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xbmc/xbmc-xrandr + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr .endif .include <bsd.port.mk> Modified: head/multimedia/kodi/distinfo ============================================================================== --- head/multimedia/xbmc/distinfo Sat Feb 28 14:55:08 2015 (r380145) +++ head/multimedia/kodi/distinfo Sat Feb 28 15:06:54 2015 (r380146) @@ -1,2 +1,4 @@ -SHA256 (xbmc-13.2.tar.gz) = acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585 -SIZE (xbmc-13.2.tar.gz) = 65900491 +SHA256 (14.0-Helix.tar.gz) = 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192 +SIZE (14.0-Helix.tar.gz) = 70811373 +SHA256 (ffmpeg-2.4.4-Helix.tar.gz) = 58f93865780873f8d12dc401a100aa7b58ec1e43522a8d271e7989056c481080 +SIZE (ffmpeg-2.4.4-Helix.tar.gz) = 8876754 Added: head/multimedia/kodi/files/patch-Makefile.include.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-Makefile.include.in Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,41 @@ +diff --git Makefile.include.in Makefile.include.in +index 6ee228a..daeb046 100644 +--- Makefile.include.in ++++ Makefile.include.in +@@ -43,7 +43,8 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui + INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon + INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr + INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec +-INCLUDES+=$(sort @INCLUDES@) ++#INCLUDES+=$(sort @INCLUDES@) ++INCLUDES+=@INCLUDES@ + INCLUDES+=-I@abs_top_srcdir@/xbmc/linux + INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer + DEFINES+= \ +@@ -91,22 +92,22 @@ GEN_DEPS=\ + + %.o: %.cpp + @rm -f $@ +- $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \ ++ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \ + && $(GEN_DEPS) + + %.o: %.cc + @rm -f $@ +- $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \ ++ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CXXFLAGS) $< -o $@ \ + && $(GEN_DEPS) + + %.o: %.c + @rm -f $@ +- $(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \ ++ $(SILENT_CC) $(CC) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \ + && $(GEN_DEPS) + + %.o: %.C + @rm -f $@ +- $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \ ++ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(DEFINES) $(INCLUDES) $(CFLAGS) $< -o $@ \ + && $(GEN_DEPS) + + %.o: %.S Modified: head/multimedia/kodi/files/patch-configure.in ============================================================================== --- head/multimedia/xbmc/files/patch-configure.in Sat Feb 28 14:55:08 2015 (r380145) +++ head/multimedia/kodi/files/patch-configure.in Sat Feb 28 15:06:54 2015 (r380146) @@ -1,6 +1,19 @@ ---- configure.in.orig 2014-01-01 03:26:03.000000000 +0100 -+++ configure.in 2014-01-05 00:33:52.000000000 +0100 -@@ -820,11 +820,16 @@ +--- configure.in.orig 2014-12-08 19:57:30.000000000 +0100 ++++ configure.in 2014-12-16 15:55:58.000000000 +0100 +@@ -621,10 +621,12 @@ + i386-*-freebsd*) + ARCH="x86-freebsd" + MAKE="gmake" ++ USE_STATIC_FFMPEG=1 + ;; + amd64-*-freebsd*) + ARCH="x86_64-freebsd" + MAKE="gmake" ++ USE_STATIC_FFMPEG=1 + ;; + arm-apple-darwin*) + use_joystick=no +@@ -781,10 +783,16 @@ # platform specific flags if echo "$ARCH" | grep -q "freebsd" ; then LOCALBASE="${LOCALBASE:-/usr/local}" @@ -11,21 +24,66 @@ + CXXFLAGS="$CXXFLAGS -idirafter$LOCALBASE/include" + CPPFLAGS="$CPPFLAGS -idirafter$LOCALBASE/include" LDFLAGS="$LDFLAGS -L$LOCALBASE/lib" -- FFMPEG_EXTRACFLAGS="-I$LOCALBASE/include" -+ FFMPEG_EXTRACFLAGS="-idirafter$LOCALBASE/include" + CC_FOR_BUILD="$CC" + CXX_FOR_BUILD="$CXX" + CFLAGS_FOR_BUILD="$CFLAGS" + CXXFLAGS_FOR_BUILD="$CXXFLAGS" + LDFLAGS_FOR_BUILD="$LDFLAGS" ++ FFMPEG_OPTS="--cc=$CC --cxx=$CXX" fi if test "$host_vendor" = "apple" ; then - # standard xbmc paths -@@ -948,6 +953,7 @@ + # standard application paths +@@ -1184,7 +1192,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],,) + #Check to see if libs are needed for functions that are often built-in to libc +-AC_SEARCH_LIBS([iconv_open],iconv,,AC_SEARCH_LIBS([libiconv_open],iconv,,AC_MSG_ERROR($missing_library))) ++AC_CHECK_LIB([iconv],[libiconv_open],,AC_MSG_ERROR($missing_library)) + AC_SEARCH_LIBS([dlopen],dl) + AC_SEARCH_LIBS([clock_gettime],rt) + AC_SEARCH_LIBS([dn_expand], resolv) +@@ -1699,7 +1707,7 @@ - # Checks for boost headers using CXX instead of CC - AC_LANG_PUSH([C++]) + if test "$cross_compiling" != "yes"; then + if test "$use_debug" != "yes"; then +- FFMPEG_OPTS="-r" ++ FFMPEG_OPTS="${FFMPEG_OPTS} -r" + fi + if test "$use_optimizations" != "yes"; then + FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations" +@@ -1710,7 +1718,7 @@ + SAVE_LIBS="$LIBS" + # check for system installed ffmpeg. We require minimum versions. + PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES], +- [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"], ++ [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"], + [FFMPEG_FOUND="false"]) + + if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then +@@ -1737,7 +1745,7 @@ + elif test "$with_ffmpeg" = "force"; then + # always build our ffmpeg + AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version") +- CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} ++ CC="$CC" CPP="$CPP" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" ${ffmpeg_build}/autobuild.sh ${FFMPEG_OPTS} || exit 1 + export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH" + + elif test "$with_ffmpeg" != "no"; then +@@ -1750,7 +1758,7 @@ + + if test "$FFMPEG_FOUND" != "true"; then + PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES], +- [INCLUDES="$INCLUDES $FFMPEG_CFLAGS"; LIBS="$LIBS $FFMPEG_LIBS"; FFMPEG_FOUND="true"], ++ [INCLUDES="$FFMPEG_CFLAGS $INCLUDES"; LIBS="$FFMPEG_LIBS $LIBS"; FFMPEG_FOUND="true"], + [AC_MSG_ERROR("ffmpeg not found")]) + fi + +@@ -2408,6 +2416,8 @@ + LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale" + fi + ++LIBS=$(echo "$LIBS" | tr "\n" " ") ++ + USE_PVR_ADDONS=0 + DISABLE_PVR_ADDON_CONFIG=1 + if [[ -f "pvr-addons/Makefile.am" ]]; then Copied and modified: head/multimedia/kodi/files/patch-ffmpegx86 (from r380145, head/multimedia/xbmc/files/patch-lib__ffmpeg__libavutil__x86__asm.h) ============================================================================== --- head/multimedia/xbmc/files/patch-lib__ffmpeg__libavutil__x86__asm.h Sat Feb 28 14:55:08 2015 (r380145, copy source) +++ head/multimedia/kodi/files/patch-ffmpegx86 Sat Feb 28 15:06:54 2015 (r380146) @@ -1,6 +1,6 @@ ---- ./lib/ffmpeg/libavutil/x86/asm.h.orig 2014-01-01 02:26:03.000000000 +0000 -+++ ./lib/ffmpeg/libavutil/x86/asm.h 2014-01-12 10:28:23.000000000 +0000 -@@ -68,7 +68,7 @@ +--- tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix/libavutil/x86/asm.h.orig 2014-12-25 13:59:22.000000000 +0100 ++++ tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix/libavutil/x86/asm.h 2014-12-25 14:00:04.000000000 +0100 +@@ -71,7 +71,7 @@ typedef int x86_reg; #endif Added: head/multimedia/kodi/files/patch-freebsd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-freebsd Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,54 @@ +diff --git lib/cpluff/autogen.sh lib/cpluff/autogen.sh +index ee0a418..efd5291 100755 +--- lib/cpluff/autogen.sh ++++ lib/cpluff/autogen.sh +@@ -15,7 +15,7 @@ fi + + # Generate files in top level directory + cd "$basedir" +-autopoint ++#autopoint + rm -f ABOUT-NLS + test -d auxliary || mkdir auxliary + libtoolize --automake -f +diff --git tools/depends/target/ffmpeg/Makefile tools/depends/target/ffmpeg/Makefile +index 0e08dcf..e94d78f 100644 +--- tools/depends/target/ffmpeg/Makefile ++++ tools/depends/target/ffmpeg/Makefile +@@ -21,6 +21,11 @@ ffmpg_config += --enable-encoder=wmav2 --enable-protocol=http + ifeq ($(CROSS_COMPILING), yes) + ffmpg_config += --arch=$(CPU) --enable-cross-compile + endif ++ifeq ($(OS), freebsd) ++ ffmpg_config += --target-os=$(OS) --cpu=$(CPU) ++ ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls ++ ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis ++endif + ifeq ($(OS), linux) + ffmpg_config += --target-os=$(OS) --cpu=$(CPU) + ffmpg_config += --enable-vdpau --enable-vaapi --enable-gnutls +diff --git xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp +index 2b6e646..babfe89 100644 +--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp ++++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp +@@ -289,6 +289,8 @@ bool CAESinkOSS::Initialize(AEAudioFormat &format, std::string &device) + #endif + + int tmp = (CAEUtil::DataFormatToBits(format.m_dataFormat) >> 3) * format.m_channelLayout.Count() * OSS_FRAMES; ++ if (AE_IS_RAW_HD(format.m_dataFormat) && m_initFormat.m_dataFormat != AE_FMT_LPCM) ++ tmp *= 8; + int pos = 0; + while ((tmp & 0x1) == 0x0) + { +diff --git xbmc/cores/AudioEngine/Utils/AEELDParser.cpp xbmc/cores/AudioEngine/Utils/AEELDParser.cpp +index af4715c..0879bd5 100644 +--- xbmc/cores/AudioEngine/Utils/AEELDParser.cpp ++++ xbmc/cores/AudioEngine/Utils/AEELDParser.cpp +@@ -23,6 +23,7 @@ + #include "utils/EndianSwap.h" + #include <string.h> + #include <algorithm> ++#include <functional> + + #include <stdio.h> + Added: head/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-project__cmake__scripts__common__prepare-env.cmake Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,38 @@ +--- project/cmake/scripts/common/prepare-env.cmake.orig 2014-12-19 08:42:16.000000000 +0100 ++++ project/cmake/scripts/common/prepare-env.cmake 2014-12-21 20:51:17.000000000 +0100 +@@ -45,12 +45,12 @@ + get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE) + + # generate the proper kodi-config.cmake file +-configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY) ++#configure_file(${APP_ROOT}/project/cmake/kodi-config.cmake.in ${KODI_LIB_DIR}/kodi-config.cmake @ONLY) + # copy cmake helpers to lib/kodi +-file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR}) ++#file(COPY ${APP_ROOT}/project/cmake/scripts/common/addon-helpers.cmake ${APP_ROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${KODI_LIB_DIR}) + + # generate xbmc-config.cmake for backwards compatibility to xbmc +-configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY) ++#configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY) + + ### copy all the addon binding header files to include/kodi + # parse addon-bindings.mk to get the list of header files to copy +@@ -61,17 +61,6 @@ + string(REPLACE "+=" ";" binding "${binding}") + list(GET binding 1 header) + # copy the header file to include/kodi +- file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR}) ++ #file(COPY ${APP_ROOT}/${header} DESTINATION ${KODI_INCLUDE_DIR}) + +- # auto-generate header files for backwards comaptibility to xbmc with deprecation warning +- get_filename_component(headerfile ${header} NAME) +- file(WRITE ${XBMC_INCLUDE_DIR}/${headerfile} +-"#pragma once +-#define DEPRECATION_WARNING \"Including xbmc/${headerfile} has been deprecated, please use kodi/${headerfile}\" +-#ifdef _MSC_VER +- #pragma message(\"WARNING: \" DEPRECATION_WARNING) +-#else +- #warning DEPRECATION_WARNING +-#endif +-#include \"kodi/${headerfile}\"") + endforeach() +\ No newline at end of file Added: head/multimedia/kodi/files/patch-sidplay ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-sidplay Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,151 @@ +diff --git lib/libsidplay2/Makefile.in lib/libsidplay2/Makefile.in +index 5dda4c9..14247e8 100644 +--- lib/libsidplay2/Makefile.in ++++ lib/libsidplay2/Makefile.in +@@ -3,7 +3,7 @@ ARCH=@ARCH@ + SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \ + -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \ + -Ibuilders/resid-builder/include/sidplay/builders \ +- -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC ++ -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC + CFLAGS += $(SIDFLAGS) + CXXFLAGS += $(SIDFLAGS) + ifeq ($(ARCH), powerpc-osx) +@@ -54,13 +54,18 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so + + $(SLIB): $(OBJS) + ifeq ($(findstring osx,$(ARCH)), osx) +- $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ ++ $(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ + -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + else +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ ++ $(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o + endif + + include @abs_top_srcdir@/Makefile.include + ++%.o: %.cpp ++ @rm -f $@ ++ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \ ++ && $(GEN_DEPS) ++ +diff --git lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h +index 5a0f1d7..cd134dd 100644 +--- lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h ++++ lib/libsidplay2/builders/resid-builder/include/sidplay/builders/resid.h +@@ -24,7 +24,7 @@ + + #include <vector> + #include "sidbuilder.h" +-#include "event.h" ++#include "sidplay/event.h" + + + /*************************************************************************** +diff --git lib/libsidplay2/libsidplay/include/sidplay/c64env.h lib/libsidplay2/libsidplay/include/sidplay/c64env.h +index a33664d..3779609 100644 +--- lib/libsidplay2/libsidplay/include/sidplay/c64env.h ++++ lib/libsidplay2/libsidplay/include/sidplay/c64env.h +@@ -19,7 +19,7 @@ + #define _c64env_h_ + + #include "sidtypes.h" +-#include "event.h" ++#include "sidplay/event.h" + + /* An implementation of of this class can be created to perform the C64 + specifics. A pointer to this child class can then be passed to +diff --git lib/libsidplay2/libsidplay/include/sidplay/sid2types.h lib/libsidplay2/libsidplay/include/sidplay/sid2types.h +index 0911012..30b0bfe 100644 +--- lib/libsidplay2/libsidplay/include/sidplay/sid2types.h ++++ lib/libsidplay2/libsidplay/include/sidplay/sid2types.h +@@ -19,7 +19,7 @@ + #define _sid2types_h_ + + #include "sidtypes.h" +-#include "event.h" ++#include "sidplay/event.h" + + class sidbuilder; + struct SidTuneInfo; +diff --git lib/libsidplay2/libsidplay/src/event.cpp lib/libsidplay2/libsidplay/src/event.cpp +index bfa715c..218e1d6 100644 +--- lib/libsidplay2/libsidplay/src/event.cpp ++++ lib/libsidplay2/libsidplay/src/event.cpp +@@ -50,7 +50,7 @@ + ***************************************************************************/ + + #include <string.h> +-#include "event.h" ++#include "sidplay/event.h" + + #define EVENT_TIMEWARP_COUNT 0x0FFFFF + +diff --git lib/libsidplay2/libsidplay/src/mos6510/mos6510.h lib/libsidplay2/libsidplay/src/mos6510/mos6510.h +index 9516df5..d5f94ba 100644 +--- lib/libsidplay2/libsidplay/src/mos6510/mos6510.h ++++ lib/libsidplay2/libsidplay/src/mos6510/mos6510.h +@@ -36,7 +36,7 @@ + #include "config.h" + #include "component.h" + #include "sidenv.h" +-#include "event.h" ++#include "sidplay/event.h" + + #undef MOS6510_VERSION + #undef MOS6510_DATE +diff --git lib/libsidplay2/libsidplay/src/mos6526/mos6526.h lib/libsidplay2/libsidplay/src/mos6526/mos6526.h +index 1cb665c..e6c740f 100644 +--- lib/libsidplay2/libsidplay/src/mos6526/mos6526.h ++++ lib/libsidplay2/libsidplay/src/mos6526/mos6526.h +@@ -85,7 +85,7 @@ + #define _mos6526_h_ + + #include "component.h" +-#include "event.h" ++#include "sidplay/event.h" + + class MOS6526: public component + { +diff --git lib/libsidplay2/libsidplay/src/mos656x/mos656x.h lib/libsidplay2/libsidplay/src/mos656x/mos656x.h +index ef81202..00e4029 100644 +--- lib/libsidplay2/libsidplay/src/mos656x/mos656x.h ++++ lib/libsidplay2/libsidplay/src/mos656x/mos656x.h +@@ -19,7 +19,7 @@ + #define _mos656x_h_ + + #include "component.h" +-#include "event.h" ++#include "sidplay/event.h" + + typedef enum + { +diff --git lib/libsidplay2/libsidplay/src/sid6526/sid6526.h lib/libsidplay2/libsidplay/src/sid6526/sid6526.h +index e1fb9c1..f2c0e2b 100644 +--- lib/libsidplay2/libsidplay/src/sid6526/sid6526.h ++++ lib/libsidplay2/libsidplay/src/sid6526/sid6526.h +@@ -38,7 +38,7 @@ + #define _sid6526_h_ + + #include "component.h" +-#include "event.h" ++#include "sidplay/event.h" + #include "c64env.h" + + class SID6526: public component +diff --git lib/libsidplay2/libsidplay/src/xsid/xsid.h lib/libsidplay2/libsidplay/src/xsid/xsid.h +index 572b813..54313a2 100644 +--- lib/libsidplay2/libsidplay/src/xsid/xsid.h ++++ lib/libsidplay2/libsidplay/src/xsid/xsid.h +@@ -106,7 +106,7 @@ programmed with. + + #include "config.h" + #include "sidbuilder.h" +-#include "event.h" ++#include "sidplay/event.h" + + // XSID configuration settings + //#define XSID_DEBUG 1 Added: head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-tools__depends__target__ffmpeg__autobuild.sh Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,81 @@ +--- tools/depends/target/ffmpeg/autobuild.sh.orig 2014-12-23 00:11:35.000000000 +0100 ++++ tools/depends/target/ffmpeg/autobuild.sh 2014-12-24 16:22:20.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Copyright (C) 2005-2013 Team XBMC + # http://xbmc.org +@@ -27,7 +27,8 @@ + VERSION=$(grep "VERSION=" FFMPEG-VERSION | sed 's/VERSION=//g') + ARCHIVE=ffmpeg-${VERSION}.tar.gz + +-function usage { ++usage() ++{ + echo "usage $(basename $0) + [-p | --prefix] ... ffmepg install prefix + [-d | --download] ... no build, download tarfile only +@@ -82,6 +83,14 @@ + FLAGS="$FLAGS --extra-cxxflags=\"${1#*=}\"" + shift + ;; ++ --cc=*) ++ FLAGS="$FLAGS --cc=${1#*=}" ++ shift ++ ;; ++ --cxx=*) ++ FLAGS="$FLAGS --cxx=${1#*=}" ++ shift ++ ;; + -j) + BUILDTHREADS=$2 + shift 2 +@@ -100,7 +109,7 @@ + esac + done + +-BUILDTHREADS=${BUILDTHREADS:-$(grep -c "^processor" /proc/cpuinfo)} ++BUILDTHREADS=${BUILDTHREADS:-$(sysctl -n hw.ncpu)} + [ ${BUILDTHREADS} -eq 0 ] && BUILDTHREADS=1 + + [ -z ${VERSION} ] && exit 3 +@@ -110,10 +119,10 @@ + [ "$VERSION" == "$CURVER" ] && exit 0 + fi + +-[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz ++#[ -f ${ARCHIVE} ] || curl -Ls --create-dirs -f -o ${ARCHIVE} ${BASE_URL}/${VERSION}.tar.gz + [ $downloadonly ] && exit 0 + +-[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1 ++#[ -d ffmpeg-${VERSION} ] && rm -rf ffmpeg-${VERSION} && rm .ffmpeg-installed >/dev/null 2>&1 + if [ -d ${FFMPEG_PREFIX} ] + then + [ -w ${FFMPEG_PREFIX} ] || SUDO="sudo" +@@ -121,9 +130,9 @@ + [ -w $(dirname ${FFMPEG_PREFIX}) ] || SUDO="sudo" + fi + +-mkdir ffmpeg-${VERSION} ++#mkdir ffmpeg-${VERSION} + cd ffmpeg-${VERSION} || exit 2 +-tar --strip-components=1 -xf ../${ARCHIVE} ++#tar --strip-components=1 -xf ../${ARCHIVE} + + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ + ./configure --prefix=$FFMPEG_PREFIX \ +@@ -157,11 +166,11 @@ + --enable-zlib \ + ${FLAGS} + +-make -j ${BUILDTHREADS} ++gmake -j ${BUILDTHREADS} + if [ $? -eq 0 ] + then + [ ${SUDO} ] && echo "Root priviledges are required to install to ${FFMPEG_PREFIX}" +- ${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed ++ ${SUDO} gmake install && echo "$VERSION" > ../.ffmpeg-installed + else + echo "ERROR: building ffmpeg failed" + exit 1 Copied and modified: head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp (from r380145, head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp) ============================================================================== --- head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker.cpp Sat Feb 28 14:55:08 2015 (r380145, copy source) +++ head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker.cpp Sat Feb 28 15:06:54 2015 (r380146) @@ -1,10 +1,10 @@ ---- xbmc/cores/DllLoader/dll_tracker.cpp.orig 2013-12-27 17:07:11.000000000 +0100 -+++ xbmc/cores/DllLoader/dll_tracker.cpp 2013-12-27 17:05:29.000000000 +0100 +--- xbmc/cores/DllLoader/dll_tracker.cpp.orig 2014-12-20 16:26:59 UTC ++++ xbmc/cores/DllLoader/dll_tracker.cpp @@ -24,6 +24,7 @@ #include "DllLoader.h" #include "threads/SingleLock.h" #include "utils/log.h" -+#include <stdlib.h> ++#include "stdlib.h" #ifdef _cplusplus extern "C" Copied and modified: head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp (from r380145, head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp) ============================================================================== --- head/multimedia/xbmc/files/patch-xbmc__cores__DllLoader__dll_tracker_file.cpp Sat Feb 28 14:55:08 2015 (r380145, copy source) +++ head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_dll__tracker__file.cpp Sat Feb 28 15:06:54 2015 (r380146) @@ -1,10 +1,10 @@ ---- xbmc/cores/DllLoader/dll_tracker_file.cpp.orig 2013-12-27 17:07:01.000000000 +0100 -+++ xbmc/cores/DllLoader/dll_tracker_file.cpp 2013-12-27 17:07:36.000000000 +0100 +--- xbmc/cores/DllLoader/dll_tracker_file.cpp.orig 2014-12-20 16:27:04 UTC ++++ xbmc/cores/DllLoader/dll_tracker_file.cpp @@ -23,6 +23,7 @@ #include "DllLoader.h" #include "threads/SingleLock.h" #include "utils/log.h" -+#include <stdlib.h> ++#include "stdlib.h" #ifdef TARGET_POSIX #define dll_open open Added: head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-xbmc_cores_DllLoader_exports_emu__kernel32.cpp Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,10 @@ +--- xbmc/cores/DllLoader/exports/emu_kernel32.cpp.orig 2014-12-20 16:28:10 UTC ++++ xbmc/cores/DllLoader/exports/emu_kernel32.cpp +@@ -38,6 +38,7 @@ + #define __except catch + #endif + ++#include <stdlib.h> + #include <string.h> + #include <vector> + using namespace std; Added: head/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-xbmc_filesystem_iso9660.cpp Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,10 @@ +--- xbmc/filesystem/iso9660.cpp.orig 2014-12-20 16:28:43 UTC ++++ xbmc/filesystem/iso9660.cpp +@@ -52,6 +52,7 @@ ISO9660 + #include "storage/DetectDVDType.h" // for MODE2_DATA_SIZE etc. + #endif + #include <cdio/bytesex.h> ++#include <stdlib.h> + //#define _DEBUG_OUTPUT 1 + + static CCriticalSection m_critSection; Added: head/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi/files/patch-xbmc_linux_XFileUtils.cpp Sat Feb 28 15:06:54 2015 (r380146) @@ -0,0 +1,10 @@ +--- xbmc/linux/XFileUtils.cpp.orig 2014-12-20 16:29:11 UTC ++++ xbmc/linux/XFileUtils.cpp +@@ -36,6 +36,7 @@ + #endif + #include <dirent.h> + #include <errno.h> ++#include <stdlib.h> + + #if defined(TARGET_ANDROID) + #include <sys/file.h> Copied and modified: head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp (from r380145, head/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp) ============================================================================== --- head/multimedia/xbmc/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp Sat Feb 28 14:55:08 2015 (r380145, copy source) +++ head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp Sat Feb 28 15:06:54 2015 (r380146) @@ -1,28 +1,13 @@ ---- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2013-12-03 16:25:00.000000000 +0100 -+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp 2013-12-03 16:26:01.000000000 +0100 -@@ -29,12 +29,8 @@ - #include <string.h> - #ifdef TARGET_FREEBSD +--- 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> + #if __FreeBSD_version < 900031 + #include <sys/thr.h> -#else - #include <pthread_np.h> +-#include <pthread_np.h> + #endif ++#include <pthread_np.h> #endif --#endif #include <signal.h> - -@@ -59,11 +55,7 @@ - void CThread::SetThreadInfo() - { - #ifdef TARGET_FREEBSD --#if __FreeBSD_version < 900031 -- long lwpid; -- thr_self(&lwpid); -- m_ThreadOpaque.LwpId = lwpid; --#else -+#if __FreeBSD_version > 900030 - m_ThreadOpaque.LwpId = pthread_getthreadid_np(); - #endif - #elif defined(TARGET_ANDROID) Modified: head/multimedia/kodi/pkg-descr ============================================================================== --- head/multimedia/xbmc/pkg-descr Sat Feb 28 14:55:08 2015 (r380145) +++ head/multimedia/kodi/pkg-descr Sat Feb 28 15:06:54 2015 (r380146) @@ -1,5 +1,6 @@ -XBMC Media Center (formerly named "XBox Media Center") -is a free and open source cross-platform media-player -and entertainment hub. +Kodi (formerly known as XBMC) is a free and open source cross-platform +media-player and entertainment hub. It allows users to play and view +most videos, music, podcasts, and other digital media files from local +and network storage media and the internet. -WWW: http://xbmc.org/ +WWW: http://kodi.tv/ Modified: head/multimedia/kodi/pkg-plist ============================================================================== --- head/multimedia/xbmc/pkg-plist Sat Feb 28 14:55:08 2015 (r380145) +++ head/multimedia/kodi/pkg-plist Sat Feb 28 15:06:54 2015 (r380146) @@ -1,65 +1,82 @@ +bin/kodi +bin/kodi-standalone bin/xbmc bin/xbmc-standalone -include/xbmc/DVDDemuxPacket.h -include/xbmc/libXBMC_addon.h -include/xbmc/libXBMC_codec.h -include/xbmc/libXBMC_gui.h -include/xbmc/libXBMC_pvr.h -include/xbmc/xbmc_addon_cpp_dll.h -include/xbmc/xbmc_addon_dll.h -include/xbmc/xbmc_addon_types.h -include/xbmc/xbmc_codec_types.h -include/xbmc/xbmc_epg_types.h -include/xbmc/xbmc_pvr_dll.h -include/xbmc/xbmc_pvr_types.h -include/xbmc/xbmc_scr_dll.h -include/xbmc/xbmc_scr_types.h -include/xbmc/xbmc_stream_utils.hpp -include/xbmc/xbmc_vis_dll.h -include/xbmc/xbmc_vis_types.h -lib/xbmc/AddOptions.cmake -lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so -lib/xbmc/addons/library.xbmc.codec/libXBMC_codec-%%ARCH%%-freebsd.so -lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-%%ARCH%%-freebsd.so -lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so -lib/xbmc/addons/screensaver.rsxs.euphoria/Euphoria.xbs -lib/xbmc/addons/screensaver.rsxs.plasma/Plasma.xbs -lib/xbmc/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs -lib/xbmc/addons/visualization.fishbmc/fishbmc.vis -lib/xbmc/addons/visualization.glspectrum/opengl_spectrum.vis -lib/xbmc/addons/visualization.projectm/projectM.vis -lib/xbmc/addons/visualization.waveform/Waveform.vis -lib/xbmc/system/ImageLib-%%ARCH%%-freebsd.so -lib/xbmc/system/hdhomerun-%%ARCH%%-freebsd.so -%%MYSQL%%lib/xbmc/system/libcmyth-%%ARCH%%-freebsd.so -lib/xbmc/system/libcpluff-%%ARCH%%-freebsd.so -lib/xbmc/system/libexif-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/avcodec-54-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/avfilter-3-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/avformat-54-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/avutil-52-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so -lib/xbmc/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so -lib/xbmc/system/players/paplayer/libsidplay2-%%ARCH%%-freebsd.so -lib/xbmc/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so -lib/xbmc/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so -lib/xbmc/system/players/paplayer/timidity-%%ARCH%%-freebsd.so -lib/xbmc/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so -lib/xbmc/xbmc-addon-helpers.cmake -lib/xbmc/xbmc-config.cmake -%%XRANDR%%lib/xbmc/xbmc-xrandr -lib/xbmc/xbmc.bin -man/man1/xbmc.1.gz -man/man1/xbmc.bin.1.gz +include/kodi/DVDDemuxPacket.h +include/kodi/libXBMC_addon.h +include/kodi/libXBMC_codec.h +include/kodi/libXBMC_gui.h +include/kodi/libXBMC_pvr.h +include/kodi/xbmc_addon_cpp_dll.h +include/kodi/xbmc_addon_dll.h +include/kodi/xbmc_addon_types.h +include/kodi/xbmc_audioenc_dll.h +include/kodi/xbmc_audioenc_types.h +include/kodi/xbmc_codec_types.h +include/kodi/xbmc_epg_types.h +include/kodi/xbmc_pvr_dll.h +include/kodi/xbmc_pvr_types.h +include/kodi/xbmc_scr_dll.h +include/kodi/xbmc_scr_types.h +include/kodi/xbmc_stream_utils.hpp +include/kodi/xbmc_vis_dll.h +include/kodi/xbmc_vis_types.h +include/xbmc +lib/kodi/addon-helpers.cmake +lib/kodi/addons/library.xbmc.addon/libXBMC_addon-%%ARCH%%-freebsd.so +lib/kodi/addons/library.xbmc.codec/libXBMC_codec-%%ARCH%%-freebsd.so +lib/kodi/addons/library.xbmc.gui/libXBMC_gui-%%ARCH%%-freebsd.so +lib/kodi/addons/library.xbmc.pvr/libXBMC_pvr-%%ARCH%%-freebsd.so +lib/kodi/addons/screensaver.rsxs.euphoria/Euphoria.xbs +lib/kodi/addons/screensaver.rsxs.plasma/Plasma.xbs +lib/kodi/addons/screensaver.rsxs.solarwinds/Solarwinds.xbs +lib/kodi/addons/visualization.fishbmc/fishbmc.vis +lib/kodi/addons/visualization.glspectrum/opengl_spectrum.vis +lib/kodi/addons/visualization.projectm/projectM.vis +lib/kodi/addons/visualization.waveform/Waveform.vis +lib/kodi/addoptions.cmake +lib/kodi/kodi-config.cmake +%%XRANDR%%lib/kodi/kodi-xrandr +lib/kodi/kodi.bin +lib/kodi/prepare-env.cmake +lib/kodi/system/ImageLib-%%ARCH%%-freebsd.so +lib/kodi/system/hdhomerun-%%ARCH%%-freebsd.so +%%MYSQL%%lib/kodi/system/libcmyth-%%ARCH%%-freebsd.so +lib/kodi/system/libcpluff-%%ARCH%%-freebsd.so +lib/kodi/system/libexif-%%ARCH%%-freebsd.so +lib/kodi/system/players/dvdplayer/libdvdcss-%%ARCH%%-freebsd.so +lib/kodi/system/players/dvdplayer/libdvdnav-%%ARCH%%-freebsd.so +lib/kodi/system/players/paplayer/libsidplay2-%%ARCH%%-freebsd.so +lib/kodi/system/players/paplayer/nosefart-%%ARCH%%-freebsd.so +lib/kodi/system/players/paplayer/stsoundlibrary-%%ARCH%%-freebsd.so +lib/kodi/system/players/paplayer/timidity-%%ARCH%%-freebsd.so +lib/kodi/system/players/paplayer/vgmstream-%%ARCH%%-freebsd.so +lib/kodi/xbmc-config.cmake +lib/xbmc +man/man1/kodi.1.gz +man/man1/kodi.bin.1.gz +share/applications/kodi.desktop %%PORTDOCS%%%%DOCSDIR%%/LICENSE.GPL %%PORTDOCS%%%%DOCSDIR%%/README.linux %%PORTDOCS%%%%DOCSDIR%%/copying.txt -share/icons/hicolor/256x256/apps/xbmc.png -share/icons/hicolor/48x48/apps/xbmc.png +%%PORTDOCS%%%%DOCSDIR%%/version.txt +share/icons/hicolor/128x128/apps/kodi.png +share/icons/hicolor/16x16/apps/kodi.png +share/icons/hicolor/22x22/apps/kodi.png +share/icons/hicolor/24x24/apps/kodi.png +share/icons/hicolor/256x256/apps/kodi.png +share/icons/hicolor/32x32/apps/kodi.png +share/icons/hicolor/48x48/apps/kodi.png +share/icons/hicolor/64x64/apps/kodi.png %%DATADIR%%/FEH.py +%%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/addon.xml +%%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/icon.png +%%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/resources/language/English/strings.po +%%DATADIR%%/addons/audioencoder.xbmc.builtin.aac/resources/settings.xml +%%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/addon.xml +%%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/icon.png +%%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/resources/language/English/strings.po +%%DATADIR%%/addons/audioencoder.xbmc.builtin.wma/resources/settings.xml %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.cpp %%DATADIR%%/addons/library.xbmc.addon/dlfcn-win32.h %%DATADIR%%/addons/library.xbmc.addon/libXBMC_addon.h @@ -70,117 +87,126 @@ share/icons/hicolor/48x48/apps/xbmc.png %%DATADIR%%/addons/metadata.album.universal/albumuniversal.xml %%DATADIR%%/addons/metadata.album.universal/changelog.txt %%DATADIR%%/addons/metadata.album.universal/icon.png -%%DATADIR%%/addons/metadata.album.universal/resources/language/Afrikaans/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Amharic/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Asturian/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Belarusian/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Bulgarian/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Burmese/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Catalan/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Simple)/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Chinese (Traditional)/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Croatian/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Czech/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Danish/strings.xml -%%DATADIR%%/addons/metadata.album.universal/resources/language/Dutch/strings.xml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502281506.t1SF6tLx015015>