Version bump to new snapshot. Simplify init script using baselayout-2 enhancements.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 167 insertions, 25 deletions

diff --git a/media-sound/squeezeslave/ChangeLog b/media-sound/squeezeslave/ChangeLog
index ddce304be8cd..8423bf8dea3a 100644
--- a/media-sound/squeezeslave/ChangeLog
+++ b/media-sound/squeezeslave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/squeezeslave
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/ChangeLog,v 1.2 2011/10/19 05:00:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/ChangeLog,v 1.3 2011/12/04 22:18:43 radhermit Exp $
+
+*squeezeslave-1.1_p309 (04 Dec 2011)
+
+  04 Dec 2011; Tim Harder <radhermit@gentoo.org> +squeezeslave-1.1_p309.ebuild,
+  +files/squeezeslave-1.1_p309-ffmpeg.patch, files/squeezeslave.initd:
+  Version bump to new snapshot. Simplify init script using baselayout-2
+  enhancements.
 
 *squeezeslave-1.1_p286 (19 Oct 2011)
 
diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest
index e21ad1faf2d4..e11c8e673873 100644
--- a/media-sound/squeezeslave/Manifest
+++ b/media-sound/squeezeslave/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA512
 
 AUX squeezeslave-1.1_p262-ffmpeg.patch 1065 RMD160 eb58ce31dd09efe37538b2ab41fbfaa64039416d SHA1 f4e83d043cfd67b3065a7e6617e984412cf4f401 SHA256 dc6e3201f1d6104c24ddef8d26f996489b3158ffa9514fc6126033a3ac79fa09
+AUX squeezeslave-1.1_p309-ffmpeg.patch 2350 RMD160 e1cb0cb7bb063aef888553b596d4c3f60b275528 SHA1 2c3c515ff36e0e269e0ed192b1689c4d90dc76d9 SHA256 af549c37f452ff653a05aaaf6ea0be7c069e606ac419eb06d6f96c7f35febd00
 AUX squeezeslave.confd 317 RMD160 23217760c20d12a19ea2d446a77cf045a8e1edec SHA1 8046774d6ec3ad8f924234a9f683289d99f0dbeb SHA256 bc73638b70b736f3b1934871db3a348254f207ce42a03ac26dff6e273192a7c2
-AUX squeezeslave.initd 734 RMD160 24bc154d619b9e229a8e2c6870c9fa6f74916fe8 SHA1 381866705a68568d1ac778b37fae60d155c2ef98 SHA256 fd6b2746843a31cc3d67689c3186d9e261978358eef201efc8895403acdb548c
+AUX squeezeslave.initd 508 RMD160 7a2bb454ca3c26c1e98f4df4b0b5f0527793fcc1 SHA1 39564b19e4232b966b2677faf8fe7bc18b907c74 SHA256 bf77e77c8aad105119914e1463506ccb49dd96822cb7f2eb74f89e704c27963b
 DIST squeezeslave-1.1_p262.tar.xz 104224 RMD160 6518dba4bb366b11ed80fd0ef703b4c790fa187c SHA1 5096010912015819dfaedfb497f1f6733084c098 SHA256 6dcb70731359ae35a57b994dc944617dc222222488bbad1cd8e9fbc2114eec5b
 DIST squeezeslave-1.1_p286.tar.xz 110276 RMD160 40d659a63a64daab9433ffb1b7da782dc1116307 SHA1 accde6037322515e7effca9080d6ea488b203802 SHA256 55c9d3935992e888992b4b66db917a8a5dd86297b72c8e61169c64e9e270f965
+DIST squeezeslave-1.1_p309.tar.xz 115040 RMD160 2362e93999921cea6b1f3d304d17a5da5c4920fe SHA1 6c99e62ea761421d0f2c1542f97eaf8c93bd9d60 SHA256 8de690eb6080db3409bd6ffa641b8367679f3cac04710526cf4563f002999f67
 EBUILD squeezeslave-1.1_p262.ebuild 1131 RMD160 6ef5581d9d1466e4bfdb726fa6112f484ac81a25 SHA1 b7a0f1309a88174a204f406b42cb593b8c268f61 SHA256 5a27fe2ef3d5fb31a7a6427d8e2fd67268d9e1f6d4de078332ba0c579e4d8127
 EBUILD squeezeslave-1.1_p286.ebuild 1124 RMD160 96eef198f99779c34e4fb1dd6ead453ff677fb89 SHA1 60a80912b90d686747ce0693badcc633bece5864 SHA256 a1ea3abcc175dc055f5e8433fe1eeb7249b175d2053baf42db4f2af9a9380236
