From 70f39ab8505c16abeb2c9e80c16e7a52a762152a Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Sun, 4 Nov 2018 16:24:08 +0000 Subject: Update multimedia/kodi-devel to 18.0b5 --- multimedia/kodi-devel/Makefile | 4 +- multimedia/kodi-devel/distinfo | 6 +-- .../files/patch-xbmc_windowing_gbm_VTUtils.cpp | 43 ---------------------- .../files/patch-xbmc_windowing_gbm_VTUtils.h | 11 ------ 4 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp delete mode 100644 multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h (limited to 'multimedia/kodi-devel') diff --git a/multimedia/kodi-devel/Makefile b/multimedia/kodi-devel/Makefile index 9ad6ecb7e01d..e533ef23c56b 100644 --- a/multimedia/kodi-devel/Makefile +++ b/multimedia/kodi-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= kodi CATEGORIES= multimedia -DISTVERSION= 18.0.g201810231420 +DISTVERSION= 18.0.g201811032038 PKGNAMESUFFIX?= -devel MAINTAINER= tobik@FreeBSD.org @@ -54,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.0b4-Leia +GH_TAGNAME= 18.0b5-Leia USE_GNOME= libxslt libxml2 USE_JAVA= yes JAVA_BUILD= yes diff --git a/multimedia/kodi-devel/distinfo b/multimedia/kodi-devel/distinfo index 6ca32f2bb88b..ef5fc0f8baef 100644 --- a/multimedia/kodi-devel/distinfo +++ b/multimedia/kodi-devel/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1541321608 +SHA256 (xbmc-xbmc-18.0.g201811032038-18.0b5-Leia_GH0.tar.gz) = 7735bd346d3f1d62f8bd7a37cc5ad25b1fa16404c133e10e12995ac9d23d0161 +SIZE (xbmc-xbmc-18.0.g201811032038-18.0b5-Leia_GH0.tar.gz) = 50861823 diff --git a/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp b/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp deleted file mode 100644 index 6690c8cee72d..000000000000 --- a/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.cpp +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 - #include - #include -+#include -+#endif - #include - #include --#include - - 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(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; diff --git a/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h b/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h deleted file mode 100644 index 714fb12356b4..000000000000 --- a/multimedia/kodi-devel/files/patch-xbmc_windowing_gbm_VTUtils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -+ - namespace KODI - { - namespace WINDOWING -- cgit v1.2.3