Date: Sat, 11 Apr 2015 10:43:19 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383785 - in head/multimedia/kodi: . files Message-ID: <201504111043.t3BAhJeR039178@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Apr 11 10:43:19 2015 New Revision: 383785 URL: https://svnweb.freebsd.org/changeset/ports/383785 Log: Update to upstream release 14.2 PR: 199351 Submitted by: mickael.maillot@gmail.com (maintainer) Modified: head/multimedia/kodi/Makefile head/multimedia/kodi/distinfo head/multimedia/kodi/files/patch-configure.in head/multimedia/kodi/files/patch-ffmpegx86 head/multimedia/kodi/pkg-plist Modified: head/multimedia/kodi/Makefile ============================================================================== --- head/multimedia/kodi/Makefile Sat Apr 11 10:31:43 2015 (r383784) +++ head/multimedia/kodi/Makefile Sat Apr 11 10:43:19 2015 (r383785) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= kodi -DISTVERSION= 14.0 -PORTREVISION= 0 +DISTVERSION= 14.2 CATEGORIES= multimedia -MASTER_SITES= http://mirrors.kodi.tv/releases/source/ \ +MASTER_SITES= https://codeload.github.com/xbmc/xbmc/tar.gz/${DISTVERSION}-Helix?dummy=/ \ GHL:ffmpeg DISTFILES= ${DISTVERSION}-Helix${EXTRACT_SUFX} \ ${GH_PROJECT}-${GH_TAGNAME}.tar.gz:ffmpeg @@ -60,13 +59,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= ffmpeg -GH_COMMIT= 8865ab5 -GH_TAGNAME= 2.4.4-Helix +GH_TAGNAME= 2.4.6-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_XORG= xt xmu xtst xrandr USE_GL= glu USE_SDL= image sdl2 USE_JAVA= yes @@ -79,8 +77,8 @@ WRKSRC= ${WRKDIR}/xbmc-${DISTVERSION}-H OPTIONS_SUB= yes OPTIONS_DEFINE= AIRPLAY AIRTUNES AVAHI CEC DOCS \ - LIBBLURAY LIRC MYSQL NONFREE RTMP SFTP \ - SMB VAAPI VDPAU WEBSERVER XRANDR + LIBBLURAY LIRC MYSQL NFS NONFREE RTMP \ + SFTP SMB VAAPI VDPAU WEBSERVER AIRPLAY_DESC= AirPlay support via libplist AIRTUNES_DESC= AirTunes support via libshairplay CEC_DESC= CEC adapter support @@ -88,7 +86,7 @@ NONFREE_DESC= Enable non-free components SFTP_DESC= SSH SFTP support via libssh OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC MYSQL \ - RTMP SFTP SMB VAAPI VDPAU WEBSERVER XRANDR + NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER AIRPLAY_LIB_DEPENDS= libplist.so:${PORTSDIR}/devel/libplist AIRPLAY_CONFIGURE_ENABLE= airplay @@ -111,6 +109,9 @@ LIRC_RUN_DEPENDS= lircd:${PORTSDIR}/comm MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql +NFS_LIB_DEPENDS= libnfs.so:${PORTSDIR}/net/libnfs +NFS_CONFIGURE_ENABLE= nfs + NONFREE_CONFIGURE_ENABLE= non-free RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp @@ -133,10 +134,7 @@ SFTP_BUILD_DEPENDS= ${LOCALBASE}/lib/lib SFTP_RUN_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh SFTP_CONFIGURE_ENABLE= ssh -XRANDR_USE= XORG=xrandr -XRANDR_CONFIGURE_ENABLE= xrandr - -CONFIGURE_ARGS+= --disable-debug --disable-nfs --disable-alsa --disable-pulse +CONFIGURE_ARGS+= --disable-debug --disable-alsa --disable-pulse .include <bsd.port.options.mk> @@ -185,8 +183,6 @@ post-install: ${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/kodi/kodi-xrandr -.endif .include <bsd.port.mk> Modified: head/multimedia/kodi/distinfo ============================================================================== --- head/multimedia/kodi/distinfo Sat Apr 11 10:31:43 2015 (r383784) +++ head/multimedia/kodi/distinfo Sat Apr 11 10:43:19 2015 (r383785) @@ -1,4 +1,4 @@ -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 +SHA256 (14.2-Helix.tar.gz) = d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4 +SIZE (14.2-Helix.tar.gz) = 70703786 +SHA256 (ffmpeg-2.4.6-Helix.tar.gz) = fe7ebcbf3d41e23e7ff6ca71dc6c46227adb072c077298100db2f97b799ca068 +SIZE (ffmpeg-2.4.6-Helix.tar.gz) = 9041436 Modified: head/multimedia/kodi/files/patch-configure.in ============================================================================== --- head/multimedia/kodi/files/patch-configure.in Sat Apr 11 10:31:43 2015 (r383784) +++ head/multimedia/kodi/files/patch-configure.in Sat Apr 11 10:43:19 2015 (r383785) @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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" @@ -13,7 +13,7 @@ ;; arm-apple-darwin*) use_joystick=no -@@ -781,10 +783,16 @@ +@@ -788,10 +790,16 @@ # platform specific flags if echo "$ARCH" | grep -q "freebsd" ; then LOCALBASE="${LOCALBASE:-/usr/local}" @@ -33,7 +33,15 @@ fi if test "$host_vendor" = "apple" ; then # standard application paths -@@ -1184,7 +1192,7 @@ +@@ -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 @@ -42,7 +50,7 @@ AC_SEARCH_LIBS([dlopen],dl) AC_SEARCH_LIBS([clock_gettime],rt) AC_SEARCH_LIBS([dn_expand], resolv) -@@ -1699,7 +1707,7 @@ +@@ -1706,7 +1715,7 @@ if test "$cross_compiling" != "yes"; then if test "$use_debug" != "yes"; then @@ -51,7 +59,7 @@ fi if test "$use_optimizations" != "yes"; then FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations" -@@ -1710,7 +1718,7 @@ +@@ -1717,7 +1726,7 @@ SAVE_LIBS="$LIBS" # check for system installed ffmpeg. We require minimum versions. PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES], @@ -60,7 +68,7 @@ [FFMPEG_FOUND="false"]) if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then -@@ -1737,7 +1745,7 @@ +@@ -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") @@ -69,7 +77,7 @@ export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH" elif test "$with_ffmpeg" != "no"; then -@@ -1750,7 +1758,7 @@ +@@ -1757,7 +1766,7 @@ if test "$FFMPEG_FOUND" != "true"; then PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES], @@ -78,7 +86,7 @@ [AC_MSG_ERROR("ffmpeg not found")]) fi -@@ -2408,6 +2416,8 @@ +@@ -2415,6 +2424,8 @@ LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale" fi Modified: head/multimedia/kodi/files/patch-ffmpegx86 ============================================================================== --- head/multimedia/kodi/files/patch-ffmpegx86 Sat Apr 11 10:31:43 2015 (r383784) +++ head/multimedia/kodi/files/patch-ffmpegx86 Sat Apr 11 10:43:19 2015 (r383785) @@ -1,5 +1,5 @@ ---- 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 +--- tools/depends/target/ffmpeg/ffmpeg-2.4.6-Helix/libavutil/x86/asm.h.orig 2014-12-25 13:59:22.000000000 +0100 ++++ tools/depends/target/ffmpeg/ffmpeg-2.4.6-Helix/libavutil/x86/asm.h 2014-12-25 14:00:04.000000000 +0100 @@ -71,7 +71,7 @@ typedef int x86_reg; #endif Modified: head/multimedia/kodi/pkg-plist ============================================================================== --- head/multimedia/kodi/pkg-plist Sat Apr 11 10:31:43 2015 (r383784) +++ head/multimedia/kodi/pkg-plist Sat Apr 11 10:43:19 2015 (r383785) @@ -36,7 +36,7 @@ lib/kodi/addons/visualization.projectm/p lib/kodi/addons/visualization.waveform/Waveform.vis lib/kodi/addoptions.cmake lib/kodi/kodi-config.cmake -%%XRANDR%%lib/kodi/kodi-xrandr +lib/kodi/kodi-xrandr lib/kodi/kodi.bin lib/kodi/prepare-env.cmake lib/kodi/system/ImageLib-%%ARCH%%-freebsd.so @@ -440,7 +440,6 @@ share/icons/hicolor/64x64/apps/kodi.png %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Albanian/strings.po %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Amharic/strings.po %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Arabic/strings.po -%%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Asturian/strings.po %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Basque/strings.po %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Belarusian/strings.po %%DATADIR%%/addons/screensaver.xbmc.builtin.dim/resources/language/Bulgarian/strings.po @@ -771,6 +770,7 @@ share/icons/hicolor/64x64/apps/kodi.png %%DATADIR%%/addons/skin.confluence/language/Swedish/strings.po %%DATADIR%%/addons/skin.confluence/language/Tajik/strings.po %%DATADIR%%/addons/skin.confluence/language/Tamil (India)/strings.po +%%DATADIR%%/addons/skin.confluence/language/Tatar/strings.po %%DATADIR%%/addons/skin.confluence/language/Telugu/strings.po %%DATADIR%%/addons/skin.confluence/language/Thai/strings.po %%DATADIR%%/addons/skin.confluence/language/Turkish/strings.po
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504111043.t3BAhJeR039178>