svn commit: r482839 - in head/multimedia/kodi-devel: . files

[Tobias Kortkamp]

Author: tobik
Date: Tue Oct 23 14:16:15 2018
New Revision: 482839
URL: https://svnweb.freebsd.org/changeset/ports/482839

Log:
  Update multimedia/kodi-devel to 18.0b4

Added:
  head/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp   (contents, props changed)
  head/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h   (contents, props changed)
Modified:
  head/multimedia/kodi-devel/Makefile
  head/multimedia/kodi-devel/distinfo

Modified: head/multimedia/kodi-devel/Makefile
==============================================================================
--- head/multimedia/kodi-devel/Makefile	Tue Oct 23 13:48:04 2018	(r482838)
+++ head/multimedia/kodi-devel/Makefile	Tue Oct 23 14:16:15 2018	(r482839)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kodi
 CATEGORIES=	multimedia
-DISTVERSION=	18.0.g201810021630
+DISTVERSION=	18.0.g201810231420
 PKGNAMESUFFIX?=	-devel
 
 MAINTAINER=	tobik at FreeBSD.org
@@ -54,7 +54,7 @@ USES=		autoreconf:build cmake:outsource,noninja compil
 USE_GITHUB=	yes
 GH_ACCOUNT=	xbmc
 GH_PROJECT=	xbmc
-GH_TAGNAME=	18.0b3-Leia
+GH_TAGNAME=	18.0b4-Leia
 USE_GNOME=	libxslt libxml2
 USE_JAVA=	yes
 JAVA_BUILD=	yes

Modified: head/multimedia/kodi-devel/distinfo
==============================================================================
--- head/multimedia/kodi-devel/distinfo	Tue Oct 23 13:48:04 2018	(r482838)
+++ head/multimedia/kodi-devel/distinfo	Tue Oct 23 14:16:15 2018	(r482839)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1540298491
+SHA256 (xbmc-xbmc-18.0.g201810231420-18.0b4-Leia_GH0.tar.gz) = fbd04ed38b895e21bf1d7ed5d59d732ee7f1989d684fae7cbaf9c8ee3a52302f
+SIZE (xbmc-xbmc-18.0.g201810231420-18.0b4-Leia_GH0.tar.gz) = 50854754

Added: head/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp	Tue Oct 23 14:16:15 2018	(r482839)
@@ -0,0 +1,43 @@
+--- xbmc/windowing/gbm/VTUtils.cpp.orig	2018-10-23 13:12:16 UTC
++++ xbmc/windowing/gbm/VTUtils.cpp
+@@ -12,12 +12,14 @@
+ #include "utils/log.h"
+ #include "utils/StringUtils.h"
+ 
++#ifdef __linux__
+ #include <linux/major.h>
+ #include <linux/kd.h>
+ #include <linux/vt.h>
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ 
+ using namespace KODI::WINDOWING::GBM;
+ 
+@@ -26,13 +28,14 @@ bool CVTUtils::OpenTTY()
+   m_ttyDevice = ttyname(STDIN_FILENO);
+ 
+   m_fd.attach(open(m_ttyDevice.c_str(), O_RDWR | O_CLOEXEC));
+-  if (m_fd < 0)
++  if (static_cast<int>(m_fd) < 0)
+   {
+     CMessagePrinter::DisplayError(StringUtils::Format("ERROR: failed to open tty: %s",  m_ttyDevice));
+     CLog::Log(LOGERROR, "CVTUtils::%s - failed to open tty: %s", __FUNCTION__, m_ttyDevice);
+     return false;
+   }
+ 
++#ifdef __linux__
+   struct stat buf;
+   if (fstat(m_fd, &buf) == -1 || major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0)
+   {
+@@ -55,7 +58,7 @@ bool CVTUtils::OpenTTY()
+     CLog::Log(LOGERROR, "CVTUtils::%s - %s is already in graphics mode, is another display server running?", __FUNCTION__, m_ttyDevice);
+     return false;
+   }
+-
++#endif
+   CLog::Log(LOGNOTICE, "CVTUtils::%s - opened tty: %s", __FUNCTION__, m_ttyDevice.c_str());
+ 
+   return true;

Added: head/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h	Tue Oct 23 14:16:15 2018	(r482839)
@@ -0,0 +1,11 @@
+--- xbmc/windowing/gbm/VTUtils.h.orig	2018-10-23 13:18:04 UTC
++++ xbmc/windowing/gbm/VTUtils.h
+@@ -10,6 +10,8 @@
+ 
+ #include "platform/posix/utils/FileHandle.h"
+ 
++#include <string>
++
+ namespace KODI
+ {
+ namespace WINDOWING