fix use of deprecated alsa symbols, bug #226137

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

4 files changed, 132 insertions, 3 deletions

diff --git a/dev-tcltk/snack/ChangeLog b/dev-tcltk/snack/ChangeLog
index 406494c5079f..88ad70af59ba 100644
--- a/dev-tcltk/snack/ChangeLog
+++ b/dev-tcltk/snack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/snack
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.31 2008/08/08 16:55:30 armin76 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/ChangeLog,v 1.32 2009/05/26 12:05:56 mescalinum Exp $
+
+*snack-2.2.10-r2 (26 May 2009)
+
+  26 May 2009; Federico Ferri <mescalinum@gentoo.org>
+  +files/alsa-undef-sym.patch, +snack-2.2.10-r2.ebuild:
+  fix use of deprecated alsa symbols, bug #226137
 
   08 Aug 2008; Raúl Porcel <armin76@gentoo.org> snack-2.2.10-r1.ebuild:
   alpha/sparc/x86 stable
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index c9c0c74f270d..9b5d13bfe539 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -1,7 +1,9 @@
+AUX alsa-undef-sym.patch 1225 RMD160 6d8068bdad0a99e512f8c3a19e0b42ed3545433a SHA1 15865e0e304b094aff9de1fb1338faffc2fff8d8 SHA256 98ea274e8d6bd63e7ac785c65dcbd7d45fd7f904af974ffb3792c1b7917141f9
 DIST snack2.2.10.tar.gz 1798252 RMD160 52616bc4cf06baee0e5d7a91faa5b385ee60c7a7 SHA1 2c333fde061cf1cb7d5932c9cff4eb968c7d095a SHA256 4bfe764547ab92ba58f43b77366dbb7c7b3512d65a27cdbf9e585a9cb64ce81e
 DIST snack2.2.9.tar.gz 1792744 RMD160 9eeb8153e57db05c332e755f3f875b0aaccc85cf SHA1 666568b5b1c4f0b6aab873ef9b6b2fccc5ce0ae5 SHA256 620fc9a3f3bd9f3a386d64b465fcffc2030992cd7558bab3122b8929b7f4bf88
 EBUILD snack-2.2.10-r1.ebuild 1548 RMD160 769c984e6caa1d98725882dbc7c7b26bf6e2e1cc SHA1 0b6a386ece506e8f55b890421ee1e39476c0c6b4 SHA256 0f1096ac4397bef9a42cfd0cca64187e5f89595aad5c817fa4b1d75c58ec02b2
+EBUILD snack-2.2.10-r2.ebuild 1662 RMD160 197b3db1a3408fffd1b65426c21838f06bf42dfd SHA1 05e95c42b3ec29be903feea9184fb40c7c5856ef SHA256 2da6f0a4bac160baf7edeb60c9ccbc73d797198ac9af86b1bfa1189e8b3a6726
 EBUILD snack-2.2.10.ebuild 1314 RMD160 94979192313db37e4dd24dd850e680abc4949868 SHA1 64b1ea5c4fad347b8cc8d26e8960aaff46057743 SHA256 ba515b2eec434179ffddc58cb3bb29319ae81252aa565dca14bc03c3e6981e98
 EBUILD snack-2.2.9.ebuild 1289 RMD160 483d074867aeb4a7c5db0be677deb754cb67182d SHA1 dbdca805c68c3d5cc7b6c2c184dcaecac32d6f5b SHA256 ceec03d4ee5dab42ab6b1a9cb57365a4fcea55e38d1ea8e4c2763638820f8662
