diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-02-22 19:53:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-22 19:53:37 +0000 |
| commit | 5bb80e2a7aff85c8767376cdf56b40dd6d5acf5a (patch) | |
| tree | afc501a7f54a97fe3a61532b6761855727ef686c /media-tv/xbmc | |
| parent | Simple url fix for bug #259769 (diff) | |
| download | gentoo-2-5bb80e2a7aff85c8767376cdf56b40dd6d5acf5a.tar.gz gentoo-2-5bb80e2a7aff85c8767376cdf56b40dd6d5acf5a.tar.bz2 gentoo-2-5bb80e2a7aff85c8767376cdf56b40dd6d5acf5a.zip | |
Upstream has fixed the ALSA bug, so drop our workaround.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/xbmc')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-alsa-params.patch | 17 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 3 |
3 files changed, 6 insertions, 20 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 862b8585179b..7c6eea3e27c7 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.3 2009/02/21 21:05:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.4 2009/02/22 19:53:37 vapier Exp $ + + 22 Feb 2009; Mike Frysinger <vapier@gentoo.org> + -files/xbmc-alsa-params.patch, xbmc-9999.ebuild: + Upstream has fixed the ALSA bug, so drop our workaround. 21 Feb 2009; Mike Frysinger <vapier@gentoo.org> -files/xbmc-noexec.patch, xbmc-9999.ebuild: diff --git a/media-tv/xbmc/files/xbmc-alsa-params.patch b/media-tv/xbmc/files/xbmc-alsa-params.patch deleted file mode 100644 index a15a4b95474a..000000000000 --- a/media-tv/xbmc/files/xbmc-alsa-params.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://xbmc.org/trac/ticket/5946 -http://xbmc.org/forum/archive/index.php/t-29076.html - -we cannot call snd_pcm_bytes_to_frames() as it requires the hw_params to be -committed via snd_pcm_hw_params() as that is what sets up pcm->frame_bits - ---- XBMC/xbmc/cores/AudioRenderers/ALSADirectSound.cpp -+++ XBMC/xbmc/cores/AudioRenderers/ALSADirectSound.cpp -@@ -200,7 +200,7 @@ - nErr = snd_pcm_hw_params_set_period_size_near(m_pPlayHandle, hw_params, &m_maxFrames, 0); - CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_period_size",nErr); - -- m_BufferSize = snd_pcm_bytes_to_frames(m_pPlayHandle,m_dwPacketSize * 10); // buffer big enough - but not too big... -+ m_BufferSize = m_dwPacketSize * 10; // buffer big enough - but not too big... - nErr = snd_pcm_hw_params_set_buffer_size_near(m_pPlayHandle, hw_params, &m_BufferSize); - CHECK_ALSA_RETURN(LOGERROR,"hw_params_set_buffer_size",nErr); - diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index 4d83d5c01c09..7617cc460ba2 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.4 2009/02/21 21:05:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.5 2009/02/22 19:53:37 vapier Exp $ # XXX: be nice to split out packages that come bundled and use the # system libraries ... @@ -89,7 +89,6 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-readsector.patch epatch "${FILESDIR}"/${PN}-fribidi.patch - epatch "${FILESDIR}"/${PN}-alsa-params.patch # Fix XBMC's final version string showing as "exported" # instead of the SVN revision number. Also cleanup flags. |