Upstream has fixed the ALSA bug, so drop our workaround.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 12 insertions, 27 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/Manifest b/media-tv/xbmc/Manifest
index b9bb94483cfc..cc05b158ee9a 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xbmc-alsa-params.patch 887 RMD160 b60f92199d2deb31d7364806316ad1dbf7cd5673 SHA1 5d1b6d84279239479ddbec394912997d5976d574 SHA256 0c03c2d120f1cc69871d51da7909181959d82e3f91cc7fac60691fce83d13731
 AUX xbmc-fribidi.patch 1131 RMD160 bbadd725e5b11885201cffed2cc4f3cdeb04e4af SHA1 be4f94977dcabd02cc936199b573fad3db346930 SHA256 b6948f9fa236cd805dd2b92fa9861255598c6536de5278ce96c8005899336ea9
 AUX xbmc-readsector.patch 2697 RMD160 8fc7b7d5711b1b3a703ecf18920dfb4f75be9819 SHA1 db7925944f0d389037611df5af6593cba2c6ff4f SHA256 352e18bc1b4413e8f6df1dea2b88e0ee17115814fb92d7e4dbfba9820f0ee00c
-EBUILD xbmc-9999.ebuild 4029 RMD160 d09463b59b1d29255191d852bed103bc521ce8b3 SHA1 c154971a47275304e44b88ba65fb54bc52722b42 SHA256 fe6f906b6264b7d0ecde338acd2ba79564e8f51fb8e196484dad003457accb50
-MISC ChangeLog 808 RMD160 e70ac0e8a2324160334f8b989ea00eb9edd147e1 SHA1 c33cd092141ae912e248048321373f8ed82e88b8 SHA256 064bcdf616bd54d97a845c0d2ae80bfbf082160092fde0b79cfec61922a37c0e
+EBUILD xbmc-9999.ebuild 3983 RMD160 c3f7dc59f73160e03ca74be749bf6b3f26ca009a SHA1 b078226da1e20294051c919abfb6344b19ce2787 SHA256 afeb0bfa64170d5e81f4d464cb5da5442db83627e59a5e4dbe9df7a20991f327
+MISC ChangeLog 969 RMD160 36919994e98e538f758373dc3d2c5917635ac24c SHA1 ab39614b7f78807b274977af7e40082ed5be2bc8 SHA256 f8b6da3b9bfb00462547cbd4267983c908bea3c462cd182efd7a9baaad011c33
 MISC metadata.xml 157 RMD160 a117cbaa8eca6ed6c13ba7d3cc7b6c27a67dd250 SHA1 4f8829c9a4a3ef73a376090fa9fd72c967097d50 SHA256 c4d85708ef3c9ffffe5ca42f32642b89f8a9475e00602e7986f7032027e292d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmgbJYACgkQn/5bYzqsSmHSZgCbBIDNT03ZOO5VMKQ7aF19YSwj
-Y2kAoIe+kTs09HI1qIiBih9wFsO6lt21
-=zPyW
+iEYEARECAAYFAkmhrUcACgkQn/5bYzqsSmEsyQCdFf8F8TnOFeEo2BYjqyPi6cOa
+0D4Ani3s367o44xdyjzCwsZLOlzaD74S
+=cjE7
 -----END PGP SIGNATURE-----
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.