-MISC ChangeLog 677 RMD160 527716626fd31fa091e3cea41453bafd54dc23d5 SHA1 4b0590bc0a1907e6bfb665e06fcfbf8481369195 SHA256 313b64522fa5119bad556fa506842182c1a21e39e4d38cd899deaa0e004b2c68
+EBUILD squeezeslave-1.1_p309.ebuild 1114 RMD160 274528b41b4ab1c74c73b79594e7ce3366d51942 SHA1 5dc46ab72118985c4d93e18828e8bd82e274bf4d SHA256 fa23e50a76287147309de3d4dc62251f01517079953901d5ce0fc35b95ca7e1e
+MISC ChangeLog 955 RMD160 175963057d3b244c497af6f06e01d200ea27dedc SHA1 a093c1def42e66b0b7247b5b70eab9ddc5cf1a49 SHA256 f98c7494f639fc69358fc996992ee2423982ba82ab604d6111c07439f9372c5e
 MISC metadata.xml 487 RMD160 d69347ef77b0c55134a7adc98a0bde2942d8ef8c SHA1 f571eb4abdc89e5d77e45d3cba6d854429c05652 SHA256 43d8a66dc872306b51899396bd9a03051956faf94d596438432b0c15337f68d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOnllzAAoJEEqz6FtPBkyj3fYH/jOIOXHlX4B6QRb6hTvjCkcV
