Merge branch 'lmiphay-squeezelite-1.8' into develop

Added squeezelite-1.8 ebuild bump. Thanks to lmiphay for the build and
pull request.

7 files changed, 271 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index e4e5f6c..641a300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*~
\ No newline at end of file
+*~
+Makefile
diff --git a/media-sound/squeezelite/Manifest b/media-sound/squeezelite/Manifest
index 0686023..c380a09 100644
--- a/media-sound/squeezelite/Manifest
+++ b/media-sound/squeezelite/Manifest
@@ -2,10 +2,13 @@ AUX squeezelite-1.1-gentoo-makefile.patch 693 SHA256 9ff5f4a775249a554a2492a437f
 AUX squeezelite-1.1-gentoo-optional-codecs.patch 2556 SHA256 4662c84e362e3ffb59018efae66e579b8ae4a26e568296ce2ba6ecde5342f5d1 SHA512 62ad21c9c0f8e45cf295c617e2f0f2fe4b80a6e032c7730e9fba41178c8322e91fa8e58aeebde3bf2b33dbb5e287c8655efb592ec1511c326805614c9693c723 WHIRLPOOL 260e5b47c47393511e7d16c149ca796081cb624bf6e1db01f3ef9095bdda9255dc2f74e1eb6aa5dcf02cdd27e2b6ec070519b8ac04c2606f57894f4a6f692020
 AUX squeezelite-1.2-gentoo-makefile.patch 722 SHA256 9a90340d3d447b66195e9615e749274409723e6a95bf847aa44dc42148c97cae SHA512 697191bb1d528d9c7b48e0460a491df67fb6773cf74db0728153b7bf16afec94efe804cdd96df93793681e048c8fe980e94880218b4ba5d2d3a31a320115324e WHIRLPOOL 25d1657f66eaedb4927cb703ae7d91438ffef4a6f322cab67c2f926c7875e57e57a30726deeb69ce760828cd89c7d2f5de83c870912082f433d72ec8a0cf48cd
 AUX squeezelite-1.2-gentoo-optional-codecs.patch 2556 SHA256 d91783f425d0c4378d31597c547c56f23499f96bbc5032ee9c012dd284851835 SHA512 a9ebcbae0370b809b9765cd625a7d2bfc2df6c3c573e93b706a9e0fa07207e9d1a2cea5c893c4ec811f005c9b7786a31d33ef7dc614175f8f7ee7189e5d8ca56 WHIRLPOOL 615fa01a96371fe15081b715848b2d8181c192c90f1c5c4d8c101c192bb10ec217f4ec36ac7a1d2c1ab72a7b759003484ffde678c23f536a02b4722a0b0683c7