-MISC ChangeLog 3880 RMD160 ae21876d64c548ce442849be5231c4bdd66f8ec1 SHA1 e4ecb714fa037d42d3e8d76e367ed11e688a59e6 SHA256 813c9f587dc5cbeeb26584c13abe091bb8786b505a0b8bff40f7ecd22b2c6318
+MISC ChangeLog 4076 RMD160 ed79469cf8158a092a3f265858734b60cefa750a SHA1 e5efd49887c0fb63756608fd13d0630c4c9384b4 SHA256 5da3be17dd305bbe5164e037f1c0d52a935e511606daac15a91a15d32b54ef09
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff --git a/dev-tcltk/snack/files/alsa-undef-sym.patch b/dev-tcltk/snack/files/alsa-undef-sym.patch
new file mode 100644
index 000000000000..77a222754fe1
--- /dev/null
+++ b/dev-tcltk/snack/files/alsa-undef-sym.patch
@@ -0,0 +1,49 @@
+--- unix/jkAudIO_alsa.c   2005-12-14 12:29:38.000000000 +0100
++++ unix/jkAudIO_alsa.c   2008-09-01 22:51:20.000000000 +0200
+@@ -49,6 +49,8 @@
+ 
+ static int minNumChan = 1;
+ 
++static snd_pcm_uframes_t hw_bufsize = 0;
++
+ int
+ SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq,
+           int nchannels, int encoding)
+@@ -135,6 +137,9 @@
+     Tcl_AppendResult(interp, "Failed setting HW params.", NULL);
+     return TCL_ERROR;
+   }
++
++  snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize);
++
+   snd_pcm_hw_params_free(hw_params);
+   snd_pcm_prepare(A->handle);
+   if (A->mode == RECORD) {
+@@ -202,6 +207,8 @@
+   int i;
+   static char buf[64];
+ 
++  return;
++      
+   if (A->debug > 1) Snack_WriteLog("  Enter SnackAudioPost\n");
+ 
+   for (i = 0; i < 1000; i++) {
+@@ -267,12 +274,14 @@
+ long
+ SnackAudioPlayed(ADesc *A)
+ {
+-  long avail = _snd_pcm_mmap_hw_ptr(A->handle);
++  // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib
++  long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A));
++  // long avail = _snd_pcm_mmap_hw_ptr(A->handle);
+   
+-  if (avail < 0)
+-    avail = 0;
++  if (played < 0)
++   return 0;
+ 
+-  return (avail+A->nPlayed);
++  return (played);
+ }
+ 
+ void 
\ No newline at end of file
diff --git a/dev-tcltk/snack/snack-2.2.10-r2.ebuild b/dev-tcltk/snack/snack-2.2.10-r2.ebuild
new file mode 100644
index 000000000000..b7497d78d30d
--- /dev/null
+++ b/dev-tcltk/snack/snack-2.2.10-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r2.ebuild,v 1.1 2009/05/26 12:05:56 mescalinum Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="The Snack Sound Toolkit (Tcl)"
+HOMEPAGE="http://www.speech.kth.se/snack/"
+SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="alsa examples python threads vorbis"
+
+RESTRICT="test" # Bug 78354
+
+DEPEND=">dev-lang/tcl-8.4.3
+	>dev-lang/tk-8.4.3
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libvorbis )
+	python? ( virtual/python )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}/unix"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/alsa-undef-sym.patch
+}
+
+src_compile() {
+	local myconf="--libdir=/usr/$(get_libdir) --includedir=/usr/include"
+
+	use alsa && myconf="${myconf} --enable-alsa"
+	use threads && myconf="${myconf} --enable-threads"
+
+	if use vorbis ; then
+		myconf="${myconf} --with-ogg-include=/usr/include"
+		myconf="${myconf} --with-ogg-lib=/usr/$(get_libdir)"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use python ; then
+		cd "${S}"/../python
+		python setup.py install --root="${D}" || die
+	fi
+
+	cd "${S}"/..
+
+	dodoc README changes
+	dohtml doc/*
+
+	if use examples ; then
+		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
+		docinto examples/tcl
+		dodoc demos/tcl/*
+
+		if use python ; then
+			docinto examples/python
+			dodoc demos/python/*
+		fi
+	fi
+}