Author: ktdreyer Update of /cvs/free/rpms/xbmc/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24017 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc-pvr-addons-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-12.0-fix-crash-on-player-stop.patch xbmc-12.0-fix-pa-buffer-overruns.patch Log Message: * Thu Apr 25 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.1-2 - Add patches for PA (https://github.com/xbmc/xbmc/pull/2240). Fixes #2655 * Wed Apr 24 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.1-1 - Update to Frodo 12.1 - Update PVR addons snapshot to match snapshot bundled in 12.1 xbmc-12.0-fix-crash-on-player-stop.patch: PulseAEStream.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- NEW FILE xbmc-12.0-fix-crash-on-player-stop.patch --- From: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Thu, 14 Feb 2013 21:26:23 -0600 Subject: [PATCH 1/2] AE: Pulse Audio fix crash on player stop. PA is calling back functions on stream destruction and may try to read a free'd stream variable. (trac bug 13903) Signed-off-by: Michael Cronenworth <mike(a)cchtml.com&gt; --- xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp index 2322b47..f80d4d8 100644 --- a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp +++ b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp @@ -252,6 +252,10 @@ void CPulseAEStream::Destroy() if (m_Stream) { + pa_stream_set_state_callback(m_Stream, NULL, NULL); + pa_stream_set_write_callback(m_Stream, NULL, NULL); + pa_stream_set_latency_update_callback(m_Stream, NULL, NULL); + pa_stream_set_underflow_callback(m_Stream, NULL, NULL); pa_stream_disconnect(m_Stream); pa_stream_unref(m_Stream); m_Stream = NULL; -- 1.7.11.7 xbmc-12.0-fix-pa-buffer-overruns.patch: PulseAEStream.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- NEW FILE xbmc-12.0-fix-pa-buffer-overruns.patch --- From: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Thu, 14 Feb 2013 22:45:26 -0600 Subject: [PATCH 2/2] AE: Pulse Audio fix buffer underruns. The cache buffer size was being initialized to the write size of a PA stream, which is not the buffer size of the PA server. The cache buffer size will now use the PA server buffer size. (trac bug 13902) Signed-off-by: Michael Cronenworth <mike(a)cchtml.com&gt; --- xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp index f80d4d8..c3c34f2 100644 --- a/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp +++ b/xbmc/cores/AudioEngine/Engines/PulseAE/PulseAEStream.cpp @@ -203,7 +203,9 @@ CPulseAEStream::CPulseAEStream(pa_context *context, pa_threaded_mainloop *mainLo return /*false*/; } - m_cacheSize = pa_stream_writable_size(m_Stream); + const pa_buffer_attr *streamBuffer; + streamBuffer = pa_stream_get_buffer_attr(m_Stream); + m_cacheSize = streamBuffer->maxlength; pa_threaded_mainloop_unlock(m_MainLoop); -- 1.7.11.7 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 6 Feb 2013 01:42:18 -0000 1.17 +++ .cvsignore 27 Apr 2013 19:24:34 -0000 1.18 @@ -1,2 +1,2 @@ -xbmc-12.0-patched.tar.xz -xbmc-pvr-addons-96774c4-patched.tar.xz +xbmc-12.1-patched.tar.xz +xbmc-pvr-addons-590f862-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 6 Feb 2013 01:42:20 -0000 1.20 +++ sources 27 Apr 2013 19:24:35 -0000 1.21 @@ -1,2 +1,2 @@ -1c926423413b66d1746a409ce4970d28 xbmc-12.0-patched.tar.xz -6a5a34c9bb98c1743ac9c7906fbbb2c1 xbmc-pvr-addons-96774c4-patched.tar.xz +2823cb9a9a1a5b2d9bcbbf6b091a8236 xbmc-12.1-patched.tar.xz +1b1b6234d0167e1743991ce38c6f8bf7 xbmc-pvr-addons-590f862-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-generate-tarball-xz.sh,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xbmc-generate-tarball-xz.sh 6 Feb 2013 01:42:20 -0000 1.18 +++ xbmc-generate-tarball-xz.sh 27 Apr 2013 19:24:35 -0000 1.19 @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=12 -MINORVERSION=0 +MINORVERSION=1 #PRERELEASE=Frodo_rc3 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} @@ -15,7 +15,7 @@ fi # extract zipball -rm -r xbmc-xbmc-* +rm -rf xbmc-xbmc-* unzip xbmc-$VERSION.zip # Repair GitHub's odd auto-generated top-level directory... Index: xbmc-pvr-addons-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc-pvr-addons-generate-tarball-xz.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xbmc-pvr-addons-generate-tarball-xz.sh 6 Feb 2013 01:42:21 -0000 1.3 +++ xbmc-pvr-addons-generate-tarball-xz.sh 27 Apr 2013 19:24:35 -0000 1.4 @@ -9,7 +9,7 @@ # xbmc-pvr-addons. Let's try using the same hash that upstream uses. It # can be found in the source tree like so: # grep ^VERSION tools/darwin/depends/xbmc-pvr-addons/Makefile -COMMIT=96774c4f775b156a46fb58151379dece3e773c96 +COMMIT=590f862065d0f07d399fe4443a72dc37394becb4 GITHASH=${COMMIT:0:7} GITHUBURL=https://github.com/opdenkamp/xbmc-pvr-addons/archive/$GITHASH.zip Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-18/xbmc.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- xbmc.spec 6 Feb 2013 01:42:21 -0000 1.57 +++ xbmc.spec 27 Apr 2013 19:24:35 -0000 1.58 @@ -4,8 +4,8 @@ #global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc -Version: 12.0 -Release: 1%{?dist} +Version: 12.1 +Release: 2%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -20,7 +20,7 @@ Source1: xbmc-generate-tarball-xz.sh # xbmc pvr addons are shipped as a separate git repo. -Source2: xbmc-pvr-addons-96774c4-patched.tar.xz +Source2: xbmc-pvr-addons-590f862-patched.tar.xz Source3: xbmc-pvr-addons-generate-tarball-xz.sh # https://github.com/xbmc/xbmc/pull/1725.patch @@ -42,6 +42,12 @@ # functionality, needs to be able fallback internal version Patch4: xbmc-12.0-hdhomerun.patch +# Add better support for PA. +# These patches are upstream in https://github.com/xbmc/xbmc/pull/2240, but +# they are not in the Frodo (12.x) branch. +Patch5: xbmc-12.0-fix-crash-on-player-stop.patch +Patch6: xbmc-12.0-fix-pa-buffer-overruns.patch + # Optional deps (not in EPEL) # (libbluray in EPEL 6 is too old.) %{?fedora:%global _with_hdhomerun 1} @@ -332,6 +338,13 @@ #%%{_includedir}/xbmc/xbmcclient.h %changelog +* Thu Apr 25 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.1-2 +- Add patches for PA (https://github.com/xbmc/xbmc/pull/2240). Fixes #2655 + +* Wed Apr 24 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.1-1 +- Update to Frodo 12.1 +- Update PVR addons snapshot to match snapshot bundled in 12.1 + * Tue Feb 05 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 12.0-1 - Update to Frodo final - Add libcec dependency