-AUX squeezelite.conf.d 903 SHA256 7e8819305991509e271f693741b8990c3db97065db3891472ba9eb19e5c2143a SHA512 813f1f29dab07a6ca74222996d67a48088748622c50324e1027b62dd371a0ad53f32c5e9dc1bcb5f1748744930453029266f29079ae7c85da67ea44e792a0f7f WHIRLPOOL 3faa95b2e79de80275832c78cc92eeba936cb3e59d9e0598a131f0149c0e043a1364a6516b929b4dc43f11738c61921ceba24a87105742b07305727e52188a24
-AUX squeezelite.init.d 604 SHA256 189b31e2d613bb8330f1314fcfc34aa90ab0f0c9f5fe84930bb64223acba3020 SHA512 ed45db42fcb25622bb56ffcdc00545f9d604949e12ee08951ca3b9c377430562d53a8d7cb343dfce4ad3b9ca0dfb659070bdfee5b4db0ba86d88a271933d2d4f WHIRLPOOL 4e71775feed5b518f3421d38155f0250c4e3edc1b72fbe8509c1df29dad0b1a749fedc21dfe299b388dde33fb284a41628df774979574ca7d444f5dc6cbfeea3
+AUX squeezelite-1.8-gentoo-makefile.patch 654 SHA256 61cc14bec1f8587e938666bcd953042dfe695daa09e1028e3fe4f8a773bb9521 SHA512 4e00d9051a34faca1697ce6a9f8c66e03cd279323c1b0b6af9a8d52df2e5d29e1b0d567060f51a4f76dbf1e1ffe0fc9f1d95751f904f82b21dde201e5342f481 WHIRLPOOL 1077dd822f9b6ac05dd5c20486287e6185a3805cdcd872661d42f76b15672fea463d05577b8f71df96162bb15d01d3336d81bb56bb47fcf56d60cfe6a7a1a46f
+AUX squeezelite-1.8-gentoo-optional-codecs.patch 3390 SHA256 2a20b4bd7d2ed4648699c4b4f5d7b3439ef2978771e7013ebc540f3dd660ca1e SHA512 0b7f6416e1c1e29c9f06573ed210dc98879bd20f1a894c4a720079383adb55d462dd41d10d81841f6d6f13f684ab492a9d1c529fa7c8d20947a4280dae0c57a0 WHIRLPOOL b1698495c67516f0c128e05fbee47fffd491f0816f0f04ef563d7f1d41979d0e9b7fcc6d5ed8d4f391afed348e9c6ac7921d64111d275ff7d75cf08e63b6ceb5
+AUX squeezelite.conf.d 885 SHA256 288a6aceafb7d13625ec418c69e5f1820a8bbf11f3d268fd1297784e6b2e3f9d SHA512 40cc716cc7278234582c05b08c2a7190421b314a2af6b30aab7c946efe37b33cd95cfb01a9286678c336a74eda7894056d386e7f548ed3c207ba80b559044e73 WHIRLPOOL 0ac9c06d59f93d06e5d80cc35c1c0f69c968fa00acfdde1998ad7bb98a7d66179ee1222399b557fae15d6f16166557ee7da3486c1c4320eaa681cc579afbf635
+AUX squeezelite.init.d 599 SHA256 80e45a507b69e027ef511c247755e1511944b6eb5d822713345d05ca8c6dfce9 SHA512 79b85316c614478370d04a0beb0958f54e967786101d7c93cff2c77f25923599faa882bbdbf336269b50123c56d9a6871c1842841cc6c95baddbceb54ed24037 WHIRLPOOL c1f86bec704c61dc2e1af03a798b5f755932e46c5e925da9bf8980133647d98d304c2a7981a0a2459085bab3bcd0098328955ab8f75da3137fcbcedc5a915017
 DIST 7c64f298b78e9d3ef69ab29fc33c455a55dfe9ec.zip 54295 SHA256 f854099d1885d6a406fe6b834995006db35cf868ff05b2df504b6d893d626834 SHA512 95308c46f0daba2cd7bab18f3cfcb1f39c460e37406bd9721bbf4ee13665752963764e93f165d87286521ff6a586a057ade67a590e1dea41f345e0f55e0d0890 WHIRLPOOL aec0c19c067801b2a38a9555d3e184b53b7fa7f4d9cc84336736fc13a9c1b7d58876134cd5831c0cd38988adc8d9cc40a72a4da7cf2aead617affc6a9886a287
 EBUILD squeezelite-1.1.ebuild 2272 SHA256 9de674158faa0809d812eef6606e4b6290d2e63a88f63ba2a22f2b428c5327ab SHA512 cf68cfa109d095fc55975b77a225a92cd4d3110015bbe8bb665934806ea80647baaaf74d676da3ce1c37582fa24fa0fed8f9a00877f6236c467a43fac686202d WHIRLPOOL 24fe918a94a6d6b6eb4b142f09d8b3cd53c4320bccaa46da215091a42ef1dc68f0eff29dc74fd579421716cc13245777e839c96338a2ec8e6a63828ab76b28fb
 EBUILD squeezelite-1.2.ebuild 2269 SHA256 05c575c54a5c1cc736d577308d20fc935044f1a7933cb944172c367ce47b4a45 SHA512 ddbf2f6b88579cf09dec8dba956c50679bf7bc92717cfb2a52b0a98bcf6a30659f2e2916ad5566b97a4dcccea9b3ddf7701b61c2174ecfc69ee24df51ec8870e WHIRLPOOL a84d8951338dbfe24b75fdb34a8d776168d62741647316d0e2d8cd7a68e85c605ff5fd3d5e8194746235a57a13ded35d96f5162420140de14b74cd49d7732c6e
