[SCM] kodi/master: Refresh patches

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Thu Dec 22 01:18:07 UTC 2016


The following commit has been merged in the master branch:
commit 8971058237dc80e3a1a622eb81fa8b1de70065a6
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Dec 14 16:57:46 2016 +0100

    Refresh patches

diff --git a/debian/patches/0002-StringUtils-Fix-format-string.patch b/debian/patches/0002-StringUtils-Fix-format-string.patch
index 8e36969..4a355be 100644
--- a/debian/patches/0002-StringUtils-Fix-format-string.patch
+++ b/debian/patches/0002-StringUtils-Fix-format-string.patch
@@ -7,11 +7,9 @@ Subject: [PATCH 2/2] [StringUtils] Fix format string
  xbmc/utils/StringUtils.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp
-index 197ae07..e5414a2 100644
 --- a/xbmc/utils/StringUtils.cpp
 +++ b/xbmc/utils/StringUtils.cpp
-@@ -1297,7 +1297,7 @@ std::string StringUtils::FormatFileSize(uint64_t bytes)
+@@ -1316,7 +1316,7 @@
  {
    const std::array<std::string, 6> units{"B", "kB", "MB", "GB", "TB", "PB"};
    if (bytes < 1000)
@@ -20,6 +18,3 @@ index 197ae07..e5414a2 100644
  
    int i = 0;
    double value = static_cast<double>(bytes);
--- 
-2.1.4
-
diff --git a/debian/patches/0003-Revert-droid-fix-builds-with-AML-disabled.patch b/debian/patches/0003-Revert-droid-fix-builds-with-AML-disabled.patch
index f0e7119..5c426ec 100644
--- a/debian/patches/0003-Revert-droid-fix-builds-with-AML-disabled.patch
+++ b/debian/patches/0003-Revert-droid-fix-builds-with-AML-disabled.patch
@@ -9,11 +9,9 @@ This reverts commit 4733383b8f1c1dd0b95e9e5358425d8a0b7ba8fc.
  xbmc/windowing/egl/EGLWrapper.cpp | 16 ++++++----------
  2 files changed, 6 insertions(+), 14 deletions(-)
 
-diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
-index 8f9107b..c0b4dff 100644
 --- a/xbmc/utils/SystemInfo.cpp
 +++ b/xbmc/utils/SystemInfo.cpp
-@@ -56,10 +56,8 @@
+@@ -57,10 +57,8 @@
  #include "utils/XMLUtils.h"
  #if defined(TARGET_ANDROID)
  #include "platform/android/jni/Build.h"
@@ -24,7 +22,7 @@ index 8f9107b..c0b4dff 100644
  
  /* Platform identification */
  #if defined(TARGET_DARWIN)
-@@ -870,11 +868,9 @@ bool CSysInfo::IsAeroDisabled()
+@@ -873,11 +871,9 @@
  bool CSysInfo::HasHW3DInterlaced()
  {
  #if defined(TARGET_ANDROID)
@@ -36,8 +34,6 @@ index 8f9107b..c0b4dff 100644
    return false;
  }
  
-diff --git a/xbmc/windowing/egl/EGLWrapper.cpp b/xbmc/windowing/egl/EGLWrapper.cpp
-index 30f5757..583d43a 100644
 --- a/xbmc/windowing/egl/EGLWrapper.cpp
 +++ b/xbmc/windowing/egl/EGLWrapper.cpp
 @@ -24,19 +24,15 @@
@@ -60,7 +56,7 @@ index 30f5757..583d43a 100644
  #include "EGLWrapper.h"
  
  #define CheckError() m_result = eglGetError(); if(m_result != EGL_SUCCESS) CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, m_result);
-@@ -91,15 +87,15 @@ bool CEGLWrapper::Initialize(const std::string &implementation)
+@@ -91,15 +87,15 @@
    // Try to create each backend in sequence and go with the first one
    // that we know will work
    if (
@@ -82,6 +78,3 @@ index 30f5757..583d43a 100644
        (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlogic>(implementation))
  #endif
        )
--- 
-2.1.4
-
diff --git a/debian/patches/0004-Allocate-and-free-AVFrames-with-the-proper-FFmpeg-AP.patch b/debian/patches/0004-Allocate-and-free-AVFrames-with-the-proper-FFmpeg-AP.patch
index c4b36bf..2f4856a 100644
--- a/debian/patches/0004-Allocate-and-free-AVFrames-with-the-proper-FFmpeg-AP.patch
+++ b/debian/patches/0004-Allocate-and-free-AVFrames-with-the-proper-FFmpeg-AP.patch
@@ -8,11 +8,9 @@ Subject: [PATCH] Allocate and free AVFrames with the proper FFmpeg API
  .../VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp   |  7 ++++---
  2 files changed, 7 insertions(+), 11 deletions(-)
 
-diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-index ebb8fce..cf03738 100644
 --- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
 +++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -1871,16 +1871,11 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPacket *pkt)
+@@ -1921,16 +1921,11 @@
      st->codec->skip_loop_filter = AVDISCARD_ALL;
  
      // We are looking for an IDR frame
@@ -32,11 +30,9 @@ index ebb8fce..cf03738 100644
    }
  }
  
-diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
-index 96a8e61..17d43be 100644
 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
 +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
