From 0d461c80a7325df4cab7e0e399747bbd73bf7d90 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Sat, 18 May 2019 07:15:25 +0000 Subject: [PATCH] multimedia/kodi-devel: Update to snapshot for 19.0 This is based on the feature_python3 branch to enable Python 3 support. - Add a run dependency on py-sqlite3 since too many plugins like the YouTube plugin expect it to be there - Only link kodi-gbm with libepoll-shim instead of every binary and library --- multimedia/kodi-devel/Makefile | 13 ++++---- multimedia/kodi-devel/distinfo | 6 ++-- .../patch-cmake_modules_FindEpollShim.cmake | 30 +++++++++++++++++++ .../patch-cmake_platform_freebsd_gbm.cmake | 5 ++++ multimedia/kodi-devel/pkg-descr | 3 +- multimedia/kodi-devel/pkg-plist | 7 ++++- 6 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake create mode 100644 multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile index a78be30c2905..fc172cb7a752 100644 --- a/multimedia/kodi-devel/Makefile +++ b/multimedia/kodi-devel/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kodi -DISTVERSION= 18.2 -DISTVERSIONSUFFIX= -Leia +DISTVERSION= 19.0.a20190518 CATEGORIES= multimedia PKGNAMESUFFIX= -devel @@ -45,16 +44,18 @@ LIB_DEPENDS= libass.so:multimedia/libass \ libtinyxml.so:textproc/tinyxml \ libudev.so:devel/libudev-devd \ libuuid.so:misc/e2fsprogs-libuuid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} # Building libcpluff.a requires autoreconf and gmake. Using ninja # leads to dependency problems where libcpluff.a is not yet finished # building when it's required. -USES= autoreconf:build cmake:noninja compiler:c++11-lang \ - gettext gmake gnome iconv:wchar_t jpeg libtool pkgconfig \ - python:2.7 ssl sqlite +USES= autoreconf:build cmake:noninja compiler:c++11-lang gettext \ + gmake gnome iconv:wchar_t jpeg libtool pkgconfig python:3.5+ \ + sqlite ssl USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc +GH_TAGNAME= 131485167f53d09e068430d2cb5656a03ca76697 USE_GNOME= libxslt libxml2 USE_JAVA= yes JAVA_BUILD= yes @@ -108,8 +109,6 @@ DBUS_CMAKE_BOOL= ENABLE_DBUS KODI_GBM_ARGS= -DCORE_PLATFORM_NAME:STRING="gbm" \ -DGBM_RENDER_SYSTEM:STRING="gl" -GBM_CFLAGS= -I${LOCALBASE}/include/libepoll-shim -GBM_LDFLAGS= -L${LOCALBASE}/lib -lepoll-shim -lpthread -lrt GBM_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto GBM_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libinput.so:x11/libinput \ diff --git a/multimedia/kodi-devel/distinfo b/multimedia/kodi-devel/distinfo index a99000ff3646..603bdb6d4156 100644 --- a/multimedia/kodi-devel/distinfo +++ b/multimedia/kodi-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555928210 -SHA256 (xbmc-xbmc-18.2-Leia_GH0.tar.gz) = 07b8cffc396473523a51354dc95dfffb54a6a456b82cda7ad67dc2c052d99f64 -SIZE (xbmc-xbmc-18.2-Leia_GH0.tar.gz) = 51012621 +TIMESTAMP = 1558154592 +SHA256 (xbmc-xbmc-19.0.a20190518-131485167f53d09e068430d2cb5656a03ca76697_GH0.tar.gz) = b7a7433cecf1fafc8a0342f39ebcd0c5cdf178cd493dce13e1ed8eb5dd38b3bb +SIZE (xbmc-xbmc-19.0.a20190518-131485167f53d09e068430d2cb5656a03ca76697_GH0.tar.gz) = 78706844 diff --git a/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake b/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake new file mode 100644 index 000000000000..2d1503c4c36f --- /dev/null +++ b/multimedia/kodi-devel/files/patch-cmake_modules_FindEpollShim.cmake @@ -0,0 +1,30 @@ +--- cmake/modules/FindEpollShim.cmake.orig 2019-05-18 04:05:16 UTC ++++ cmake/modules/FindEpollShim.cmake +@@ -0,0 +1,27 @@ ++# FindEpollShim ++# ------------- ++# Finds the epoll-shim library ++# ++# This will define the following variables:: ++# ++# EPOLLSHIM_FOUND - the system has epoll-shim ++# EPOLLSHIM_INCLUDE_DIR - the epoll-shim include directory ++# EPOLLSHIM_LIBRARY - the epoll-shim library ++ ++if(PKG_CONFIG_FOUND) ++ pkg_check_modules(PC_EPOLLSHIM epoll-shim QUIET) ++endif() ++ ++find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h PATHS ${PC_EPOLLSHIM_INCLUDE_DIRS}) ++find_library(EPOLLSHIM_LIBRARY NAMES epoll-shim PATHS ${PC_EPOLLSHIM_LIBDIR}) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(EpollShim ++ REQUIRED_VARS EPOLLSHIM_LIBRARY EPOLLSHIM_INCLUDE_DIR) ++ ++if(EPOLLSHIM_FOUND) ++ set(EPOLLSHIM_INCLUDE_DIRS ${EPOLLSHIM_INCLUDE_DIR}) ++ set(EPOLLSHIM_LIBRARIES ${EPOLLSHIM_LIBRARY}) ++endif() ++ ++mark_as_advanced(EPOLLSHIM_INCLUDE_DIR EPOLLSHIM_LIBRARY) diff --git a/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake b/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake new file mode 100644 index 000000000000..f3587416d303 --- /dev/null +++ b/multimedia/kodi-devel/files/patch-cmake_platform_freebsd_gbm.cmake @@ -0,0 +1,5 @@ +--- cmake/platform/freebsd/gbm.cmake.orig 2019-05-08 08:47:45 UTC ++++ cmake/platform/freebsd/gbm.cmake +@@ -1 +1,2 @@ + include(cmake/platform/linux/gbm.cmake) ++list(APPEND PLATFORM_REQUIRED_DEPS EpollShim) diff --git a/multimedia/kodi-devel/pkg-descr b/multimedia/kodi-devel/pkg-descr index 5264421ab19e..fb4f2a6628df 100644 --- a/multimedia/kodi-devel/pkg-descr +++ b/multimedia/kodi-devel/pkg-descr @@ -3,6 +3,7 @@ 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. -This is a development snapshot for the upcoming Kodi v18. +This is a development snapshot for the upcoming Kodi v19 based on +the Python 3 support feature branch. WWW: http://kodi.tv/ diff --git a/multimedia/kodi-devel/pkg-plist b/multimedia/kodi-devel/pkg-plist index c0d5ac606c3b..2d6bb0447028 100644 --- a/multimedia/kodi-devel/pkg-plist +++ b/multimedia/kodi-devel/pkg-plist @@ -4,6 +4,7 @@ bin/kodi-standalone include/kodi/AEChannelData.h include/kodi/ActionIDs.h include/kodi/AddonBase.h +include/kodi/AudioEngine.h include/kodi/DemuxCrypto.h include/kodi/DemuxPacket.h include/kodi/Filesystem.h @@ -50,6 +51,10 @@ include/kodi/gui/dialogs/Progress.h include/kodi/gui/dialogs/Select.h include/kodi/gui/dialogs/TextViewer.h include/kodi/gui/dialogs/YesNo.h +include/kodi/gui/gl/GL.h +include/kodi/gui/gl/GLonDX.h +include/kodi/gui/gl/Shader.h +include/kodi/gui/renderHelper.h include/kodi/kodi_game_dll.h include/kodi/kodi_game_types.h include/kodi/kodi_vfs_types.h @@ -70,8 +75,8 @@ include/kodi/xbmc_pvr_types.h %%WAYLAND%%lib/kodi/kodi-wayland %%X11%%lib/kodi/kodi-x11 %%X11%%lib/kodi/kodi-xrandr -lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-%%OPSYS%%.so %%SSE%%lib/kodi/system/libsse4-%%ARCH%%-%%OPSYS%%.so +lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-%%OPSYS%%.so man/man1/kodi.1.gz man/man1/kodi.bin.1.gz share/applications/kodi.desktop