+EBUILD squeezelite-1.8.ebuild 2919 SHA256 80a1491e21ad820efce7453772f63c5316d544d27577b436aa579e8a7decc057 SHA512 e205362428825cac199c7be5e1fc48ce39eef5c123b96dd8d8de0259b85f332ce5c1a9126148ad2fb9c0c8f2d116d003bf79183dbed9257eb2a1fb3a5f1602ef WHIRLPOOL 48daffd342195e3e009a030098543013667cbc84cc51620a0c854e11e7a0ab614c5e53fbb7084142fe3dabc2dd39f3cb421b81c28d5c428bb73f5cea852c1576
 MISC ChangeLog 1467 SHA256 e8a7c9b3924a1ffd4fbf0d5c87639d8826d44530d05d1ebf7e3e12191ddc6f9b SHA512 6b9316ef22849d2d21bade6e49acdb6e8d6b9e3b9f1ccc9d1aad58dd575308877a56ef11d4e044891e5328cf5b926a35d269f7604880065831f73e9ea2d170f0 WHIRLPOOL 5febea8474ff8317e2557f228c6ace0058fcd62da6fef8ba18a9e00a6f2ffd73986cd3a6de3c09248f4097d1b902d16d3a64a0ba96797aa128635521f2f4a615
 MISC metadata.xml 1899 SHA256 92ebf84b54e9d7533fa806ee61ea51567bf8a71915723aa3df98f869f9260ab4 SHA512 70ccf0c46982b5eeb33f291797e5c5131fb2b5819566f00290e3fccc0c952ca6036bc0042d5cdbe86c3a0285c1c24a3003fa5bffa92772fd94c7e58799a13df5 WHIRLPOOL 0706ada6d875bc114575ccdb2b4e9787db4e6701a56b20b93ecb117f1b02faf5fe04c8d74ab2a1e9a7fba22431c89e89295c582df1dcc483b836374c1ad82034
