Bug#771804: unblock: xbmc/2:13.2+dfsg1-4
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Dear Release Team,
Please unblock xbmc to let it migrate to Jessie.
The update contains only two fixes for important bugs and one minor
source cleaning change which does not affect the built binaries:
Changes:
xbmc (2:13.2+dfsg1-4) unstable; urgency=medium
.
* Version check is now removed from source, no need to remove it
during the build
* Fix suspend/hibernate with upower >= 0.99.1 (Closes: #767161)
* Fix random failure in playing video using VDPAU (Closes: #742896)
Thanks:
Balint
diff -Nru xbmc-13.2+dfsg1/debian/changelog xbmc-13.2+dfsg1/debian/changelog
--- xbmc-13.2+dfsg1/debian/changelog 2014-10-25 00:40:28.000000000 +0200
+++ xbmc-13.2+dfsg1/debian/changelog 2014-11-08 00:05:40.000000000 +0100
@@ -1,3 +1,11 @@
+xbmc (2:13.2+dfsg1-4) unstable; urgency=medium
+
+ * Version check is now removed from source, no need to remove it during the build
+ * Fix suspend/hibernate with upower >= 0.99.1 (Closes: #767161)
+ * Fix random failure in playing video using VDPAU (Closes: #742896)
+
+ -- Balint Reczey <balint@balintreczey.hu> Fri, 07 Nov 2014 23:52:10 +0100
+
xbmc (2:13.2+dfsg1-3) unstable; urgency=medium
[ Balint Reczey ]
diff -Nru xbmc-13.2+dfsg1/debian/patches/0017-libav-Fix-uninitialized-read.patch xbmc-13.2+dfsg1/debian/patches/0017-libav-Fix-uninitialized-read.patch
--- xbmc-13.2+dfsg1/debian/patches/0017-libav-Fix-uninitialized-read.patch 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-13.2+dfsg1/debian/patches/0017-libav-Fix-uninitialized-read.patch 2014-11-08 00:05:40.000000000 +0100
@@ -0,0 +1,26 @@
+From 414522d5049a230e71a2c2fef45a6b525d6a9803 Mon Sep 17 00:00:00 2001
+From: Anton Khirnov <anton@khirnov.net>
+Date: Sun, 26 Oct 2014 18:29:48 +0100
+Subject: [PATCH] Fix uninitialized read.
+
+---
+ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+index 932985a..9d90a9c 100644
+--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+@@ -1095,9 +1095,6 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame)
+
+ CSingleLock lock(m_DecoderSection);
+
+- if (m_DecoderError && pFrame)
+- return VC_ERROR;
+-
+ if (!m_vdpauConfigured)
+ return VC_ERROR;
+
+--
+2.0.0.rc2
+
diff -Nru xbmc-13.2+dfsg1/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch xbmc-13.2+dfsg1/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
--- xbmc-13.2+dfsg1/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-13.2+dfsg1/debian/patches/0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch 2014-11-08 00:05:40.000000000 +0100
@@ -0,0 +1,30 @@
+From c6ae8568b99785465d1461c8878cdee08ff44eae Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint@balintreczey.hu>
+Date: Tue, 4 Nov 2014 00:13:21 +0100
+Subject: [PATCH] linux: Check for Logind first, then *Kit-s with UPower when
+ detecting PM framework
+
+Logind is the most likely candidate to work nowadays and latest UPower does
+not provide suspend/hibernate API.
+---
+ xbmc/powermanagement/PowerManager.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/xbmc/powermanagement/PowerManager.cpp
++++ b/xbmc/powermanagement/PowerManager.cpp
+@@ -78,12 +78,12 @@
+ m_instance = new CAndroidPowerSyscall();
+ #elif defined(TARGET_POSIX)
+ #if defined(HAS_DBUS)
+- if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
++ if (CLogindUPowerSyscall::HasLogind())
++ m_instance = new CLogindUPowerSyscall();
++ else if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
+ m_instance = new CConsoleUPowerSyscall();
+ else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
+ m_instance = new CConsoleDeviceKitPowerSyscall();
+- else if (CLogindUPowerSyscall::HasLogind())
+- m_instance = new CLogindUPowerSyscall();
+ else if (CUPowerSyscall::HasUPower())
+ m_instance = new CUPowerSyscall();
+ #if defined(HAS_HAL)
diff -Nru xbmc-13.2+dfsg1/debian/patches/series xbmc-13.2+dfsg1/debian/patches/series
--- xbmc-13.2+dfsg1/debian/patches/series 2014-10-25 00:40:28.000000000 +0200
+++ xbmc-13.2+dfsg1/debian/patches/series 2014-11-08 00:05:40.000000000 +0100
@@ -11,6 +11,8 @@
0013-mips-Add-configure-option-for-mips-and-mipsel.patch
0014-mips-Don-t-use-ASM-round-and-truncate-on-MIPS.patch
0016-mips-Fix-build-with-using-OpenGL-rendering.patch
+0017-libav-Fix-uninitialized-read.patch
+0018-linux-Check-for-Logind-first-then-Kit-s-with-UPower-.patch
03-privacy.patch
04-differentiate-from-vanilla-XBMC.patch
05-Fix-GLES-with-X11.patch
@@ -19,3 +21,4 @@
08-armel.patch
09-use-correct-ftgl.h
11-fix-vdpau-include.patch
+
diff -Nru xbmc-13.2+dfsg1/debian/rules xbmc-13.2+dfsg1/debian/rules
--- xbmc-13.2+dfsg1/debian/rules 2014-10-25 00:40:28.000000000 +0200
+++ xbmc-13.2+dfsg1/debian/rules 2014-11-08 00:05:40.000000000 +0100
@@ -109,7 +109,6 @@
override_dh_auto_configure: configure
sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
- -rm -r addons/service.xbmc.versioncheck
mkdir -p xbmc/visualizations/XBMCProjectM/libprojectM/fonts
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
Reply to: