Author: mooninite Update of /cvs/free/rpms/xbmc/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9256 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-13.0-dbus-power.patch Log Message: * Wed May 14 2014 Michael Cronenworth <mike(a)cchtml.com&gt; - 13.1-0.1.beta1 - Update to 13.1 beta 1 xbmc-13.0-dbus-power.patch: LogindUPowerSyscall.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- NEW FILE xbmc-13.0-dbus-power.patch --- From: Pierre Ossman <pierre(a)ossman.eu&gt; Date: Mon, 12 May 2014 21:28:40 +0200 Subject: [PATCH] [linux] bad boolean type given to dbus --- xbmc/powermanagement/linux/LogindUPowerSyscall.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp index 37be5dd..5a97fe6 100644 --- a/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp +++ b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp @@ -225,10 +225,10 @@ bool CLogindUPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback) { if (dbus_message_is_signal(msg, "org.freedesktop.login1.Manager", "PrepareForSleep")) { - bool arg; + dbus_bool_t arg; // the boolean argument defines whether we are going to sleep (true) or just woke up (false) dbus_message_get_args(msg, NULL, DBUS_TYPE_BOOLEAN, &arg, DBUS_TYPE_INVALID); - CLog::Log(LOGDEBUG, "LogindUPowerSyscall: Received PrepareForSleep with arg %i", arg); + CLog::Log(LOGDEBUG, "LogindUPowerSyscall: Received PrepareForSleep with arg %i", (int)arg); if (arg) { callback->OnSleep(); -- 1.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 10 May 2014 22:53:59 -0000 1.28 +++ .cvsignore 15 May 2014 02:25:13 -0000 1.29 @@ -1 +1 @@ -xbmc-13.0-Gotham_r2-ge988513-patched.tar.xz +xbmc-13.1b1-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 10 May 2014 22:53:59 -0000 1.30 +++ sources 15 May 2014 02:25:13 -0000 1.31 @@ -1 +1 @@ -90f50ccc6923d4dbe7dc726cfcef5416 xbmc-13.0-Gotham_r2-ge988513-patched.tar.xz +0d3e1839fcca7a4566caa32032cb4423 xbmc-13.1b1-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xbmc-generate-tarball-xz.sh 10 May 2014 22:53:59 -0000 1.28 +++ xbmc-generate-tarball-xz.sh 15 May 2014 02:25:13 -0000 1.29 @@ -1,16 +1,16 @@ #!/bin/sh MAJORVERSION=13 -MINORVERSION=0 -GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 -GITSHORT=ge988513 -PRERELEASE=Gotham_r2 +MINORVERSION=1b1 +#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 +#GITSHORT=ge988513 +#PRERELEASE=Gotham VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}${GITSHORT:+-${GITSHORT}} -#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Gotham +GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Gotham #GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE -GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT +#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$GITCOMMIT # download zipball if [[ ! -f xbmc-$VERSION.zip ]]; then Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- xbmc.spec 10 May 2014 22:53:59 -0000 1.77 +++ xbmc.spec 15 May 2014 02:25:13 -0000 1.78 @@ -1,19 +1,19 @@ -#global PRERELEASE Gotham_rc1 -%global DIRVERSION %{version} -%global GITCOMMIT Gotham_r2-ge988513 +%global PRERELEASE b1 +#global DIRVERSION %{version} +#global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases -#global DIRVERSION %{version}-%{PRERELEASE} +%global DIRVERSION %{version}%{PRERELEASE} %global _hardened_build 1 Name: xbmc -Version: 13.0 -Release: 2%{?dist} +Version: 13.1 +Release: 0.1.beta1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ Group: Applications/Multimedia URL: http://www.xbmc.org/ -Source0: %{name}-%{DIRVERSION}-%{GITCOMMIT}-patched.tar.xz +Source0: %{name}-%{DIRVERSION}-patched.tar.xz # xbmc contains code that we cannot ship, as well as redundant private # copies of upstream libraries that we already distribute. Therefore # we use this script to remove the code before shipping it. @@ -36,6 +36,10 @@ # Set program version parameters Patch4: xbmc-13.0-versioning.patch +# Fix crash during suspend +# https://github.com/xbmc/xbmc/pull/4696 +Patch5: xbmc-13.0-dbus-power.patch + # External ffmpeg patches Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch @@ -234,12 +238,13 @@ %prep -%setup -q -n %{name}-%{DIRVERSION}-%{GITCOMMIT} +%setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch100 -p1 %patch101 -p1 @@ -384,6 +389,9 @@ %changelog +* Wed May 14 2014 Michael Cronenworth <mike(a)cchtml.com&gt; - 13.1-0.1.beta1 +- Update to 13.1 beta 1 + * Sat May 10 2014 Michael Cronenworth <mike(a)cchtml.com&gt; - 13.0-2 - Update to latest Gotham final branch (commit e988513) - Fixes for rtmp (RFBZ #3234)