[SCM] kodi/experimental: Refresh patches

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Fri Oct 7 08:49:19 UTC 2016


The following commit has been merged in the experimental branch:
commit bcb4d73e35070d828c7a2e881dc00988bcac12e3
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu Oct 6 22:32:52 2016 +0200

    Refresh patches

diff --git a/debian/patches/01_reproducible_build.patch b/debian/patches/01_reproducible_build.patch
index 7958bbd..07e13bd 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
-@@ -526,7 +526,7 @@
+@@ -531,7 +531,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());
diff --git a/debian/patches/02_allow_all_arches.patch b/debian/patches/02_allow_all_arches.patch
index ac4c2e0..5b9d32b 100644
--- a/debian/patches/02_allow_all_arches.patch
+++ b/debian/patches/02_allow_all_arches.patch
@@ -13,7 +13,7 @@ entering uncharted territory.
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -662,7 +662,8 @@
+@@ -654,7 +654,8 @@
       USE_STATIC_FFMPEG=1
       ;;
    *)
diff --git a/debian/patches/04-differentiate-from-vanilla-Kodi.patch b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
index 0130967..42b93d9 100644
--- a/debian/patches/04-differentiate-from-vanilla-Kodi.patch
+++ b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
@@ -52,7 +52,7 @@
    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
-@@ -847,6 +847,18 @@
+@@ -948,6 +948,18 @@
  					<height>36</height>
  					<texture>icons/logo-text.png</texture>
  				</control>
diff --git a/debian/patches/05-dont-require-neon-on-arm-armhf.patch b/debian/patches/05-dont-require-neon-on-arm-armhf.patch
index 73772a8..0f6311d 100644
--- a/debian/patches/05-dont-require-neon-on-arm-armhf.patch
+++ b/debian/patches/05-dont-require-neon-on-arm-armhf.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -624,7 +624,7 @@
+@@ -616,7 +616,7 @@
       CORE_SYSTEM_NAME=linux
       ARCH="arm"
       use_arch="arm"
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 9293d26..f41a8d2 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
  all: $(BOOTSTRAP_TARGETS)
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2382,18 +2382,11 @@
+@@ -2384,18 +2384,11 @@
  ], [0])
  
  XB_CONFIG_MODULE([lib/gtest], [
diff --git a/debian/patches/08-fix-s390x-build.patch b/debian/patches/08-fix-s390x-build.patch
index 9400113..4b88971 100644
--- a/debian/patches/08-fix-s390x-build.patch
+++ b/debian/patches/08-fix-s390x-build.patch
@@ -61,7 +61,7 @@ Forwarded: not-needed
  long AtomicIncrement(volatile long* pAddr);
 --- a/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
 +++ b/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h
-@@ -295,7 +295,7 @@
+@@ -293,7 +293,7 @@
  
  
  inline int NP2( unsigned x ) {
diff --git a/debian/patches/10-dont-use-omitted-files.patch b/debian/patches/10-dont-use-omitted-files.patch
index e207b73..8571996 100644
--- a/debian/patches/10-dont-use-omitted-files.patch
+++ b/debian/patches/10-dont-use-omitted-files.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2198,7 +2198,6 @@
+@@ -2197,7 +2197,6 @@
      tools/Linux/kodi-standalone.sh \
      tools/Linux/kodi-xsession.desktop \
      tools/EventClients/Makefile \
diff --git a/debian/patches/12-build-cpluff-pic-only.patch b/debian/patches/12-build-cpluff-pic-only.patch
index 2bad2d0..4701a2d 100644
--- a/debian/patches/12-build-cpluff-pic-only.patch
+++ b/debian/patches/12-build-cpluff-pic-only.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2376,7 +2376,7 @@
+@@ -2378,7 +2378,7 @@
      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
      --host=$host_alias \
      --build=$build_alias \
diff --git a/debian/patches/14-ignore-test-results.patch b/debian/patches/14-ignore-test-results.patch
index 160e102..157d4a9 100644
--- a/debian/patches/14-ignore-test-results.patch
+++ b/debian/patches/14-ignore-test-results.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index 957fb92..58c9a51 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -597,7 +597,7 @@ clean-externals: clean-codecs clean-eventclients clean-libs \
+@@ -605,7 +605,7 @@
  
  ifeq (1, at GTEST_CONFIGURED@)
  check: testsuite

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list