1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-28 10:08:24 +00:00

multimedia/kodi-devel: Update to 18.0b3

This commit is contained in:
Tobias Kortkamp 2018-10-03 08:34:26 +00:00
parent 45b731c850
commit 9fde9b6485
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=481149
3 changed files with 29 additions and 56 deletions

View File

@ -2,8 +2,7 @@
PORTNAME= kodi
CATEGORIES= multimedia
DISTVERSION= 18.0.g201809092101
PORTREVISION= 2
DISTVERSION= 18.0.g201810021630
PKGNAMESUFFIX?= -devel
MAINTAINER= tobik@FreeBSD.org
@ -55,7 +54,7 @@ USES= autoreconf:build cmake:outsource,noninja compiler:c++11-lib \
USE_GITHUB= yes
GH_ACCOUNT= xbmc
GH_PROJECT= xbmc
GH_TAGNAME= 18.0b2-Leia
GH_TAGNAME= 18.0b3-Leia
USE_GNOME= libxslt libxml2
USE_JAVA= yes
JAVA_BUILD= yes
@ -109,7 +108,10 @@ DBUS_CMAKE_BOOL= ENABLE_DBUS
GBM_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat
GBM_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="gbm" \
-DGBM_RENDER_SYSTEM:STRING="gl"
GBM_LIB_DEPENDS= libinput.so:x11/libinput \
GBM_CFLAGS= -I${LOCALBASE}/include/libepoll-shim
GBM_LDFLAGS= -L${LOCALBASE}/lib -lepoll-shim
GBM_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
@ -131,6 +133,7 @@ RPI_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="rbpi"
RPI_LIB_DEPENDS= libbrcmEGL.so:misc/raspberrypi-userland
RPI_LIB_DEPENDS_OFF= libdrm.so:graphics/libdrm
RPI_PREVENTS= VAAPI VDPAU
RPI_USES_OFF= gl
RPI_USE_OFF= GL=egl,gl,glu
SMB_USES= samba:lib

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1536563272
SHA256 (xbmc-xbmc-18.0.g201809092101-18.0b2-Leia_GH0.tar.gz) = 25fc0aabfb523d4db19e08b1990d4851592ee2adec0424f5fb729bd3672eae69
SIZE (xbmc-xbmc-18.0.g201809092101-18.0b2-Leia_GH0.tar.gz) = 50470777
TIMESTAMP = 1538519280
SHA256 (xbmc-xbmc-18.0.g201810021630-18.0b3-Leia_GH0.tar.gz) = cc5f1a75287438b2336c49a265019a4cab9626235e05a70345d77e4cecd6dce3
SIZE (xbmc-xbmc-18.0.g201810021630-18.0b3-Leia_GH0.tar.gz) = 50833569

View File

@ -1,56 +1,26 @@
--- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-05-22 11:44:17 UTC
--- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-10-02 14:30:37 UTC
+++ xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -32,8 +32,15 @@
#include "settings/DisplaySettings.h"
#include "guilib/DispResource.h"
#include "utils/log.h"
+#include "utils/StringUtils.h"
#include "cores/AudioEngine/AESinkFactory.h"
#include "cores/AudioEngine/Sinks/AESinkPi.h"
+#ifdef HAS_PULSEAUDIO
+#include "cores/AudioEngine/Sinks/AESinkPULSE.h"
+#endif
+#ifdef HAS_SNDIO
+#include "cores/AudioEngine/Sinks/AESinkSNDIO.h"
+#endif
#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
#include <EGL/egl.h>
@@ -54,7 +61,36 @@ CWinSystemRpi::CWinSystemRpi() :
m_rpi = new CRPIUtils();
AE::CAESinkFactory::ClearSinks();
- CAESinkPi::Register();
+
+ std::string envSink;
+ if (getenv("AE_SINK"))
+ envSink = getenv("AE_SINK");
+ if (StringUtils::EqualsNoCase(envSink, "PULSE"))
@@ -52,9 +52,22 @@ CWinSystemRpi::CWinSystemRpi() :
{
OPTIONALS::PulseAudioRegister();
}
+ else if (StringUtils::EqualsNoCase(envSink, "OSS"))
+ {
+#ifdef HAS_PULSEAUDIO
+ CAESinkPulseaudio::Register();
+#endif
+ OPTIONALS::OSSRegister();
+ }
+ else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
+ {
+#ifdef HAS_SNDIO
+ CAESinkSNDIO::Register();
+#endif
+ }
+ else if (StringUtils::EqualsNoCase(envSink, "PI"))
+ {
+ CAESinkPi::Register();
+ }
+ else
+ {
+#if defined(HAS_PULSEAUDIO)
+ CAESinkPulseaudio::Register();
+#elif defined(HAS_SNDIO)
+ CAESinkSNDIO::Register();
+#else
+ CAESinkPi::Register();
+#endif
+ OPTIONALS::SndioRegister();
+ }
else
{
- OPTIONALS::ALSARegister();
+ if (!OPTIONALS::SndioRegister())
+ {
+ if(!OPTIONALS::ALSARegister())
+ {
+ OPTIONALS::OSSRegister();
+ }
}
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
m_libinput->Start();