Index: head/multimedia/kodi-devel/Makefile =================================================================== --- head/multimedia/kodi-devel/Makefile (revision 467812) +++ head/multimedia/kodi-devel/Makefile (revision 467813) @@ -1,194 +1,196 @@ # $FreeBSD$ PORTNAME= kodi -DISTVERSION= 18.0.g201803211302 -PORTREVISION= 3 +DISTVERSION= 18.0.g201804180937 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel MAINTAINER= tobik@FreeBSD.org COMMENT= Award winning media center application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.GPL BROKEN_FreeBSD_10= does not build ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 BUILD_DEPENDS= rapidjson>=0:devel/rapidjson \ swig3.0:devel/swig30 LIB_DEPENDS= libass.so:multimedia/libass \ libavcodec.so:multimedia/ffmpeg \ libavfilter.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libcdio.so:sysutils/libcdio \ libcrossguid.so:devel/libcrossguid \ libcurl.so:ftp/curl \ libdvdnav.so:multimedia/libdvdnav \ libdvdread.so:multimedia/libdvdread \ libexpat.so:textproc/expat2 \ libfmt.so:devel/libfmt \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgif.so:graphics/giflib \ libgnutls.so:security/gnutls \ liblcms2.so:graphics/lcms2 \ liblzo2.so:archivers/lzo2 \ libpcre.so:devel/pcre \ libpcrecpp.so:devel/pcre \ libpng.so:graphics/png \ libpostproc.so:multimedia/ffmpeg \ libswresample.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ libtag.so:audio/taglib \ libtinyxml.so:textproc/tinyxml \ libuuid.so:misc/e2fsprogs-libuuid # 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:outsource,noninja compiler:c++11-lib \ gettext gmake iconv:wchar_t jpeg libtool pkgconfig python:-2.7 \ ssl sqlite USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc -GH_TAGNAME= d571386e6f848db993ac7f855fc911abc23e308a +GH_TAGNAME= f4489bffe22487bc906e79130832c14360a42a8a USE_GNOME= libxslt libxml2 USE_JAVA= yes JAVA_BUILD= yes USE_LDCONFIG= yes CONFLICTS_INSTALL= kodi-[0-9]* CMAKE_ARGS= -DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include" \ -DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \ -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" CMAKE_OFF= ENABLE_ALSA \ ENABLE_DVDCSS \ ENABLE_INTERNAL_FFMPEG \ ENABLE_INTERNAL_CROSSGUID CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB}" OPENSSL_CFLAGS="-I${OPENSSLINC}" KODIARCH_i386= x86 KODIARCH_amd64= x86_64 PLIST_SUB= ARCH=${KODIARCH_${ARCH}:U${ARCH}} OPSYS=${OPSYS:tl} OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSH UPNP VAAPI \ VDPAU WEBSERVER -OPTIONS_DEFAULT= LIBBLURAY SNDIO SSH UPNP VAAPI VDPAU WEBSERVER X11 +OPTIONS_DEFAULT= LIBBLURAY SSH UPNP VAAPI VDPAU WEBSERVER X11 OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= GBM RPI WAYLAND X11 OPTIONS_EXCLUDE_amd64= RPI OPTIONS_EXCLUDE_i386= RPI OPTIONS_SUB= yes -# Choosing one of SNDIO or PULSEAUDIO is mandatory right now if you -# want audio output. The OSS backend is currently not hooked into -# Kodi's audio sink factory due to recent refactorings. -OPTIONS_MULTI= SOUND -OPTIONS_MULTI_SOUND= PULSEAUDIO SNDIO +OPTIONS_GROUP= SOUND +OPTIONS_GROUP_SOUND= PULSEAUDIO SNDIO 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 CEC_LIB_DEPENDS= libcec.so:multimedia/libcec CEC_CMAKE_BOOL= ENABLE_CEC DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS GBM_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="gbm" LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY MYSQL_USES= mysql MYSQL_CMAKE_BOOL= ENABLE_MYSQLCLIENT NFS_LIB_DEPENDS= libnfs.so:net/libnfs 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_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_USE_OFF= GL=egl,gl,glu SMB_USES= samba:lib SMB_CMAKE_BOOL= ENABLE_SMBCLIENT SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= ENABLE_SNDIO SSH_LIB_DEPENDS= libssh.so:security/libssh SSH_CMAKE_BOOL= ENABLE_SSH UPNP_CMAKE_BOOL= ENABLE_UPNP # XXX: Upstream is https://github.com/plutinosoft/Neptune UPNP_CXXFLAGS= -DNPT_CONFIG_HAVE_ARPA_INET_H \ -DNPT_CONFIG_HAVE_GETADDRINFO \ + -DNPT_CONFIG_HAVE_GETIFADDRS \ -DNPT_CONFIG_HAVE_INET_NTOP \ -DNPT_CONFIG_HAVE_INET_PTON \ -DNPT_CONFIG_HAVE_NET_IF_DL_H \ -DNPT_CONFIG_HAVE_SOCKADDR_DL \ -DNPT_CONFIG_HAVE_SOCKADDR_IN_SIN_LEN VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CMAKE_BOOL= ENABLE_VAAPI VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CMAKE_BOOL= ENABLE_VDPAU WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="wayland" \ -DWAYLAND_RENDER_SYSTEM:STRING="gl" WAYLAND_LIB_DEPENDS= libwayland-client++.so:graphics/waylandpp \ + libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD X11_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="x11" X11_USE= XORG=x11,xext,xrandr .include .if ${SLAVE_PORT} == no PORTDATA= * .endif post-patch: # Do not try to download dvdnav/dvdread during the build, instead # we'll manually point the build to the system's libdvd{nav,read}.so # (see CMAKE_ARGS). @${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \ ${WRKSRC}/cmake/modules/FindLibDvd.cmake @${CP} ${WRKSRC}/cmake/platform/linux/gbm.cmake \ ${WRKSRC}/cmake/platform/linux/rbpi.cmake \ ${WRKSRC}/cmake/platform/freebsd + @${CP} ${WRKSRC}/cmake/scripts/linux/ExtraTargets.cmake \ + ${WRKSRC}/cmake/scripts/freebsd/ExtraTargets.cmake + @${CP} ${WRKSRC}/system/settings/linux.xml \ + ${WRKSRC}/system/settings/freebsd.xml .if ${SLAVE_PORT} == no post-install: ${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf kodi.bin.1.gz kodi.1.gz @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/TexturePacker @${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' | ${XARGS} ${STRIP_CMD} # Nothing useful here... @${RM} -rf ${STAGEDIR}${DOCSDIR} .endif .include Index: head/multimedia/kodi-devel/distinfo =================================================================== --- head/multimedia/kodi-devel/distinfo (revision 467812) +++ head/multimedia/kodi-devel/distinfo (revision 467813) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515769119 -SHA256 (xbmc-xbmc-18.0.g201803211302-d571386e6f848db993ac7f855fc911abc23e308a_GH0.tar.gz) = 310597a7ef631ff7220c3d1cfcbff1be4de3464e0b15f6b1ec16ce7fb2adee4d -SIZE (xbmc-xbmc-18.0.g201803211302-d571386e6f848db993ac7f855fc911abc23e308a_GH0.tar.gz) = 41177182 +TIMESTAMP = 1524056987 +SHA256 (xbmc-xbmc-18.0.g201804180937-f4489bffe22487bc906e79130832c14360a42a8a_GH0.tar.gz) = 8f77f6cff2bcab9b31c1df120b3e044acbd55c93cb96ecb63830e37aeaf30bc5 +SIZE (xbmc-xbmc-18.0.g201804180937-f4489bffe22487bc906e79130832c14360a42a8a_GH0.tar.gz) = 41117210 Index: head/multimedia/kodi-devel/files/patch-oss =================================================================== --- head/multimedia/kodi-devel/files/patch-oss (nonexistent) +++ head/multimedia/kodi-devel/files/patch-oss (revision 467813) @@ -0,0 +1,176 @@ +--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp.orig 2018-04-18 09:37:24 UTC ++++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp +@@ -23,6 +23,7 @@ + #include + #include + ++#include "cores/AudioEngine/AESinkFactory.h" + #include "cores/AudioEngine/Utils/AEUtil.h" + #include "utils/log.h" + #include "threads/SingleLock.h" +@@ -71,6 +72,25 @@ CAESinkOSS::CAESinkOSS() + CAESinkOSS::~CAESinkOSS() + { + Deinitialize(); ++} ++ ++void CAESinkOSS::Register() ++{ ++ AE::AESinkRegEntry entry; ++ entry.sinkName = "OSS"; ++ entry.createFunc = CAESinkOSS::Create; ++ entry.enumerateFunc = CAESinkOSS::EnumerateDevicesEx; ++ AE::CAESinkFactory::RegisterSink(entry); ++} ++ ++IAESink* CAESinkOSS::Create(std::string &device, AEAudioFormat& desiredFormat) ++{ ++ IAESink* sink = new CAESinkOSS(); ++ if (sink->Initialize(desiredFormat, device)) ++ return sink; ++ ++ delete sink; ++ return nullptr; + } + + std::string CAESinkOSS::GetDeviceUse(const AEAudioFormat& format, const std::string &device) +--- xbmc/cores/AudioEngine/Sinks/AESinkOSS.h.orig 2018-04-18 09:37:24 UTC ++++ xbmc/cores/AudioEngine/Sinks/AESinkOSS.h +@@ -33,6 +33,10 @@ class CAESinkOSS : public IAESink (public) + CAESinkOSS(); + ~CAESinkOSS() override; + ++ static void Register(); ++ static IAESink* Create(std::string &device, AEAudioFormat &desiredFormat); ++ static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false); ++ + bool Initialize(AEAudioFormat &format, std::string &device) override; + void Deinitialize() override; + +@@ -41,7 +45,6 @@ class CAESinkOSS : public IAESink (public) + double GetCacheTotal() override { return 0.0; } /* FIXME */ + unsigned int AddPackets(uint8_t **data, unsigned int frames, unsigned int offset) override; + void Drain() override; +- static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force = false); + private: + int m_fd; + std::string m_device; +--- xbmc/platform/linux/OptionalsReg.cpp.orig 2018-04-18 09:37:24 UTC ++++ xbmc/platform/linux/OptionalsReg.cpp +@@ -58,6 +58,23 @@ bool OPTIONALS::PulseAudioRegister() + #endif + + //----------------------------------------------------------------------------- ++// OSS ++//----------------------------------------------------------------------------- ++#ifdef TARGET_FREEBSD ++#include "cores/AudioEngine/Sinks/AESinkOSS.h" ++bool OPTIONALS::OSSRegister() ++{ ++ CAESinkOSS::Register(); ++ return false; ++} ++#else ++bool OPTIONALS::OSSRegister() ++{ ++ return false; ++} ++#endif ++ ++//----------------------------------------------------------------------------- + // sndio + //----------------------------------------------------------------------------- + +--- xbmc/platform/linux/OptionalsReg.h.orig 2018-04-18 09:37:24 UTC ++++ xbmc/platform/linux/OptionalsReg.h +@@ -39,6 +39,15 @@ bool PulseAudioRegister(); + } + + //----------------------------------------------------------------------------- ++// OSS ++//----------------------------------------------------------------------------- ++ ++namespace OPTIONALS ++{ ++bool OSSRegister(); ++} ++ ++//----------------------------------------------------------------------------- + // sndio + //----------------------------------------------------------------------------- + +--- xbmc/windowing/X11/WinSystemX11GLContext.cpp.orig 2018-04-18 09:37:24 UTC ++++ xbmc/windowing/X11/WinSystemX11GLContext.cpp +@@ -63,6 +63,10 @@ CWinSystemX11GLContext::CWinSystemX11GLContext() + { + OPTIONALS::PulseAudioRegister(); + } ++ else if (StringUtils::EqualsNoCase(envSink, "OSS")) ++ { ++ OPTIONALS::OSSRegister(); ++ } + else if (StringUtils::EqualsNoCase(envSink, "SNDIO")) + { + OPTIONALS::SndioRegister(); +@@ -73,7 +77,10 @@ CWinSystemX11GLContext::CWinSystemX11GLContext() + { + if (!OPTIONALS::ALSARegister()) + { +- OPTIONALS::SndioRegister(); ++ if (!OPTIONALS::SndioRegister()) ++ { ++ OPTIONALS::OSSRegister(); ++ } + } + } + } +--- xbmc/windowing/gbm/WinSystemGbm.cpp.orig 2018-04-18 09:37:24 UTC ++++ xbmc/windowing/gbm/WinSystemGbm.cpp +@@ -54,6 +54,10 @@ CWinSystemGbm::CWinSystemGbm() : + { + OPTIONALS::PulseAudioRegister(); + } ++ else if (StringUtils::EqualsNoCase(envSink, "OSS")) ++ { ++ OPTIONALS::OSSRegister(); ++ } + else if (StringUtils::EqualsNoCase(envSink, "SNDIO")) + { + OPTIONALS::SndioRegister(); +@@ -64,7 +68,10 @@ CWinSystemGbm::CWinSystemGbm() : + { + if (!OPTIONALS::ALSARegister()) + { +- OPTIONALS::SndioRegister(); ++ if (!OPTIONALS::SndioRegister()) ++ { ++ OPTIONALS::OSSRegister(); ++ } + } + } + } +--- xbmc/windowing/wayland/WinSystemWayland.cpp.orig 2018-04-18 09:37:24 UTC ++++ xbmc/windowing/wayland/WinSystemWayland.cpp +@@ -159,6 +159,10 @@ CWinSystemWayland::CWinSystemWayland() + { + OPTIONALS::PulseAudioRegister(); + } ++ else if (StringUtils::EqualsNoCase(envSink, "OSS")) ++ { ++ OPTIONALS::OSSRegister(); ++ } + else if (StringUtils::EqualsNoCase(envSink, "SNDIO")) + { + OPTIONALS::SndioRegister(); +@@ -169,7 +173,10 @@ CWinSystemWayland::CWinSystemWayland() + { + if (!OPTIONALS::ALSARegister()) + { +- OPTIONALS::SndioRegister(); ++ if (!OPTIONALS::SndioRegister()) ++ { ++ OPTIONALS::OSSRegister(); ++ } + } + } + } Property changes on: head/multimedia/kodi-devel/files/patch-oss ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/kodi-devel/files/patch-rbpi =================================================================== --- head/multimedia/kodi-devel/files/patch-rbpi (revision 467812) +++ head/multimedia/kodi-devel/files/patch-rbpi (revision 467813) @@ -1,83 +1,83 @@ ---- cmake/scripts/freebsd/ArchSetup.cmake.orig 2017-12-17 12:10:14 UTC +--- cmake/scripts/freebsd/ArchSetup.cmake.orig 2018-04-18 09:37:24 UTC +++ cmake/scripts/freebsd/ArchSetup.cmake @@ -1,4 +1,7 @@ set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_FREEBSD) +if(CORE_PLATFORM_NAME_LC STREQUAL rbpi) + list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI) +endif() set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) set(PLATFORM_DIR platform/linux) @@ -10,6 +13,15 @@ else() set(ARCH x86_64-freebsd) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i.86") set(ARCH x86-freebsd) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv6) + set(ARCH armv6-freebsd) + set(NEON True) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7) + set(ARCH armv7-freebsd) + set(NEON True) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) + set(ARCH aarch64-freebsd) + set(NEON True) else() message(WARNING "unknown CPU: ${CPU}") endif() ---- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-02-09 09:50:14 UTC +--- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-04-18 09:37:24 UTC +++ xbmc/windowing/rpi/WinSystemRpi.cpp @@ -32,9 +32,16 @@ #include "settings/DisplaySettings.h" #include "guilib/DispResource.h" #include "utils/log.h" +#include "utils/StringUtils.h" #include "../WinEventsLinux.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 "powermanagement/linux/LinuxPowerSyscall.h" + #include "platform/linux/powermanagement/LinuxPowerSyscall.h" #include @@ -55,7 +62,36 @@ CWinSystemRpi::CWinSystemRpi() m_winEvents.reset(new CWinEventsLinux()); AE::CAESinkFactory::ClearSinks(); - CAESinkPi::Register(); + + std::string envSink; + if (getenv("AE_SINK")) + envSink = getenv("AE_SINK"); + if (StringUtils::EqualsNoCase(envSink, "PULSE")) + { +#ifdef HAS_PULSEAUDIO + CAESinkPulseaudio::Register(); +#endif + } + 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 + } CLinuxPowerSyscall::Register(); + m_lirc.reset(OPTIONALS::LircRegister()); } - Index: head/multimedia/kodi-devel/files/patch-wayland =================================================================== --- head/multimedia/kodi-devel/files/patch-wayland (revision 467812) +++ head/multimedia/kodi-devel/files/patch-wayland (revision 467813) @@ -1,52 +1,20 @@ ---- cmake/modules/FindWaylandpp.cmake.orig 2018-03-21 13:02:45 UTC -+++ cmake/modules/FindWaylandpp.cmake -@@ -10,7 +10,7 @@ - # WAYLANDPP_DEFINITIONS - the waylandpp definitions - # WAYLANDPP_SCANNER - path to wayland-scanner++ - --pkg_check_modules(WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++) -+pkg_check_modules(WAYLANDPP wayland-client++ wayland-client-extra++ wayland-egl++ wayland-cursor++) - pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++) - if(WAYLANDPP_FOUND) - pkg_get_variable(PC_WAYLANDPP_PKGDATADIR wayland-client++ pkgdatadir) ---- cmake/treedata/freebsd/subdirs.txt.orig 2018-03-21 13:02:45 UTC +--- cmake/treedata/freebsd/subdirs.txt.orig 2018-04-18 09:37:24 UTC +++ cmake/treedata/freebsd/subdirs.txt -@@ -9,4 +9,7 @@ xbmc/storage/linux storage/linux - xbmc/filesystem/posix filesystem/posix - xbmc/utils/posix utils_posix - xbmc/platform/posix posix +@@ -9,3 +9,6 @@ xbmc/platform/linux/powermanagement platform/linux/pow + xbmc/platform/linux/storage platform/linux/storage + xbmc/input/touch input/touch + xbmc/input/touch/generic input/touch/generic +xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi +xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi - xbmc/freebsd freebsdsupport -+xbmc/windowing/linux windowing/linux ---- xbmc/windowing/wayland/ShellSurfaceXdgShell.h.orig 2018-03-21 13:02:45 UTC -+++ xbmc/windowing/wayland/ShellSurfaceXdgShell.h -@@ -23,6 +23,7 @@ - #include "ShellSurface.h" - - #include -+#include - - namespace KODI - { ---- xbmc/windowing/wayland/WinSystemWayland.cpp.orig 2018-03-21 13:02:45 UTC ++xbmc/windowing/linux windowing/linux +--- xbmc/windowing/wayland/WinSystemWayland.cpp.orig 2018-04-18 09:37:24 UTC +++ xbmc/windowing/wayland/WinSystemWayland.cpp -@@ -1331,7 +1331,7 @@ void CWinSystemWayland::PrepareFramePresentation() +@@ -1333,7 +1333,7 @@ void CWinSystemWayland::PrepareFramePresentation() }; feedback.on_presented() = [this,iter](std::uint32_t tvSecHi, std::uint32_t tvSecLo, std::uint32_t tvNsec, std::uint32_t refresh, std::uint32_t seqHi, std::uint32_t seqLo, wayland::presentation_feedback_kind flags) { - timespec tv = { .tv_sec = static_cast ((static_cast(tvSecHi) << 32) + tvSecLo), .tv_nsec = tvNsec }; + timespec tv = { .tv_sec = static_cast ((static_cast(tvSecHi) << 32) + tvSecLo), .tv_nsec = static_cast(tvNsec) }; std::int64_t latency{KODI::LINUX::TimespecDifference(iter->submissionTime, tv)}; std::uint64_t msc{(static_cast(seqHi) << 32) + seqLo}; m_presentationFeedbackHandlers.Invoke(tv, refresh, m_syncOutputID, m_syncOutputRefreshRate, msc); ---- xbmc/windowing/wayland/WinSystemWayland.h.orig 2018-03-21 13:02:45 UTC -+++ xbmc/windowing/wayland/WinSystemWayland.h -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include "Connection.h" - #include "Output.h" Index: head/multimedia/kodi-devel/pkg-plist =================================================================== --- head/multimedia/kodi-devel/pkg-plist (revision 467812) +++ head/multimedia/kodi-devel/pkg-plist (revision 467813) @@ -1,86 +1,85 @@ bin/TexturePacker bin/kodi 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 include/kodi/General.h include/kodi/IFileTypes.h include/kodi/Network.h include/kodi/StreamCodec.h include/kodi/StreamCrypto.h include/kodi/TimingConstants.h include/kodi/XBMC_vkeys.h -include/kodi/addon-instance/AudioDSP.h include/kodi/addon-instance/AudioDecoder.h include/kodi/addon-instance/AudioEncoder.h include/kodi/addon-instance/ImageDecoder.h include/kodi/addon-instance/Inputstream.h include/kodi/addon-instance/Peripheral.h include/kodi/addon-instance/PeripheralUtils.h include/kodi/addon-instance/Screensaver.h include/kodi/addon-instance/VFS.h include/kodi/addon-instance/VideoCodec.h include/kodi/addon-instance/Visualization.h include/kodi/gui/General.h include/kodi/gui/ListItem.h include/kodi/gui/Window.h include/kodi/gui/controls/Button.h include/kodi/gui/controls/Edit.h include/kodi/gui/controls/FadeLabel.h include/kodi/gui/controls/Image.h include/kodi/gui/controls/Label.h include/kodi/gui/controls/Progress.h include/kodi/gui/controls/RadioButton.h include/kodi/gui/controls/Rendering.h include/kodi/gui/controls/SettingsSlider.h include/kodi/gui/controls/Slider.h include/kodi/gui/controls/Spin.h include/kodi/gui/controls/TextBox.h include/kodi/gui/definitions.h include/kodi/gui/dialogs/ContextMenu.h include/kodi/gui/dialogs/ExtendedProgress.h include/kodi/gui/dialogs/FileBrowser.h include/kodi/gui/dialogs/Keyboard.h include/kodi/gui/dialogs/Numeric.h include/kodi/gui/dialogs/OK.h 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/kodi_game_dll.h include/kodi/kodi_game_types.h include/kodi/kodi_vfs_types.h include/kodi/libKODI_game.h include/kodi/libKODI_guilib.h include/kodi/libXBMC_addon.h include/kodi/libXBMC_pvr.h +include/kodi/platform/android/System.h include/kodi/tools/DllHelper.h include/kodi/versions.h include/kodi/xbmc_addon_dll.h include/kodi/xbmc_addon_types.h 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 lib/kodi/system/players/VideoPlayer/libdvdnav-%%ARCH%%-%%OPSYS%%.so man/man1/kodi.1.gz man/man1/kodi.bin.1.gz share/applications/kodi.desktop share/icons/hicolor/128x128/apps/kodi.png share/icons/hicolor/16x16/apps/kodi.png share/icons/hicolor/22x22/apps/kodi.png share/icons/hicolor/24x24/apps/kodi.png share/icons/hicolor/256x256/apps/kodi.png share/icons/hicolor/32x32/apps/kodi.png share/icons/hicolor/48x48/apps/kodi.png share/icons/hicolor/64x64/apps/kodi.png share/xsessions/kodi.desktop