Add patch to void crashing on cleanup, thanks to Matthias Langer for the help testing in bug #125479.

(Portage version: 2.1_pre7-r5)

5 files changed, 117 insertions, 11 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 1cf1b0e2186d..cdbe03554be8 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.42 2006/03/10 22:07:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.43 2006/04/20 16:42:17 flameeyes Exp $
+
+*alsaplayer-0.99.76-r3 (20 Apr 2006)
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsaplayer-0.99.76-join-null-thread.patch,
+  +alsaplayer-0.99.76-r3.ebuild:
+  Add patch to void crashing on cleanup, thanks to Matthias Langer for the
+  help testing in bug #125479.
 
   10 Mar 2006; Aron Griffis <agriffis@gentoo.org>
   alsaplayer-0.99.76-r2.ebuild:
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 408924729dff..d7ecda797602 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0f4de21e611a6098c23640cdc976ee69 ChangeLog 7034
 RMD160 0da1fa5352785e8efaeee8bec0628c6dfb6e6c2a ChangeLog 7034
 SHA256 6aa6eb21320d485083dc7a8c002cdcaf359d83b8bf6501f3a802b55db0d2a204 ChangeLog 7034
@@ -10,9 +7,15 @@ SHA256 421c43b16e01158b1b21724dbc046818360e485eb2d8e8fb94de9887f729a3b8 alsaplay
 MD5 ed53143ce5c2ee9a838121fe5f3dba40 alsaplayer-0.99.76-r2.ebuild 1984
 RMD160 c88607133e1eabd9c178250f688c32c6980baf5a alsaplayer-0.99.76-r2.ebuild 1984
 SHA256 e59f3319f1e70d8575bab8783470f95c7fb82eadeab109c9fd5f0cbe6aaec1fc alsaplayer-0.99.76-r2.ebuild 1984
+MD5 3b77aaa19f276412420550eab1d85392 alsaplayer-0.99.76-r3.ebuild 2036
+RMD160 e2eb17d3b75429b3f9ba7edc3ecf46e39238e098 alsaplayer-0.99.76-r3.ebuild 2036
+SHA256 92f06da0a8b9768692ed2521d79edfbdcdbe54c84b4e2517ad7d43c95139828e alsaplayer-0.99.76-r3.ebuild 2036
 MD5 1cc0f259b38ece5e3505dfd10a301ad5 alsaplayer-0.99.76.ebuild 1591
 RMD160 a88ba053d89059abb71a4cf5555865db07cd3429 alsaplayer-0.99.76.ebuild 1591
 SHA256 a30e9eb74eefa21eb18ad290085c76fb18abba23ccb618ae06db69a66df2d40c alsaplayer-0.99.76.ebuild 1591
+MD5 91839b065ffbc9ecf2b5e01ce8b05223 files/alsaplayer-0.99.76-join-null-thread.patch 403
+RMD160 3c52425ce11b59a380ebef93dd930ed6ba6c4aa3 files/alsaplayer-0.99.76-join-null-thread.patch 403
+SHA256 2a2aa08401ce9670e339d375e25b62eebc337c4a4c3996b83c0a48fe90e4ce25 files/alsaplayer-0.99.76-join-null-thread.patch 403
 MD5 4d1180a1109044fb119335839a357f95 files/alsaplayer-endian.patch 1143
 RMD160 23bdea0124ec79ab5cdd2e39303a12563d2769d6 files/alsaplayer-endian.patch 1143
 SHA256 4f413733e131c1da74f00f559db173c8adcc7d6c9fc870d96e88a586c53e682d files/alsaplayer-endian.patch 1143
@@ -25,13 +28,9 @@ SHA256 9da9b7922fce81b06ce833158e7bcdcd20c662086819288591fe648cee26735a files/di
 MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76-r2 71
 RMD160 12be3dc8de071b323342e84140a2ddffdda5dbd7 files/digest-alsaplayer-0.99.76-r2 71
 SHA256 9da9b7922fce81b06ce833158e7bcdcd20c662086819288591fe648cee26735a files/digest-alsaplayer-0.99.76-r2 71
