1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-09 06:51:44 +00:00

multimedia/kodi-devel: Update to newer snapshot

- Python 3 support has been merged to master and we can track it
  again
- Enable Sndio support by default again.  OSS support has probably
  been broken for a while.
- Remove non-functional RPI option
This commit is contained in:
Tobias Kortkamp 2019-10-15 10:32:46 +00:00
parent c0c9bce219
commit 74dc85affd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=514508
7 changed files with 20 additions and 57 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= inputstream.adaptive
DISTVERSION= 2.5.1
DISTVERSIONSUFFIX= -Matrix
PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMEPREFIX= kodi-addon-
PKGNAMESUFFIX= -devel
@ -13,9 +14,9 @@ COMMENT= Adaptive stream support for Kodi
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL
BUILD_DEPENDS= kodi-devel>=19.0.a20190826:multimedia/kodi-devel
BUILD_DEPENDS= kodi-devel>=19.0.a20191014:multimedia/kodi-devel
LIB_DEPENDS= libexpat.so:textproc/expat2
RUN_DEPENDS= kodi-devel>=19.0.a20190826:multimedia/kodi-devel
RUN_DEPENDS= kodi-devel>=19.0.a20191014:multimedia/kodi-devel
USES= cmake
USE_GITHUB= yes

View File

@ -3,6 +3,7 @@
PORTNAME= vfs.libarchive
DISTVERSION= 1.0.5
DISTVERSIONSUFFIX= -Leia
PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMEPREFIX= kodi-addon-
PKGNAMESUFFIX= -devel
@ -12,10 +13,10 @@ COMMENT= VFS addon for Kodi to access archives directly
LICENSE= GPLv2+
BUILD_DEPENDS= kodi-devel>=19.0.a20190518_1:multimedia/kodi-devel
BUILD_DEPENDS= kodi-devel>=19.0.a20191014:multimedia/kodi-devel
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
liblzo2.so:archivers/lzo2
RUN_DEPENDS= kodi-devel>=19.0.a20190518_1:multimedia/kodi-devel
RUN_DEPENDS= kodi-devel>=19.0.a20191014:multimedia/kodi-devel
USES= cmake libarchive ssl
USE_GITHUB= yes

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kodi
DISTVERSION= 19.0.a20190826
PORTREVISION= 1
DISTVERSION= 19.0.a20191014
CATEGORIES= multimedia
PKGNAMESUFFIX= -devel
@ -24,6 +23,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \
libcdio.so:sysutils/libcdio \
libcrossguid.so:devel/libcrossguid \
libcurl.so:ftp/curl \
libdrm.so:graphics/libdrm \
libdvdnav.so:multimedia/libdvdnav \
libdvdread.so:multimedia/libdvdread \
libexpat.so:textproc/expat2 \
@ -50,14 +50,15 @@ 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 \
USES= autoreconf:build cmake:noninja compiler:c++11-lang gettext gl \
gmake gnome iconv:wchar_t jpeg libtool pkgconfig python:3.5+ \
sqlite ssl
USE_GITHUB= yes
GH_ACCOUNT= xbmc
GH_PROJECT= xbmc
GH_TAGNAME= 0bc5954818e6b55a98f551a540a4d3589b60297f
GH_TAGNAME= 05488ed68e4dc4c3cf9e1c4b2907e87bd8f0a26b
USE_GNOME= libxml2 libxslt
USE_GL= egl gl glu
USE_JAVA= yes
JAVA_BUILD= yes
USE_LDCONFIG= yes
@ -81,23 +82,20 @@ PORTDATA= *
OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSE UPNP VAAPI \
VDPAU WEBSERVER
OPTIONS_DEFAULT= DBUS GBM LIBBLURAY UPNP VAAPI VDPAU WAYLAND WEBSERVER \
X11
OPTIONS_DEFAULT= DBUS GBM LIBBLURAY SNDIO UPNP VAAPI VDPAU WAYLAND \
WEBSERVER X11
OPTIONS_DEFAULT_amd64= SSE
OPTIONS_GROUP= SOUND
OPTIONS_GROUP_SOUND= PULSEAUDIO SNDIO
OPTIONS_MULTI= PLATFORM
OPTIONS_MULTI_PLATFORM= GBM RPI WAYLAND X11
OPTIONS_EXCLUDE_amd64= RPI
OPTIONS_MULTI_PLATFORM= GBM WAYLAND X11
OPTIONS_EXCLUDE_armv6= SSE
OPTIONS_EXCLUDE_armv7= SSE
OPTIONS_EXCLUDE_i386= RPI
OPTIONS_SUB= yes
CEC_DESC= CEC adapter support
GBM_DESC= GBM support (requires a kernel with evdev support)
PLATFORM_DESC= Platform
RPI_DESC= Raspberry Pi support
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
AVAHI_CMAKE_BOOL= ENABLE_AVAHI
@ -128,17 +126,6 @@ NFS_CMAKE_BOOL= ENABLE_NFS
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSEAUDIO
# For RPI, disable VAAPI in multimedia/ffmpeg too, so that mesa-libs
# is *not* installed via libva in the build environment. Both
# mesa-libs and raspberrypi-userland conflict with each other.
RPI_PREVENTS= GBM VAAPI VDPAU WAYLAND X11
RPI_LIB_DEPENDS_OFF= libdrm.so:graphics/libdrm
RPI_LIB_DEPENDS= libbrcmEGL.so:misc/raspberrypi-userland
RPI_USES_OFF= gl
RPI_USE_OFF= GL=egl,gl,glu
RPI_VARS= KODI_PLATFORMS+=RBPI
_KODI_RBPI_ARGS= -DCORE_PLATFORM_NAME:STRING="rbpi"
SMB_USES= samba:lib
SMB_CMAKE_BOOL= ENABLE_SMBCLIENT
@ -178,6 +165,7 @@ _KODI_WAYLAND_ARGS= -DCORE_PLATFORM_NAME:STRING="wayland" \
WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd
WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD
X11_USES= xorg
X11_USE= XORG=x11,xext,xrandr
X11_VARS= _KODI_PLATFORMS+=X11
_KODI_X11_ARGS= -DCORE_PLATFORM_NAME:STRING="x11"

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1566880765
SHA256 (xbmc-xbmc-19.0.a20190826-0bc5954818e6b55a98f551a540a4d3589b60297f_GH0.tar.gz) = 1e0d55dab4d793ce4bd908b8f520f8be74c16d3c3ded0921995344ce1904475f
SIZE (xbmc-xbmc-19.0.a20190826-0bc5954818e6b55a98f551a540a4d3589b60297f_GH0.tar.gz) = 78454589
TIMESTAMP = 1571114284
SHA256 (xbmc-xbmc-19.0.a20191014-05488ed68e4dc4c3cf9e1c4b2907e87bd8f0a26b_GH0.tar.gz) = 830756b753b01dc313f640206cb08293f21ac82e6069b5973d298a526700d0c7
SIZE (xbmc-xbmc-19.0.a20191014-05488ed68e4dc4c3cf9e1c4b2907e87bd8f0a26b_GH0.tar.gz) = 78486968