diff --git a/media-sound/squeezelite/files/squeezelite-1.8-gentoo-makefile.patch b/media-sound/squeezelite/files/squeezelite-1.8-gentoo-makefile.patch
new file mode 100644
index 0000000..271c199
--- /dev/null
+++ b/media-sound/squeezelite/files/squeezelite-1.8-gentoo-makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index dca2abd..f6b985f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile...
+ CFLAGS  ?= -Wall -fPIC -O2 $(OPTS)
+-LDFLAGS ?= -lasound -lpthread -lm -lrt
++EXTRALIBS ?= -lasound -lpthread -lm -lrt
+ EXECUTABLE ?= squeezelite
+ 
+ # passing one or more of these in $(OPTS) enables optional feature inclusion
+@@ -74,7 +74,7 @@ OBJECTS = $(SOURCES:.c=.o)
+ all: $(EXECUTABLE)
+ 
+ $(EXECUTABLE): $(OBJECTS)
+-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
++	$(CC) $(OBJECTS) $(LDFLAGS) $(EXTRALIBS) -o $@
+ 
+ $(OBJECTS): $(DEPS)
+ 
diff --git a/media-sound/squeezelite/files/squeezelite-1.8-gentoo-optional-codecs.patch b/media-sound/squeezelite/files/squeezelite-1.8-gentoo-optional-codecs.patch
new file mode 100644
index 0000000..acdaeda
--- /dev/null
+++ b/media-sound/squeezelite/files/squeezelite-1.8-gentoo-optional-codecs.patch
@@ -0,0 +1,126 @@
+diff --git a/decode.c b/decode.c
+index add5fcb..333d76b 100644
+--- a/decode.c
++++ b/decode.c
+@@ -138,16 +138,26 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud
+ 	if (!strstr(exclude_codecs, "alac") && (!include_codecs || strstr(include_codecs, "alac")))  codecs[i++] = register_ff("alc");
+ 	if (!strstr(exclude_codecs, "wma")  && (!include_codecs || strstr(include_codecs, "wma")))   codecs[i++] = register_ff("wma");
+ #endif
++#ifndef SL_NO_AAC
+ 	if (!strstr(exclude_codecs, "aac")  && (!include_codecs || strstr(include_codecs, "aac")))  codecs[i++] = register_faad();
++#endif
++#ifndef SL_NO_OGG
+ 	if (!strstr(exclude_codecs, "ogg")  && (!include_codecs || strstr(include_codecs, "ogg")))  codecs[i++] = register_vorbis();
++#endif
++#ifndef SL_NO_FLAC
+ 	if (!strstr(exclude_codecs, "flac") && (!include_codecs || strstr(include_codecs, "flac"))) codecs[i++] = register_flac();
++#endif
+ 	if (!strstr(exclude_codecs, "pcm")  && (!include_codecs || strstr(include_codecs, "pcm")))  codecs[i++] = register_pcm();
+ 
+ 	// try mad then mpg for mp3 unless command line option passed
++#ifndef SL_NO_MAD
+ 	if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) &&
+ 		(!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mad")))	codecs[i] = register_mad();
++#endif
++#ifndef SL_NO_MPG123
+ 	if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && !codecs[i] &&
+ 		(!include_codecs || strstr(include_codecs, "mp3") || strstr(include_codecs, "mpg")))    codecs[i] = register_mpg();
++#endif
+ 
+ 	mutex_create(decode.mutex);
+ 
+diff --git a/faad.c b/faad.c
+index 96d33ca..f994cf3 100644
+--- a/faad.c
++++ b/faad.c
+@@ -20,6 +20,8 @@
+ 
+ #include "squeezelite.h"
+ 
++#ifndef SL_NO_AAC
++
+ #include <neaacdec.h>
+ 
+ #define WRAPBUF_LEN 2048
+@@ -640,3 +642,5 @@ struct codec *register_faad(void) {
+ 	LOG_INFO("using faad to decode aac");
+ 	return &ret;
+ }
++
++#endif
+diff --git a/flac.c b/flac.c
+index a5c7b3b..6240d84 100644
+--- a/flac.c
++++ b/flac.c
+@@ -20,6 +20,8 @@
+ 
+ #include "squeezelite.h"
+ 
++#ifndef SL_NO_FLAC
++
+ #include <FLAC/stream_decoder.h>
+ 
+ struct flac {
+@@ -286,3 +288,5 @@ struct codec *register_flac(void) {
+ 	LOG_INFO("using flac to decode flc");
+ 	return &ret;
+ }
++
++#endif
+diff --git a/mad.c b/mad.c
+index 30e2498..b667900 100644
+--- a/mad.c
++++ b/mad.c
+@@ -20,6 +20,8 @@
+ 
+ #include "squeezelite.h"
+ 
++#ifndef SL_NO_MAD
++
+ #include <mad.h>
+ 
+ #define MAD_DELAY 529
+@@ -412,3 +414,5 @@ struct codec *register_mad(void) {
+ 	LOG_INFO("using mad to decode mp3");
+ 	return &ret;
+ }
++
++#endif
+diff --git a/mpg.c b/mpg.c
+index f3074f2..bcf79d6 100644
+--- a/mpg.c
++++ b/mpg.c
+@@ -20,6 +20,8 @@
+ 
+ #include "squeezelite.h"
+ 
++#ifndef SL_NO_MAD
++
+ #include <mpg123.h>
+ 
+ #define READ_SIZE  512
+@@ -274,3 +276,5 @@ struct codec *register_mpg(void) {
+ 	LOG_INFO("using mpg to decode mp3");
+ 	return &ret;
+ }
++
++#endif
+diff --git a/vorbis.c b/vorbis.c
+index 0809bee..7f258f3 100644
+--- a/vorbis.c
++++ b/vorbis.c
+@@ -20,6 +20,8 @@
+ 
+ #include "squeezelite.h"
+ 
++#ifndef SL_NO_OGG
++
+ // automatically select between floating point (preferred) and fixed point libraries:
+ // NOTE: works with Tremor version here: http://svn.xiph.org/trunk/Tremor, not vorbisidec.1.0.2 currently in ubuntu
+ 
+@@ -329,3 +331,5 @@ struct codec *register_vorbis(void) {
+ 	LOG_INFO("using vorbis to decode ogg");
+ 	return &ret;
+ }
++
++#endif
diff --git a/media-sound/squeezelite/files/squeezelite.conf.d b/media-sound/squeezelite/files/squeezelite.conf.d
index 0bfe98f..e9a74c1 100644
--- a/media-sound/squeezelite/files/squeezelite.conf.d
+++ b/media-sound/squeezelite/files/squeezelite.conf.d
@@ -1,5 +1,4 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/media-sound/squeezelite/files/squeezelite.init.d b/media-sound/squeezelite/files/squeezelite.init.d
index 7d07b1d..0112c5d 100755
--- a/media-sound/squeezelite/files/squeezelite.init.d
+++ b/media-sound/squeezelite/files/squeezelite.init.d
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,11 +14,11 @@ start() {
     start-stop-daemon \
 	--start \
 	--exec /usr/bin/squeezelite \
-	--pidfile /var/run/squeezelite.pid \
+	--pidfile /run/squeezelite.pid \
 	--make-pidfile \
 	--user ${SL_USER} \
 	--background \
-	${SL_OPTS} ${SL_SERVERIP}
+	-- ${SL_OPTS} ${SL_SERVERIP}
     eend $?
 }
 
@@ -27,6 +27,6 @@ stop() {
     start-stop-daemon \
 	--stop \
 	--exec /usr/bin/squeezelite \
-	--pidfile /var/run/squeezelite.pid
+	--pidfile /run/squeezelite.pid
   eend $?
 }
diff --git a/media-sound/squeezelite/squeezelite-1.8.ebuild b/media-sound/squeezelite/squeezelite-1.8.ebuild
new file mode 100644
index 0000000..1761a76
--- /dev/null
+++ b/media-sound/squeezelite/squeezelite-1.8.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils user flag-o-matic git-r3
+
+DESCRIPTION="Squeezelite is a small headless Squeezebox emulator for Linux using ALSA audio output"
+HOMEPAGE="https://code.google.com/p/squeezelite"
+
+EGIT_REPO_URI="https://code.google.com/p/squeezelite"
+GIT_ECLASS="git-r3"
+EGIT_COMMIT="8b8dfe6918ebe45ade5f3d9b68d453d7b8128d99"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac dsd ffmpeg flac mad mpg123 resample visexport vorbis"
+
+# ToDo: visexport use flag needs jivelite - add ebuild for https://code.google.com/p/jivelite/
+
+# ffmpeg provides alac and wma codecs
+DEPEND="media-libs/alsa-lib
+		flac? ( media-libs/flac )
+		ffmpeg? ( media-video/ffmpeg )
+		vorbis? ( media-libs/libvorbis )
+		mad? ( media-libs/libmad )
+		mpg123? ( media-sound/mpg123 )
+		aac? ( media-libs/faad2 )
+		resample? ( media-libs/soxr )
+"
+RDEPEND="${DEPEND}
+		 media-sound/alsa-utils"
+
+pkg_setup() {
+	# Create the user and group if not already present
+	enewuser squeezelite -1 -1 "/dev/null" audio
+}
+
+src_prepare () {
+	# Apply patches
+	epatch "${FILESDIR}/${P}-gentoo-makefile.patch"
+	epatch "${FILESDIR}/${P}-gentoo-optional-codecs.patch"
+}
+
+src_compile() {
+
+	if use dsd; then
+		append-cflags "-DDSD"
+		einfo "dsd support enabled via dsd2pcm"
+	fi
+
+	if use ffmpeg; then
+		append-cflags "-DFFMPEG"
+		einfo "alac and wma support enabled via ffmpeg"
+	fi
+
+	if use resample; then
+		append-cflags "-DRESAMPLE"
+		einfo "resample support enabled via soxr"
+	fi
+
+	if use visexport; then
+		append-cflags "-DVISEXPORT"
+		einfo "audio data export to jivelite support enabled"
+	fi
+
+	# Configure other optional codec support; this is added to the original
+	# source via a patch in this ebuild at present.
+	if ! use flac; then
+		append-cflags "-DSL_NO_FLAC"
+		einfo "FLAC support disabled; add 'flac' USE flag if you need it"
+	fi
+	if ! use vorbis; then
+		append-cflags "-DSL_NO_OGG"
+		einfo "Ogg/Vorbis support disabled; add 'vorbis' USE flag if you need it"
+	fi
+	if ! use mad; then
+		append-cflags "-DSL_NO_MAD"
+	fi
+	if ! use mpg123; then
+		append-cflags "-DSL_NO_MPG123"
+	fi
+	if ! use mad && ! use mpg123; then
+		einfo "MP3 support disabled; add 'mad' (recommended)"
+		einfo "  or 'mpg123' USE flag if you need it"
+	fi
+	if ! use aac; then
+		append-cflags "-DSL_NO_AAC"
+		einfo "AAC support disabled; add 'aac' USE flag if you need it"
+	fi
+
+	# Build it
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin squeezelite
+	dodoc LICENSE.txt
+
+	newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
+	newinitd "${FILESDIR}/${PN}.init.d" "${PN}"
+}
+
+pkg_postinst() {
+	# Provide some post-installation tips.
+	elog "If you want start Squeezelite automatically on system boot:"
+	elog "  rc-update add squeezelite default"
+	elog "Edit /etc/cond.d/squeezelite to customise -- in particular"
+	elog "you may want to set the audio device to be used."
+}