svn commit: r457441 - in head/multimedia/kodi: . files
Guido Falsi
madpilot at FreeBSD.org
Thu Dec 28 09:17:17 UTC 2017
Author: madpilot
Date: Thu Dec 28 09:17:14 2017
New Revision: 457441
URL: https://svnweb.freebsd.org/changeset/ports/457441
Log:
- Update kodi to 17.6
- Renamed patches to use modern naming convention
- Regenerated a few other paatches
PR: 224301
Submitted by: me
Approved by: maintainer timeout
Added:
head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.11-Krypton-17.5_libavutil_x86_asm.h
- copied, changed from r457440, head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.6-Krypton_libavutil_x86_asm.h
head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp
- copied, changed from r457440, head/multimedia/kodi/files/patch-xbmc_core_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp
Deleted:
head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.6-Krypton_configure
head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.6-Krypton_libavutil_x86_asm.h
head/multimedia/kodi/files/patch-xbmc_core_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp
Modified:
head/multimedia/kodi/Makefile
head/multimedia/kodi/distinfo
head/multimedia/kodi/files/patch-Makefile.include.in
head/multimedia/kodi/files/patch-configure.ac
head/multimedia/kodi/files/patch-m4_xbmc__arch.m4
head/multimedia/kodi/files/patch-system_settings_rbp2.xml
head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile
head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh
head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp
head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_DVDDemuxSPU.cpp
head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXBT.h
head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp
head/multimedia/kodi/files/patch-xbmc_system.h
head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
head/multimedia/kodi/files/patch-xbmc_utils_CPUInfo.cpp
head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp
head/multimedia/kodi/files/patch-xbmc_utils_RssReader.cpp
head/multimedia/kodi/files/patch-xbmc_windowing_egl_EGLNativeTypeAmlogic.cpp
head/multimedia/kodi/pkg-plist
Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/Makefile Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kodi
-DISTVERSION= 17.3
-PORTREVISION= 5
+DISTVERSION= 17.6
CATEGORIES= multimedia java
MAINTAINER= mickael.maillot at gmail.com
@@ -77,14 +76,14 @@ CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB}" \
OPENSSL_CFLAGS="-I${OPENSSLINC}"
KODI_CODENAME= Krypton
-FFMPEG_VERS= 3.1.6
+FFMPEG_VERS= 3.1.11
LIBDVDCSS_TAGNAME= 2f12236
LIBDVDNAV_TAGNAME= 981488f
LIBDVDREAD_TAGNAME= 17d99db
USE_GITHUB= yes
GH_TUPLE= xbmc:xbmc:${PORTVERSION}-${KODI_CODENAME} \
- xbmc:FFmpeg:${FFMPEG_VERS}-${KODI_CODENAME}:ffmpeg/tools/depends/target/ffmpeg \
+ xbmc:FFmpeg:${FFMPEG_VERS}-${KODI_CODENAME}-17.5:ffmpeg/tools/depends/target/ffmpeg \
xbmc:libdvdcss:${LIBDVDCSS_TAGNAME}:libdvdcss/tools/depends/target/libdvdcss/native \
xbmc:libdvdnav:${LIBDVDNAV_TAGNAME}:libdvdnav/tools/depends/target/libdvdnav/native \
xbmc:libdvdread:${LIBDVDREAD_TAGNAME}:libdvdread/tools/depends/target/libdvdread/native
Modified: head/multimedia/kodi/distinfo
==============================================================================
--- head/multimedia/kodi/distinfo Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/distinfo Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,8 +1,8 @@
-TIMESTAMP = 1501924835
-SHA256 (xbmc-xbmc-17.3-17.3-Krypton_GH0.tar.gz) = 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1
-SIZE (xbmc-xbmc-17.3-17.3-Krypton_GH0.tar.gz) = 58466114
-SHA256 (xbmc-FFmpeg-3.1.6-Krypton_GH0.tar.gz) = 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192
-SIZE (xbmc-FFmpeg-3.1.6-Krypton_GH0.tar.gz) = 11170735
+TIMESTAMP = 1511187422
+SHA256 (xbmc-xbmc-17.6-17.6-Krypton_GH0.tar.gz) = c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d
+SIZE (xbmc-xbmc-17.6-17.6-Krypton_GH0.tar.gz) = 58275293
+SHA256 (xbmc-FFmpeg-3.1.11-Krypton-17.5_GH0.tar.gz) = 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0
+SIZE (xbmc-FFmpeg-3.1.11-Krypton-17.5_GH0.tar.gz) = 11188798
SHA256 (xbmc-libdvdcss-2f12236_GH0.tar.gz) = 7affd787569960bcca6a7a83dfbe807b461653ee9793c59551dabb88e640b3f4
SIZE (xbmc-libdvdcss-2f12236_GH0.tar.gz) = 95311
SHA256 (xbmc-libdvdnav-981488f_GH0.tar.gz) = b59d75536336893ef0e32a6660770b2250e0369d52ff02319d41def621fb42db
Modified: head/multimedia/kodi/files/patch-Makefile.include.in
==============================================================================
--- head/multimedia/kodi/files/patch-Makefile.include.in Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-Makefile.include.in Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- Makefile.include.in.orig 2016-02-20 15:21:19 UTC
+--- Makefile.include.in.orig 2017-11-14 16:55:01 UTC
+++ Makefile.include.in
-@@ -47,7 +47,8 @@ INCLUDES+=-I at abs_top_srcdir@/addons/libr
+@@ -47,7 +47,8 @@ INCLUDES+=-I at abs_top_srcdir@/addons/library.kodi.adsp
INCLUDES+=-I at abs_top_srcdir@/addons/library.kodi.audioengine
INCLUDES+=-I at abs_top_srcdir@/addons/library.xbmc.pvr
INCLUDES+=-I at abs_top_srcdir@/addons/library.xbmc.codec
@@ -8,7 +8,7 @@
+#INCLUDES+=$(sort @INCLUDES@)
+INCLUDES+=@INCLUDES@
INCLUDES+=-I at abs_top_srcdir@/xbmc/linux
- INCLUDES+=-I at abs_top_srcdir@/xbmc/cores/dvdplayer
+ INCLUDES+=-I at abs_top_srcdir@/xbmc/cores/VideoPlayer
DEFINES+= \
@@ -95,22 +96,22 @@ GEN_DEPS=\
Modified: head/multimedia/kodi/files/patch-configure.ac
==============================================================================
--- head/multimedia/kodi/files/patch-configure.ac Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-configure.ac Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2017-05-25 08:49:32.000000000 +1200
-+++ configure.ac 2017-10-28 22:32:23.769653000 +1300
-@@ -564,12 +564,36 @@
+--- configure.ac.orig 2017-11-14 16:55:01 UTC
++++ configure.ac
+@@ -564,13 +564,37 @@ case $host in
CORE_SYSTEM_NAME=linux
ARCH="x86-freebsd"
MAKE="gmake"
@@ -12,7 +12,7 @@
ARCH="x86_64-freebsd"
MAKE="gmake"
+ USE_STATIC_FFMPEG=1
-+ ;;
+ ;;
+ armv6-*-freebsd*)
+ target_platform=target_linux
+ ARCH="armv6-freebsd"
@@ -34,10 +34,11 @@
+ use_gles=yes
+ use_gl=no
+ use_x11=no
- ;;
++ ;;
arm-apple-darwin*)
CORE_SYSTEM_NAME=ios
-@@ -688,7 +712,7 @@
+ use_neon=yes
+@@ -688,7 +712,7 @@ if test "$target_platform" = "target_raspberry_pi" ; t
use_hardcoded_tables="yes"
use_openmax=no
CORE_SYSTEM_NAME=rbpi
@@ -46,7 +47,7 @@
AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])
USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"])
USE_MMAL=1; AC_DEFINE([HAS_MMAL],[1],["Define to 1 if MMAL libs is enabled"])
-@@ -759,10 +783,16 @@
+@@ -759,10 +783,16 @@ fi
# platform specific flags
if echo "$ARCH" | grep -q "freebsd" ; then
LOCALBASE="${LOCALBASE:-/usr/local}"
@@ -66,7 +67,7 @@
fi
if test "$host_vendor" = "apple" ; then
# standard application paths
-@@ -802,8 +832,16 @@
+@@ -802,8 +832,16 @@ if test "$host_vendor" = "apple" ; then
LIBS="$LIBS -framework CoreFoundation"
fi
elif test "$target_platform" = "target_raspberry_pi"; then
@@ -84,7 +85,7 @@
elif test "$use_arch" = "arm"; then
CFLAGS="$CFLAGS -mno-apcs-stack-check"
CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
-@@ -921,6 +959,7 @@
+@@ -921,6 +959,7 @@ AC_LANG_POP([C++])
# Check inotify availability
AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
@@ -92,7 +93,7 @@
# Python
if test -z "$PYTHON_NOVERSIONCHECK"; then
-@@ -1169,12 +1208,13 @@
+@@ -1169,12 +1208,13 @@ AS_CASE([x$use_libbluray],
)
#Check to see if libs are needed for functions that are often built-in to libc
@@ -107,7 +108,7 @@
# platform dependent libraries
if test "$host_vendor" = "apple" ; then
-@@ -1558,7 +1598,7 @@
+@@ -1558,7 +1598,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; then
if test "$cross_compiling" != "yes"; then
if test "$use_debug" != "yes"; then
@@ -116,7 +117,7 @@
fi
if test "$use_optimizations" != "yes"; then
FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
-@@ -1569,7 +1609,7 @@
+@@ -1569,7 +1609,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; then
SAVE_LIBS="$LIBS"
# check for system installed ffmpeg. We require minimum versions.
PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
@@ -125,7 +126,7 @@
[FFMPEG_FOUND="false"])
if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
-@@ -1596,7 +1636,11 @@
+@@ -1596,7 +1636,11 @@ if test "${USE_STATIC_FFMPEG}" = "1"; then
elif test "$with_ffmpeg" = "force"; then
# always build our ffmpeg
AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
@@ -138,7 +139,7 @@
export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
elif test "$with_ffmpeg" != "no"; then
-@@ -1609,7 +1653,7 @@
+@@ -1609,7 +1653,7 @@ fi
if test "$FFMPEG_FOUND" != "true"; then
PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
@@ -147,7 +148,7 @@
[AC_MSG_ERROR("ffmpeg not found")])
fi
-@@ -1633,9 +1677,9 @@
+@@ -1633,9 +1677,9 @@ fi
echo "Checking for SWIG installation"
AC_PATH_PROG(SWIG_EXE, swig, "none")
if test "$SWIG_EXE" = "none"; then
@@ -160,7 +161,7 @@
fi
fi
if test "$SWIG_EXE" = "none"; then
-@@ -1928,7 +1972,7 @@
+@@ -1928,7 +1972,7 @@ if test "x$use_texturepacker" != "xno"; then
AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
[$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
if test "$TEXTUREPACKER" = "none"; then
@@ -169,12 +170,12 @@
TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
fi
if test -x "$TEXTUREPACKER"; then
-@@ -2148,6 +2192,8 @@
+@@ -2147,6 +2191,8 @@ if test "$host_vendor" = "apple" ; then
+ LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libpostproc -lpostproc"
LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
fi
-
-+LIBS=$(echo "$LIBS" | tr "\n" " ")
+
++LIBS=$(echo "$LIBS" | tr "\n" " ")
+
OUTPUT_FILES="Makefile \
Makefile.include \
- addons/skin.estuary/media/Makefile \
Modified: head/multimedia/kodi/files/patch-m4_xbmc__arch.m4
==============================================================================
--- head/multimedia/kodi/files/patch-m4_xbmc__arch.m4 Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-m4_xbmc__arch.m4 Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,4 +1,4 @@
---- m4/xbmc_arch.m4.orig 2016-10-08 UTC
+--- m4/xbmc_arch.m4.orig 2017-11-14 16:55:01 UTC
+++ m4/xbmc_arch.m4
@@ -14,6 +14,9 @@ case $build in
amd64-*-freebsd*)
@@ -20,7 +20,7 @@
arm-apple-darwin*)
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS -D_LINUX")
;;
-@@ -78,6 +84,6 @@ if test "$target_platform" = "target_and
+@@ -78,6 +84,6 @@ if test "$target_platform" = "target_android" ; then
fi
if test "$target_platform" = "target_raspberry_pi" ; then
Modified: head/multimedia/kodi/files/patch-system_settings_rbp2.xml
==============================================================================
--- head/multimedia/kodi/files/patch-system_settings_rbp2.xml Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-system_settings_rbp2.xml Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,5 +1,5 @@
---- ./system/settings/rbp2.xml.orig 2016-11-24 09:26:41 UTC
-+++ ./system/settings/rbp2.xml
+--- system/settings/rbp2.xml.orig 2017-11-14 16:55:01 UTC
++++ system/settings/rbp2.xml
@@ -4,7 +4,7 @@
<category id="videoplayer">
<group id="3">
Copied and modified: head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.11-Krypton-17.5_libavutil_x86_asm.h (from r457440, head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.6-Krypton_libavutil_x86_asm.h)
==============================================================================
--- head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.6-Krypton_libavutil_x86_asm.h Thu Dec 28 09:13:36 2017 (r457440, copy source)
+++ head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_FFmpeg-3.1.11-Krypton-17.5_libavutil_x86_asm.h Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,5 +1,5 @@
---- tools/depends/target/ffmpeg/FFmpeg-3.1.6-Krypton/libavutil/x86/asm.h 2016-10-08 UTC
-+++ tools/depends/target/ffmpeg/FFmpeg-3.1.6-Krypton/libavutil/x86/asm.h.orig
+--- tools/depends/target/ffmpeg/FFmpeg-3.1.11-Krypton-17.5/libavutil/x86/asm.h.orig 2017-10-02 15:21:13 UTC
++++ tools/depends/target/ffmpeg/FFmpeg-3.1.11-Krypton-17.5/libavutil/x86/asm.h
@@ -72,7 +72,7 @@ typedef int32_t x86_reg;
typedef int x86_reg;
#endif
Modified: head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile
==============================================================================
--- head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_Makefile Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- tools/depends/target/ffmpeg/Makefile.orig 2016-02-20 15:21:19 UTC
+--- tools/depends/target/ffmpeg/Makefile.orig 2017-11-14 16:55:01 UTC
+++ tools/depends/target/ffmpeg/Makefile
-@@ -24,6 +24,11 @@ ffmpg_config += --enable-libdcadec
+@@ -24,6 +24,11 @@ ffmpg_config += --enable-encoder=png --enable-encoder=
ifeq ($(CROSS_COMPILING), yes)
ffmpg_config += --arch=$(CPU) --enable-cross-compile
endif
@@ -11,4 +11,4 @@
+endif
ifeq ($(OS), linux)
ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
- ffmpg_config += --enable-vdpau --enable-vaapi
+ ffmpg_config += --enable-vdpau --enable-vaapi --enable-pic
Modified: head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh
==============================================================================
--- head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-tools_depends_target_ffmpeg_autobuild.sh Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,4 +1,4 @@
---- tools/depends/target/ffmpeg/autobuild.sh.orig 2016-10-08 UTC
+--- tools/depends/target/ffmpeg/autobuild.sh.orig 2017-11-14 16:55:01 UTC
+++ tools/depends/target/ffmpeg/autobuild.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
@@ -6,7 +6,7 @@
#
# Copyright (C) 2005-2013 Team XBMC
# http://xbmc.org
-@@ -27,7 +27,8 @@ BASE_URL=$(grep "BASE_URL=" FFMPEG-VERSI
+@@ -27,7 +27,8 @@ BASE_URL=$(grep "BASE_URL=" FFMPEG-VERSION | sed 's/BA
VERSION=$(grep "VERSION=" FFMPEG-VERSION | sed 's/VERSION=//g')
ARCHIVE=ffmpeg-$(echo "${VERSION}" | sed 's/\//-/g').tar.gz
@@ -16,7 +16,7 @@
echo "usage $(basename $0)
[-p | --prefix] ... ffmepg install prefix
[-d | --download] ... no build, download tarfile only
-@@ -82,6 +83,46 @@ do
+@@ -87,6 +88,46 @@ do
FLAGS="$FLAGS --extra-cxxflags=\"${1#*=}\""
shift
;;
@@ -63,7 +63,7 @@
-j)
BUILDTHREADS=$2
shift 2
-@@ -100,7 +141,7 @@ do
+@@ -105,7 +146,7 @@ do
esac
done
@@ -72,7 +72,7 @@
[ ${BUILDTHREADS} -eq 0 ] && BUILDTHREADS=1
[ -z ${VERSION} ] && exit 3
-@@ -110,12 +151,12 @@ then
+@@ -115,12 +156,12 @@ then
[ "$VERSION" == "$CURVER" ] && exit 0
fi
@@ -89,7 +89,7 @@
if [ -d ${FFMPEG_PREFIX} ]
then
[ -w ${FFMPEG_PREFIX} ] || SUDO="sudo"
-@@ -123,9 +164,9 @@ else
+@@ -128,9 +169,9 @@ else
[ -w $(dirname ${FFMPEG_PREFIX}) ] || SUDO="sudo"
fi
@@ -102,7 +102,7 @@
CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
./configure --prefix=$FFMPEG_PREFIX \
-@@ -162,11 +203,11 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LD
+@@ -167,11 +208,11 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAG
--disable-mipsdspr2 \
${FLAGS}
Modified: head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_LangInfo.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- xbmc/LangInfo.cpp.orig 2016-02-20 15:21:19 UTC
+--- xbmc/LangInfo.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/LangInfo.cpp
-@@ -282,8 +282,8 @@ void CLangInfo::CRegion::SetGlobalLocale
+@@ -284,8 +284,8 @@ void CLangInfo::CRegion::SetGlobalLocale()
// decimal separator is changed depending of the current language
// (ie. "," in French or Dutch instead of "."). This breaks atof() and
// others similar functions.
Modified: head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_DVDDemuxSPU.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_DVDDemuxSPU.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_DVDDemuxSPU.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,4 +1,4 @@
---- xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp.orig 2016-02-20 15:21:19 UTC
+--- xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp
@@ -18,6 +18,7 @@
*
@@ -7,4 +7,4 @@
+#include <stdlib.h>
#include "DVDDemuxSPU.h"
#include "DVDClock.h"
- #include "utils/log.h"
+ #include "DVDCodecs/Overlay/DVDOverlaySpu.h"
Copied and modified: head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp (from r457440, head/multimedia/kodi/files/patch-xbmc_core_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp)
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_core_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp Thu Dec 28 09:13:36 2017 (r457440, copy source)
+++ head/multimedia/kodi/files/patch-xbmc_cores_VideoPlayer_Process_overrides_linux_ProcessInfoLinux.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,4 +1,4 @@
---- xbmc/cores/VideoPlayer/Process/overrides/linux/ProcessInfoLinux.cpp.orig 2017-03-04 19:48:40 UTC
+--- xbmc/cores/VideoPlayer/Process/overrides/linux/ProcessInfoLinux.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/cores/VideoPlayer/Process/overrides/linux/ProcessInfoLinux.cpp
@@ -22,7 +22,7 @@
#include "threads/SingleLock.h"
Modified: head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXBT.h
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXBT.h Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_guilib_TextureBundleXBT.h Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,10 +1,10 @@
---- xbmc/guilib/TextureBundleXBT.h.orig 2016-02-20 15:21:19 UTC
+--- xbmc/guilib/TextureBundleXBT.h.orig 2017-11-14 16:55:01 UTC
+++ xbmc/guilib/TextureBundleXBT.h
@@ -24,6 +24,7 @@
+ #include <memory>
#include <string>
- #include <stdint.h>
#include <vector>
+#include <ctime>
- class CAutoTexBuffer;
class CBaseTexture;
+ class CXBTFReader;
Modified: head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_settings_AdvancedSettings.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- xbmc/settings/AdvancedSettings.cpp.orig 2016-02-20 15:21:19 UTC
+--- xbmc/settings/AdvancedSettings.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/settings/AdvancedSettings.cpp
-@@ -203,7 +203,7 @@ void CAdvancedSettings::Initialize()
+@@ -190,7 +190,7 @@ void CAdvancedSettings::Initialize()
m_videoCleanDateTimeRegExp = "(.*[^ _\\,\\.\\(\\)\\[\\]\\-])[ _\\.\\(\\)\\[\\]\\-]+(19[0-9][0-9]|20[0-9][0-9])([ _\\,\\.\\(\\)\\[\\]\\-]|[^0-9]$)?";
m_videoCleanStringRegExps.clear();
@@ -8,4 +8,4 @@
+ m_videoCleanStringRegExps.push_back("[ _\\,\\.\\(\\)\\[\\]\\-](ac3|dts|custom|dc|remastered|divx|divx5|dsr|dsrip|dutch|dvd|dvd5|dvd9|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|french|multi|german|read.nfo|nfofix|unrated|extended|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|3d|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\\[.*\\])([ _\\,\\.\\(\\)\\[\\]\\-]|$)");
m_videoCleanStringRegExps.push_back("(\\[.*\\])");
- m_moviesExcludeFromScanRegExps.clear();
+ // this vector will be inserted at the end to
Modified: head/multimedia/kodi/files/patch-xbmc_system.h
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_system.h Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_system.h Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- xbmc/system.h.orig 2015-08-16 16:37:32 UTC
+--- xbmc/system.h.orig 2017-11-14 16:55:01 UTC
+++ xbmc/system.h
-@@ -166,7 +166,11 @@
+@@ -143,7 +143,11 @@
#endif
#else
#ifndef HAVE_X11
Modified: head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2016-02-20 15:21:19 UTC
+--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp
-@@ -31,9 +31,8 @@
+@@ -33,9 +33,8 @@
#include <sys/param.h>
#if __FreeBSD_version < 900031
#include <sys/thr.h>
Modified: head/multimedia/kodi/files/patch-xbmc_utils_CPUInfo.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_utils_CPUInfo.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_utils_CPUInfo.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- xbmc/utils/CPUInfo.cpp.orig 2016-04-24 UTC
+--- xbmc/utils/CPUInfo.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/utils/CPUInfo.cpp
-@@ -584,6 +584,14 @@ bool CCPUInfo::getTemperature(CTemperatu
+@@ -604,6 +604,14 @@ bool CCPUInfo::getTemperature(CTemperature& temperatur
#if defined(TARGET_DARWIN_OSX)
value = SMCGetTemperature(SMC_KEY_CPU_TEMP);
scale = 'c';
@@ -15,13 +15,13 @@
#else
int ret = 0;
FILE *p = NULL;
-@@ -937,6 +945,9 @@ bool CCPUInfo::HasNeon()
- #elif defined(TARGET_DARWIN_IOS)
- has_neon = 1;
+@@ -955,6 +963,9 @@ bool CCPUInfo::HasNeon()
+ has_neon = (CAndroidFeatures::HasNeon()) ? 1 : 0;
-+#elif defined(__FreeBSD__) && defined(__ARM_NEON__)
+ #elif defined(TARGET_DARWIN_IOS)
+ has_neon = 1;
+
++#elif defined(__FreeBSD__) && defined(__ARM_NEON__)
+ has_neon = 1;
+
#elif defined(TARGET_LINUX) && defined(__ARM_NEON__)
- if (has_neon == -1)
- {
Modified: head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_utils_CharsetConverter.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,6 +1,6 @@
---- xbmc/utils/CharsetConverter.cpp.orig 2016-02-20 15:21:19 UTC
+--- xbmc/utils/CharsetConverter.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/utils/CharsetConverter.cpp
-@@ -70,7 +70,7 @@
+@@ -75,7 +75,7 @@
#define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
#define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
#define UTF8_SOURCE "UTF-8"
Modified: head/multimedia/kodi/files/patch-xbmc_utils_RssReader.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_utils_RssReader.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_utils_RssReader.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,8 +1,8 @@
Fix bogus pointer comparisons.
---- xbmc/utils/RssReader.cpp.orig 2017-01-21 21:11:51 UTC
+--- xbmc/utils/RssReader.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/utils/RssReader.cpp
-@@ -266,11 +266,11 @@ void CRssReader::GetNewsItems(TiXmlEleme
+@@ -269,11 +269,11 @@ void CRssReader::GetNewsItems(TiXmlElement* channelXml
if (m_tagSet.empty())
AddTag("title");
Modified: head/multimedia/kodi/files/patch-xbmc_windowing_egl_EGLNativeTypeAmlogic.cpp
==============================================================================
--- head/multimedia/kodi/files/patch-xbmc_windowing_egl_EGLNativeTypeAmlogic.cpp Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/files/patch-xbmc_windowing_egl_EGLNativeTypeAmlogic.cpp Thu Dec 28 09:17:14 2017 (r457441)
@@ -1,4 +1,4 @@
---- xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp.orig 2015-11-12 03:09:15 UTC
+--- xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp.orig 2017-11-14 16:55:01 UTC
+++ xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp
@@ -17,6 +17,7 @@
* <http://www.gnu.org/licenses/>.
@@ -7,8 +7,8 @@
+#if defined(__linux__)
#include "EGLNativeTypeAmlogic.h"
- #include "guilib/gui3d.h"
-@@ -305,3 +306,4 @@ void CEGLNativeTypeAmlogic::DisableFreeS
+ #include "guilib/GraphicContext.h"
+@@ -259,3 +260,4 @@ void CEGLNativeTypeAmlogic::SetFramebufferResolution(i
close(fd0);
}
}
Modified: head/multimedia/kodi/pkg-plist
==============================================================================
--- head/multimedia/kodi/pkg-plist Thu Dec 28 09:13:36 2017 (r457440)
+++ head/multimedia/kodi/pkg-plist Thu Dec 28 09:17:14 2017 (r457441)
@@ -234,9 +234,6 @@ share/icons/hicolor/64x64/apps/kodi.png
%%DATADIR%%/addons/metadata.common.fanart.tv/addon.xml
%%DATADIR%%/addons/metadata.common.fanart.tv/fanarttv.xml
%%DATADIR%%/addons/metadata.common.fanart.tv/icon.png
-%%DATADIR%%/addons/metadata.common.htbackdrops.com/addon.xml
-%%DATADIR%%/addons/metadata.common.htbackdrops.com/htbackdrops.xml
-%%DATADIR%%/addons/metadata.common.htbackdrops.com/icon.png
%%DATADIR%%/addons/metadata.common.imdb.com/addon.xml
%%DATADIR%%/addons/metadata.common.imdb.com/changelog.txt
%%DATADIR%%/addons/metadata.common.imdb.com/icon.png
@@ -2272,6 +2269,7 @@ share/icons/hicolor/64x64/apps/kodi.png
%%DATADIR%%/system/keyboardlayouts/greek.xml
%%DATADIR%%/system/keyboardlayouts/hebrew.xml
%%DATADIR%%/system/keyboardlayouts/hungarian.xml
+%%DATADIR%%/system/keyboardlayouts/icelandic.xml
%%DATADIR%%/system/keyboardlayouts/italian.xml
%%DATADIR%%/system/keyboardlayouts/korean.xml
%%DATADIR%%/system/keyboardlayouts/lithuanian.xml
More information about the svn-ports-all
mailing list