View File

@ -1,26 +0,0 @@
--- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-10-02 14:30:37 UTC
+++ xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -52,9 +52,22 @@ CWinSystemRpi::CWinSystemRpi() :
{
OPTIONALS::PulseAudioRegister();
}
+ else if (StringUtils::EqualsNoCase(envSink, "OSS"))
+ {
+ OPTIONALS::OSSRegister();
+ }
+ else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
+ {
+ OPTIONALS::SndioRegister();
+ }
else
{
- OPTIONALS::ALSARegister();
+ if (!OPTIONALS::SndioRegister())
+ {
+ if(!OPTIONALS::ALSARegister())
+ {
+ OPTIONALS::OSSRegister();
+ }
}
CLinuxPowerSyscall::Register();

View File

@ -3,7 +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 v19 based on
the Python 3 support feature branch.
This is a development snapshot of the upcoming Kodi v19 with
Python 3 support.
WWW: http://kodi.tv/

View File

@ -71,7 +71,6 @@ include/kodi/xbmc_epg_types.h
include/kodi/xbmc_pvr_dll.h
include/kodi/xbmc_pvr_types.h
%%GBM%%lib/kodi/kodi-gbm
%%RPI%%lib/kodi/kodi-rbpi
%%WAYLAND%%lib/kodi/kodi-wayland
%%X11%%lib/kodi/kodi-x11
%%X11%%lib/kodi/kodi-xrandr