-@@ -167,7 +167,7 @@ void CMMALPool::AlignedSize(AVCodecContext *avctx, uint32_t &width, uint32_t &he
+@@ -170,7 +170,7 @@
    if (!avctx)
      return;
    int w = width, h = height;
@@ -45,7 +41,7 @@ index 96a8e61..17d43be 100644
    int unaligned;
    int stride_align[AV_NUM_DATA_POINTERS];
  
-@@ -179,16 +179,17 @@ void CMMALPool::AlignedSize(AVCodecContext *avctx, uint32_t &width, uint32_t &he
+@@ -182,16 +182,17 @@
    do {
      // NOTE: do not align linesizes individually, this breaks e.g. assumptions
      // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
@@ -65,6 +61,3 @@ index 96a8e61..17d43be 100644
  }
  
  CMMALBuffer *CMMALPool::GetBuffer(uint32_t timeout)
--- 
-2.1.4
-
diff --git a/debian/patches/01_reproducible_build.patch b/debian/patches/01_reproducible_build.patch
index fe74a8d..e2b15f7 100644
--- a/debian/patches/01_reproducible_build.patch
+++ b/debian/patches/01_reproducible_build.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/xbmc/Application.cpp
 +++ b/xbmc/Application.cpp
-@@ -527,7 +527,7 @@
+@@ -523,7 +523,7 @@
  //  specialVersion = " (version for XXXX)";
  #endif
    CLog::Log(LOGNOTICE, "Using %s %s x%d build%s", buildType.c_str(), CSysInfo::GetAppName().c_str(), g_sysinfo.GetXbmcBitness(), specialVersion.c_str());
@@ -16,7 +16,7 @@ Forwarded: not-needed
  
 --- a/xbmc/utils/SystemInfo.cpp
 +++ b/xbmc/utils/SystemInfo.cpp
-@@ -1249,7 +1249,7 @@
+@@ -1252,7 +1252,7 @@
  
  std::string CSysInfo::GetBuildDate()
  {
diff --git a/debian/patches/04-differentiate-from-vanilla-Kodi.patch b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
index 3c2e63e..460a9a6 100644
--- a/debian/patches/04-differentiate-from-vanilla-Kodi.patch
+++ b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/utils/SystemInfo.cpp
 +++ b/xbmc/utils/SystemInfo.cpp
-@@ -74,6 +74,9 @@
+@@ -75,6 +75,9 @@
  #include <linux/version.h>
  #endif
  
@@ -10,7 +10,7 @@
  /* Expand macro before stringify */
  #define STR_MACRO(x) #x
  #define XSTR_MACRO(x) STR_MACRO(x)
-@@ -438,7 +441,7 @@
+@@ -441,7 +444,7 @@
  const std::string& CSysInfo::GetAppName(void)
  {
    assert(CCompileInfo::GetAppName() != NULL);
@@ -19,7 +19,7 @@
  
    return appName;
  }
-@@ -1086,7 +1089,9 @@
+@@ -1089,7 +1092,9 @@
    if (!result.empty())
      return result;
  
@@ -30,7 +30,7 @@
  #if defined(TARGET_WINDOWS)
    result += GetKernelName() + " " + GetKernelVersion();
    BOOL bIsWow = FALSE;
-@@ -1244,7 +1249,7 @@
+@@ -1247,7 +1252,7 @@
  
  std::string CSysInfo::GetVersion()
  {
@@ -50,11 +50,11 @@
    EXPECT_NE(std::string::npos, g_sysinfo.GetUserAgent().find('(')) << "'GetUserAgent()' must contain brackets around second parameter";
    EXPECT_NE(std::string::npos, g_sysinfo.GetUserAgent().find(')')) << "'GetUserAgent()' must contain brackets around second parameter";
    EXPECT_EQ(g_sysinfo.GetUserAgent().find(' '), g_sysinfo.GetUserAgent().find(" (")) << "Second parameter in 'GetUserAgent()' string must be in brackets";
---- a/addons/skin.estuary/1080i/Home.xml
-+++ b/addons/skin.estuary/1080i/Home.xml
-@@ -950,6 +950,18 @@
- 					<height>36</height>
- 					<texture>icons/logo-text.png</texture>
+--- a/addons/skin.estuary/xml/Home.xml
++++ b/addons/skin.estuary/xml/Home.xml
+@@ -941,6 +941,18 @@
+ 						<param name="visible" value="Player.HasMedia" />
+ 					</include>
  				</control>
 +		                <control type="image">
 +			          <description>LOGO2</description>
@@ -70,4 +70,4 @@
 +		                </control>
  			</control>
  			<include>BottomBar</include>
- 			<control type="group">
+ 			<include content="TopBar">
diff --git a/debian/patches/13-fix-tests.patch b/debian/patches/13-fix-tests.patch
index 13eb5be..d82a963 100644
--- a/debian/patches/13-fix-tests.patch
+++ b/debian/patches/13-fix-tests.patch
@@ -1,7 +1,7 @@
 --- a/xbmc/utils/test/TestSystemInfo.cpp
 +++ b/xbmc/utils/test/TestSystemInfo.cpp
 @@ -129,8 +129,8 @@
- TEST_F(TestSystemInfo, GetOsVersion)
+ TEST_F(TestSystemInfo, DISABLED_GetOsVersion)
  {
    EXPECT_FALSE(g_sysinfo.GetOsVersion().empty()) << "'GetOsVersion()' must not return empty string";
 -  EXPECT_STRNE("0.0.0", g_sysinfo.GetOsVersion().c_str()) << "'GetOsVersion()' must not return '0.0.0'";
diff --git a/debian/patches/14-ignore-test-results.patch b/debian/patches/14-ignore-test-results.patch
index 157d4a9..d180146 100644
--- a/debian/patches/14-ignore-test-results.patch
+++ b/debian/patches/14-ignore-test-results.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -605,7 +605,7 @@
+@@ -611,7 +611,7 @@
  
  ifeq (1, at GTEST_CONFIGURED@)
  check: testsuite

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list