+MD5 cbd10b94d3cb898c38d73170c7921682 files/digest-alsaplayer-0.99.76-r3 259
+RMD160 2d2012549d5c0b8ed56024fba9c8f819d6bfa13d files/digest-alsaplayer-0.99.76-r3 259
+SHA256 27c3e62bf65642d84df1ac006aafe8784874e1f126aa7c4ec5489ae4dd7f0862 files/digest-alsaplayer-0.99.76-r3 259
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEEfjEJrHF4yAQTrARAreJAJ4onozqult7hxVIrWRZWtIRYfRILACdEd5g
-u5gXEekxhlkVK1oSm3jFyIg=
-=d60E
------END PGP SIGNATURE-----
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild
new file mode 100644
index 000000000000..06fef2e75fc7
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r3.ebuild,v 1.1 2006/04/20 16:42:17 flameeyes Exp $
+
+inherit eutils
+
+DESCRIPTION="Media player primarily utilising ALSA"
+HOMEPAGE="http://www.alsaplayer.org/"
+SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="alsa audiofile doc esd flac jack mikmod nas nls ogg opengl oss vorbis xosd"
+
+RDEPEND=">=dev-libs/glib-1.2.10
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	esd? ( media-sound/esound )
+	flac? ( media-libs/flac )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
+	mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	nas? ( media-libs/nas )
+	ogg? ( media-libs/libogg )
+	opengl? ( virtual/opengl )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use ppc; then
+		epatch ${FILESDIR}/alsaplayer-endian.patch
+	fi
+
+	epatch "${FILESDIR}/${P}-join-null-thread.patch"
+}
+
+src_compile() {
+	export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include"
+
+	use xosd ||
+		export ac_cv_lib_xosd_xosd_create="no"
+
+	use doc ||
+		export ac_cv_prog_HAVE_DOXYGEN="false"
+
+	if use ogg && use flac; then
+		myconf="${myconf} --enable-oggflac"
+	fi
+
+	econf \
+		$(use_enable audiofile) \
+		$(use_enable esd) \
+		$(use_enable flac) \
+		$(use_enable jack) \
+		$(use_enable mikmod) \
+		$(use_enable nas) \
+		$(use_enable opengl) \
+		$(use_enable oss) \
+		$(use_enable nls) \
+		$(use_enable sparc) \
+		$(use_enable vorbis oggvorbis) \
+		${myconf} \
+		--disable-gtk \
+		--disable-sgi --disable-dependency-tracking
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install \
+		|| die "make install failed"
+
+	dodoc AUTHORS ChangeLog README TODO
+	dodoc docs/wishlist.txt
+}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.76-join-null-thread.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.76-join-null-thread.patch
new file mode 100644
index 000000000000..39e3cf20e88b
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.76-join-null-thread.patch
@@ -0,0 +1,13 @@
+Index: alsaplayer-0.99.76/app/AlsaNode.cpp
+===================================================================
+--- alsaplayer-0.99.76.orig/app/AlsaNode.cpp
++++ alsaplayer-0.99.76/app/AlsaNode.cpp
+@@ -473,7 +473,7 @@ void AlsaNode::StopStreaming()
+ 	}	
+ 	
+ 	looping = false;
+-	if (pthread_join(looper_thread, NULL)) {
++	if (looper_thread != NULL && pthread_join(looper_thread, NULL)) {
+ 		// Hmmm
+ 	}
+ }
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.76-r3 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.76-r3
new file mode 100644
index 000000000000..c07d8c1270ba
--- /dev/null
+++ b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.76-r3
@@ -0,0 +1,3 @@
+MD5 a5566c15dbae1f5c86a08482eb405725 alsaplayer-0.99.76.tar.bz2 608591
+RMD160 24e3548e7513d88b9fc9167b1d4dd8496b87ca11 alsaplayer-0.99.76.tar.bz2 608591
+SHA256 6222dc8460c717a17ef6acc26b101078a71c1e14cb320565e1bd5f9e05f8bd35 alsaplayer-0.99.76.tar.bz2 608591