[SCM] kodi/master: Refresh patches
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Fri Dec 23 16:37:29 UTC 2016
The following commit has been merged in the master branch:
commit 01d7efab1a584248bceb5caccafd7a58464357c9
Author: Balint Reczey <balint at balintreczey.hu>
Date: Fri Dec 23 16:51:31 2016 +0100
Refresh patches
diff --git a/debian/patches/0002-Revert-cec-fixup-strings-after-PR-10775.patch b/debian/patches/0002-Revert-cec-fixup-strings-after-PR-10775.patch
new file mode 100644
index 0000000..1c7e40f
--- /dev/null
+++ b/debian/patches/0002-Revert-cec-fixup-strings-after-PR-10775.patch
@@ -0,0 +1,35 @@
+From 8cb1e2106f8483dd1c261b36b55a68a3dd226fea Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Fri, 23 Dec 2016 16:41:34 +0100
+Subject: [PATCH] Revert "cec: fixup strings after PR 10775"
+
+This reverts commit 5d18eee26c799edb8be9b4898d30e2dd2fd075c8.
+---
+ system/peripherals.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/system/peripherals.xml b/system/peripherals.xml
+index d5704b2..ed707b6 100644
+--- a/system/peripherals.xml
++++ b/system/peripherals.xml
+@@ -16,7 +16,7 @@
+ <setting key="send_inactive_source" type="bool" value="1" label="36025" order="5" />
+ <setting key="cec_standby_screensaver" type="bool" value="0" label="36009" order="6" />
+ <setting key="cec_wake_screensaver" type="bool" value="1" label="36010" order="7" />
+- <setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="8" lvalues="36028|13005|13011|13009|36044|36045" />
++ <setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="8" lvalues="36028|13005|13011|13009|36044|36046" />
+ <setting key="standby_tv_on_pc_standby" type="bool" value="1" label="36026" order="9" />
+ <setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="10" />
+ <setting key="pause_playback_on_deactivate" type="bool" value="1" label="36033" configurable="0" />
+@@ -24,7 +24,7 @@
+ <setting key="connected_device" type="enum" label="36019" value="36037" lvalues="36037|36038" order="12" />
+ <setting key="cec_hdmi_port" type="int" value="1" min="1" max="15" label="36015" order="13" />
+ <setting key="physical_address" type="string" label="36021" value="0" order="14" />
+- <setting key="power_avr_on_as" type="bool" label="36046" value="0" order="15" />
++ <setting key="power_avr_on_as" type="bool" label="36045" value="0" order="15" />
+
+ <setting key="tv_vendor" type="int" value="0" configurable="0" />
+ <setting key="device_name" type="string" value="Kodi" configurable="0" />
+--
+2.1.4
+
diff --git a/debian/patches/0002-StringUtils-Fix-format-string.patch b/debian/patches/0002-StringUtils-Fix-format-string.patch
deleted file mode 100644
index 4a355be..0000000
--- a/debian/patches/0002-StringUtils-Fix-format-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 4be4fe4bf6b117576a239a474a53ae495dfcc73d Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Thu, 7 Jul 2016 00:51:53 +0200
-Subject: [PATCH 2/2] [StringUtils] Fix format string
-
----
- xbmc/utils/StringUtils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/xbmc/utils/StringUtils.cpp
-+++ b/xbmc/utils/StringUtils.cpp
-@@ -1316,7 +1316,7 @@
- {
- const std::array<std::string, 6> units{"B", "kB", "MB", "GB", "TB", "PB"};
- if (bytes < 1000)
-- return Format("%lluB", bytes);
-+ return Format("%"PRIu64"B", bytes);
-
- int i = 0;
- double value = static_cast<double>(bytes);
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 2f4856a..bc74c0c 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Allocate and free AVFrames with the proper FFmpeg API
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -1921,16 +1921,11 @@
+@@ -1922,16 +1922,11 @@
st->codec->skip_loop_filter = AVDISCARD_ALL;
// We are looking for an IDR frame
diff --git a/debian/patches/01_reproducible_build.patch b/debian/patches/01_reproducible_build.patch
index e2b15f7..3ccb47d 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
-@@ -523,7 +523,7 @@
+@@ -522,7 +522,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/04-differentiate-from-vanilla-Kodi.patch b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
index 460a9a6..da7d32a 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/xml/Home.xml
+++ b/addons/skin.estuary/xml/Home.xml
-@@ -941,6 +941,18 @@
+@@ -916,6 +916,18 @@
<param name="visible" value="Player.HasMedia" />
</include>
</control>
diff --git a/debian/patches/series b/debian/patches/series
index 337da1d..7543a4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
0001-c-pluff-Fix-format-string-warnings.patch
-0002-StringUtils-Fix-format-string.patch
+0002-Revert-cec-fixup-strings-after-PR-10775.patch
0003-Revert-droid-fix-builds-with-AML-disabled.patch
0004-Allocate-and-free-AVFrames-with-the-proper-FFmpeg-AP.patch
0005-Revert-cmake-Properly-find-correct-libcec-version.patch
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list