kodi: update to 18.4-Leia

This commit is contained in:
5schatten 2019-09-13 16:45:48 +02:00
parent 5095856941
commit c114f64b08
3 changed files with 6 additions and 102 deletions

View File

@ -14,20 +14,20 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
case $KODI_VENDOR in
raspberrypi)
PKG_VERSION="newclock5_18.3-Leia"
PKG_SHA256="7e7a89a66a1921b0fa32478277d11361b3c7a04aea88784bac668b300b182298"
PKG_VERSION="newclock5_18.4-Leia"
PKG_SHA256="2d3c864202a391dfe60b7eeade27a6ce1a9dfac2d0fc80add70cf5bd8318dadf"
PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
;;
rockchip)
PKG_VERSION="rockchip_18.3-Leia-v2"
PKG_SHA256="dfce13129aa8381a4e06cd6c0f597c6212f4230184723edf802d06ea20d5509b"
PKG_VERSION="rockchip_18.4-Leia"
PKG_SHA256="16a64493ba1c91f22064444970147b505e6d38d368012f4ea88c68c1416a2ef2"
PKG_URL="https://github.com/kwiboo/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
;;
*)
PKG_VERSION="18.3-Leia"
PKG_SHA256="4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc"
PKG_VERSION="18.4-Leia"
PKG_SHA256="bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110"
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
;;

View File

@ -1,24 +0,0 @@
commit 545ca6a2e8b3af40fba3e9786c7b7b677eb712d3
Author: afl1 <afl2001@gmail.com>
Date: Tue May 14 23:37:59 2019 +0200
Revert "fixed: We should always update stream details from player (fixes #15584)"
This reverts commit be1ed70fb4b926cbdaf60367172ac7902690f00f.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 1c4f5dfcd0..4b1550d1b9 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -3049,8 +3049,9 @@ void CApplication::OnPlayBackStarted(const CFileItem &file)
{
CLog::LogF(LOGDEBUG,"CApplication::OnPlayBackStarted");
- // Always update file item stream details
- m_appPlayer.SetUpdateStreamDetails();
+ // check if VideoPlayer should set file item stream details from its current streams
+ if (file.GetProperty("get_stream_details_from_player").asBoolean())
+ m_appPlayer.SetUpdateStreamDetails();
if (m_stackHelper.IsPlayingISOStack() || m_stackHelper.IsPlayingRegularStack())
m_itemCurrentFile.reset(new CFileItem(*m_stackHelper.GetRegisteredStack(file)));

View File

@ -1,72 +0,0 @@
From 9da95fb8a3c57fd7b8963f561a05d836edc2b601 Mon Sep 17 00:00:00 2001
From: Stefan Sichler <stsichler@web.de>
Date: Thu, 27 Jun 2019 09:07:12 +0200
Subject: [PATCH] LinuxRendererGLES: fixed memory leak, fixed segfault when
NV12 textures are in use, when (stride != width*bps) and GL_UNPACK_ROW_LENGTH
is not available
---
.../VideoRenderers/LinuxRendererGLES.cpp | 17 +++++++++++------
.../VideoRenderers/LinuxRendererGLES.h | 1 +
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
index 39e3866face4..c524a2ff6970 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp
@@ -289,11 +289,18 @@ void CLinuxRendererGLES::LoadPlane(CYuvPlane& plane, int type,
}
else
{
+ size_t planeSize = width * height * bps;
+ if (m_planeBufferSize < planeSize)
+ {
+ m_planeBuffer = static_cast<unsigned char*>(realloc(m_planeBuffer, planeSize));
+ m_planeBufferSize = planeSize;
+ }
+
unsigned char *src(static_cast<unsigned char*>(data)),
*dst(m_planeBuffer);
- for (unsigned int y = 0; y < height; ++y, src += stride, dst += width * bpp)
- memcpy(dst, src, width * bpp);
+ for (unsigned int y = 0; y < height; ++y, src += stride, dst += width * bps)
+ memcpy(dst, src, width * bps);
pixelData = m_planeBuffer;
}
@@ -1292,11 +1299,9 @@ bool CLinuxRendererGLES::CreateYV12Texture(int index)
im.planesize[1] = im.stride[1] * (im.height >> im.cshift_y);
im.planesize[2] = im.stride[2] * (im.height >> im.cshift_y);
- m_planeBuffer = static_cast<unsigned char*>(realloc(m_planeBuffer, m_sourceHeight * m_sourceWidth * im.bpp));
-
for (int i = 0; i < 3; i++)
{
- im.plane[i] = new uint8_t[im.planesize[i]];
+ im.plane[i] = nullptr; // will be set in UploadTexture()
}
for(int f = 0; f < MAX_FIELDS; f++)
@@ -1459,7 +1464,7 @@ bool CLinuxRendererGLES::CreateNV12Texture(int index)
for (int i = 0; i < 2; i++)
{
- im.plane[i] = new uint8_t[im.planesize[i]];
+ im.plane[i] = nullptr; // will be set in UploadTexture()
}
for(int f = 0; f < MAX_FIELDS; f++)
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
index b0f53705d20e..ecb4a9f8c72c 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h
@@ -203,6 +203,7 @@ class CLinuxRendererGLES : public CBaseRenderer
AVColorPrimaries m_srcPrimaries;
bool m_toneMap = false;
unsigned char* m_planeBuffer = nullptr;
+ size_t m_planeBufferSize = 0;
// clear colour for "black" bars
float m_clearColour{0.0f};