-f6O2Yfs4WE55MNiiIEnMitRjUflaQui0TnvD93qnu7FL4Rq19z6jMw00pnh8aTg2
-725F5nWsI6Tzwy/O7V8BsGdjVv8FCqf7jNS5qoy8xILGNntOYsDc1degTwR2PFK+
-EjnSrgo1j03/YBY0mj284E4eSETK6oc5/kuwtq8xrIsnbHi9bq6FqZyf4+j9Hg1Q
-rdgtMB9swMPdZ21inapa89uA777Y9KTisE4OOGPbWqFvAP3s/odNyyaxTmE40g8j
-cCAt4YKrAPa18D8vkd1G6z/m23kZx60NiSc9Ziydm4F72ev2cC4o0fPIV80L5z8=
-=RnMJ
+iQEcBAEBCgAGBQJO2/HMAAoJEEqz6FtPBkyjzOEIAI0YpLUUvETNcwh5Ch8gqSBX
+J0aCYGK7tl2RniB+UQF01At/u35UkMPtTwxvMtjlRnb9q3DC19sRhsOK15Q9bF/w
+E3uHuUqN8a2t0dvI2yDFvIVk+XcB+YwQrVs7k9oPvBw5muUmwHWK9xpBDzf1Y9lx
+spEqTMqVV7PImOkqs7Sj3s5BejVzqYC2Wr19H8SagizLMo/CPb4tq1IlOa6MrQun
+Ba0rt0mUgt42Xhf30QLyze0p4+HRh483Y00C/h6upv7LWxsDhjecOj/YoXcCBmbe
+9FKcwY5/ionDK2NvS3aRoy6cbGhvUHZuKXLI/sCLYpVINpjhqqg5BEusm0DZRrI=
+=QB2S
 -----END PGP SIGNATURE-----
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch
new file mode 100644
index 000000000000..70a88dde4348
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch
@@ -0,0 +1,95 @@
+--- squeezeslave-1.1_p309/src/slimaudio/slimaudio_decoder_aac.c.orig
++++ squeezeslave-1.1_p309/src/slimaudio/slimaudio_decoder_aac.c
+@@ -28,6 +28,10 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ 
++#ifndef CODEC_TYPE_AUDIO
++#define CODEC_TYPE_AUDIO	AVMEDIA_TYPE_AUDIO
++#endif
++
+ #include "slimproto/slimproto.h"
+ #include "slimaudio/slimaudio.h"
+ 
+@@ -96,11 +100,6 @@
+ }
+ 
+ int slimaudio_decoder_aac_process(slimaudio_t *audio) {
+-//	unsigned char data[AUDIO_CHUNK_SIZE];
+-//	int buffer[AUDIO_CHUNK_SIZE/2];
+-//	int i;
+-	
+-//	unsigned char *ptr = data;
+ 	char streamformat[16];
+ 	int out_size;
+ 	int len = 0;
+@@ -148,18 +147,6 @@
+ 
+ 	DEBUGF ("aac: play audioStream: %d\n", audioStream);
+ 
+-	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
+-	if( !pAVInputFormat )
+-	{
+-		DEBUGF("aac: probe failed\n");
+-		return -1;
+-	}
+-	else
+-	{
+-		DEBUGF("aac: probe ok name:%s lname:%s\n", pAVInputFormat->name, pAVInputFormat->long_name);
+-		pAVInputFormat->flags |= AVFMT_NOFILE;
+-	}
+-
+ 	inbuf = av_malloc(AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+ 	if ( !inbuf )
+ 	{
+@@ -167,23 +154,35 @@
+ 		return -1;
+ 	}
+ 
+-	ByteIOContext ByteIOCtx;
++	AVIOContext *AVIOCtx;
+ 
+-	iRC = init_put_byte( &ByteIOCtx, inbuf, AUDIO_CHUNK_SIZE, 0, audio, av_read_data, NULL, NULL ) ;
+-	if( iRC < 0)
++	AVIOCtx = avio_alloc_context(inbuf, AUDIO_CHUNK_SIZE, 0, audio, av_read_data, NULL, NULL);
++	if ( AVIOCtx == NULL )
+ 	{
+-		DEBUGF("aac: init_put_byte failed:%d\n", iRC);
++		DEBUGF("aac: avio_alloc_context failed.\n");
+ 		return -1;
+ 	}
+ 	else
+ 	{
+-		ByteIOCtx.is_streamed = 1;
++		AVIOCtx->is_streamed = 1;
++	}
++
++	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
++	if( !pAVInputFormat )
++	{
++		DEBUGF("aac: probe failed\n");
++		return -1;
++	}
++	else
++	{
++		DEBUGF("aac: probe ok name:%s lname:%s\n", pAVInputFormat->name, pAVInputFormat->long_name);
++		pAVInputFormat->flags |= AVFMT_NOFILE;
+ 	}
+ 
+ 	AVFormatContext* pFormatCtx;
+ 	AVCodecContext *pCodecCtx;
+ 
+-	iRC = av_open_input_stream(&pFormatCtx, &ByteIOCtx, "", pAVInputFormat, NULL);
++	iRC = av_open_input_stream(&pFormatCtx, AVIOCtx, "", pAVInputFormat, NULL);
+ 
+ 	if (iRC < 0)
+ 	{
+@@ -261,7 +260,7 @@
+ 				eos=true;
+ 			}
+ 
+-			if ( url_feof(pFormatCtx->pb) )
++			if ( pFormatCtx->pb->eof_reached )
+ 			{
+ 				DEBUGF("aac: url_feof\n");
+ 				eos=true;
diff --git a/media-sound/squeezeslave/files/squeezeslave.initd b/media-sound/squeezeslave/files/squeezeslave.initd
index ea9f1f755f7a..efa5c140dbff 100644
--- a/media-sound/squeezeslave/files/squeezeslave.initd
+++ b/media-sound/squeezeslave/files/squeezeslave.initd
@@ -1,23 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/files/squeezeslave.initd,v 1.1 2011/08/09 08:01:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/files/squeezeslave.initd,v 1.2 2011/12/04 22:18:43 radhermit Exp $
+
+command="/usr/bin/${SVCNAME}"
+command_args="--daemonize ${SS_LOG} --mac ${SS_MAC} --retry ${SBS_HOST} ${SS_OPTS}"
+pidfile="/var/run/${SVCNAME}.pid"
+start_stop_daemon_args="--background --quiet --make-pidfile"
 
 depend() {
 	need net
 	use squeezeboxserver
 }
-
-start() {
-	ebegin "Starting squeezeslave"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/squeezeslave.pid \
-		--make-pidfile --exec /usr/bin/squeezeslave -- \
-		--daemonize "${SS_LOG}" --mac ${SS_MAC} --retry ${SBS_HOST} ${SS_OPTS}
-	eend $? "Failed to start squeezeslave"
-}
-
-stop() {
-	ebegin "Stopping squeezeslave"
-	start-stop-daemon --stop --pid /var/run/squeezeslave.pid
-	eend $? "Failed to stop squeezeslave"
-}
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild
new file mode 100644
index 000000000000..f196184c5a34
--- /dev/null
+++ b/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild,v 1.1 2011/12/04 22:18:43 radhermit Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A lightweight streaming audio player for squeezeboxserver"
+HOMEPAGE="http://squeezeslave.googlecode.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac +alsa display wma zones"
+
+RDEPEND="media-libs/libmad
+	media-libs/flac
+	media-libs/libvorbis
+	media-libs/libogg
+	media-libs/portaudio[alsa?]
+	aac? ( virtual/ffmpeg )
+	wma? ( virtual/ffmpeg )
+	display? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig"
+
+src_prepare() {
+	for i in display aac wma zones ; do
+		! use $i && sed -i -e "/$i/Id" Makefile
+	done
+
+	epatch "${FILESDIR}"/${P}-ffmpeg.patch
+
+	tc-export CC AR RANLIB
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc ChangeLog TODO
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}