Added ebuild for version 0.9beta7

6 files changed, 249 insertions, 4 deletions

diff --git a/media-sound/squeezelite/ChangeLog b/media-sound/squeezelite/ChangeLog
index a9cb0de..1321b1d 100644
--- a/media-sound/squeezelite/ChangeLog
+++ b/media-sound/squeezelite/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for media-sound/squeezelite
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*squeezelite-0.9_beta_p7 (15 Jan 2013)
+
+  15 Jan 2013; Stuart Hickinbottom <stuart@hickinbottom.com>
+  +squeezelite-0.9_beta_p7.ebuild,
+  +files/squeezelite-0.9_beta_p7-gentoo-makefile.patch,
+  +files/squeezelite-0.9_beta_p7-gentoo-optional-codecs.patch, metadata.xml:
+  Added 0.9beta7 ebuild version. 'mp3' USE flag now replaced with 'mad'
+  (recommended), or 'mpg123' as desired.
+
   22 Dec 2012; Stuart Hickinbottom <stuart@hickinbottom.com>
   squeezelite-0.7_alpha_p2.ebuild:
   Added post-installation tips and minor tidying
diff --git a/media-sound/squeezelite/Manifest b/media-sound/squeezelite/Manifest
index 9f439c9..0dc3603 100644
--- a/media-sound/squeezelite/Manifest
+++ b/media-sound/squeezelite/Manifest
@@ -1,8 +1,12 @@
 AUX squeezelite-0.7_alpha_p2-gentoo-makefile.patch 766 SHA256 579a342fccd7e21572b4d3548305e15bd713a2983525cc25df5f14d2d1a717d9 SHA512 5cb64b288793e3ce556d95cbc8bd807a623e9a8b1e5db41b8bb45f726ab875b584f7846a5c634a228d4d6333aee353e017fda571cc81c5bd9f6c2b3218db604c WHIRLPOOL 5b05ad99361dc4bc85a53d5083171aac752b50edec6b38d677c0731854578f162bd9ebc501dfb85c2ed75f3305d070184e6bf6e70e8ab47f2159e5837bf74278
 AUX squeezelite-0.7_alpha_p2-gentoo-optional-codecs.patch 3906 SHA256 cd6687eb241cda6b049d75e04b3a3139a2550465f3976e973570bd0ad5ba9b0d SHA512 00b6bb86993b444ba002686a741e8cc32e01e9d804680f2778aa3ddf99505c302018d8c06050955c0e713dd6d2233d948d64a28893215cfbb19dd048f685fc61 WHIRLPOOL 74663d83d3ac91662ed4cadfc77a4b30beea54c9f2a3839761b23779c08bcfb1994d96aae3e6775b31653b1a9c798e36d14a2ed2699d7c3f663b310b0fabf98b
+AUX squeezelite-0.9_beta_p7-gentoo-makefile.patch 693 SHA256 9ff5f4a775249a554a2492a437fa4c1bd47018aa791d5021eb88c963d444eba1 SHA512 2a3c27b28f5d34c3707ab8ef50fc6682daa0cda9c91c317f3044bd9d5f8663d45ebdb33066bd54ea7c68d9619aeba4c53ec1a17b652306bc05531a249c3673f3 WHIRLPOOL f56ef27b08629a1f4054b44f3d9799ed837db9ea9bc9030832cf7a070c31552d34e80f0602d6db32b66968865390b739ffca8dc5ef4839d0f94dffddb20a7bff
+AUX squeezelite-0.9_beta_p7-gentoo-optional-codecs.patch 2565 SHA256 41599785746a872010870dc7bb222fd88a08f313b6be231b2f25133f875426c4 SHA512 03485b0db71992a9731eb95f369037e00f85a1b6c1cf048665aff80e450fb72aa2df56964e1509d4254027fe3fa389d0ba14b97846f98678f6cff86e598b8db5 WHIRLPOOL 248717693266cf6fc07a139cf69968701ce3fc8d786c5cada21e3941a37e19993a7c087909cf64c759d2134ed1366630264bc707131d643d758df48e692ac3b4
 AUX squeezelite.conf.d 903 SHA256 7e8819305991509e271f693741b8990c3db97065db3891472ba9eb19e5c2143a SHA512 813f1f29dab07a6ca74222996d67a48088748622c50324e1027b62dd371a0ad53f32c5e9dc1bcb5f1748744930453029266f29079ae7c85da67ea44e792a0f7f WHIRLPOOL 3faa95b2e79de80275832c78cc92eeba936cb3e59d9e0598a131f0149c0e043a1364a6516b929b4dc43f11738c61921ceba24a87105742b07305727e52188a24
 AUX squeezelite.init.d 604 SHA256 189b31e2d613bb8330f1314fcfc34aa90ab0f0c9f5fe84930bb64223acba3020 SHA512 ed45db42fcb25622bb56ffcdc00545f9d604949e12ee08951ca3b9c377430562d53a8d7cb343dfce4ad3b9ca0dfb659070bdfee5b4db0ba86d88a271933d2d4f WHIRLPOOL 4e71775feed5b518f3421d38155f0250c4e3edc1b72fbe8509c1df29dad0b1a749fedc21dfe299b388dde33fb284a41628df774979574ca7d444f5dc6cbfeea3
 DIST 866fcc7c7e14f354da27fd64f50069e762abd835.zip 127144 SHA256 7c5f87a6dd4609f8f48a7404bbb6c96168a1b637d92c4715786fa886a251dd6e SHA512 1e0cc4f90ebf0da8aa4193be43cb138cf0cc34850fcbbc0455dc7a8cb37bb4290a5a49943bce89d1b0e5657b5a25ae24063b884d6683d38ee70917a16e7667e1 WHIRLPOOL 54c4f9f5797b45058b1f068ba65353df9ae5a3cc5573f03d2a64a26e0bdd893f8dfcf8dc2de3e1c13802bac93f1ccb49fd4e68738c4549a75e0990bab812da34
+DIST ec4180b405ae4b67800096968a8ecbc7e33e4acb.zip 158785 SHA256 872da2d3e639850587d0fa7a4cd61975454579997557cfc8d6cfe292118432b8 SHA512 27f53447e2873f2e7ccb0d7486d4c074f4c3c17eea74d1c5c31f740f6b894e79fc22e75d60595ef951af673cb0a653365cbae45c30919c275879a5f47fac6cc9 WHIRLPOOL 3ae5e0bb73cf9260e55977fd8ff13d84dd0bf6aa743e2fd96209a04f4fffdae696963a0b0dbd559c74636235b50924f25e932c92817c55c4e459d2f9777056cc
 EBUILD squeezelite-0.7_alpha_p2.ebuild 2102 SHA256 3fa402ae0c42bee63f4d68f69d7089370dd73fac58becc881679026a0cc96a1b SHA512 e484b78b12554aece345465a22b812f9cf87591f1be0ecd3d55482f12a315701bc7ad0405b73828b6c4152bd45b65fa74e81c3b0b610b55e4596f541515a88b9 WHIRLPOOL 195f4e8efebd88d495fa18ca2c8a1f803acd9ffd83b3f39fa6c6f5223706e31de7d3e12034c2ac1d380561c99063870bb438c3a7790492524dc227bd14f77bbe
-MISC ChangeLog 525 SHA256 3a5207d21266fa034014cc8245dad2b5572316696747694f6b7c855c15692c86 SHA512 a7aefe601f08adb97798fdf9f89233e60ae3c61ed8564795d93f94a1615c3fbd394de2e61def11b268c7f626261db8130d1f75c8d5a6d43b6e4d18867b7ca8e5 WHIRLPOOL 90ed36fa2a8fa82156103652bd154a5461c01e3f7c5d8c92e3821732a52742bc9f42bddd1734a7098dccbb4319b548e72a5852a68ea0ede29b1a6480dde36132
-MISC metadata.xml 1652 SHA256 e43ac5a13b31075363db76645071cf9fca1cc4ea47f72dfac52cd0d1f233882c SHA512 3bdfca19af0312743d6a4954aceb15502efd3d353b48e979aa44280840c2b82c278757659b59457b2e3d0dcc5f54a72fffd8c51d0e08fc935a8ffbe7a79ecdf9 WHIRLPOOL 66fa4ea466043c6bf0514d8a0d07eb652d3ffe5d6a5d601a758f463e8265a2dedde883bf3eecd102a89062f1574c311e6c65a1dbb37386a1d5bc829eda5e1ed6
+EBUILD squeezelite-0.9_beta_p7.ebuild 2272 SHA256 760af66f85c8c8bff0c0bcccc2ac5ec01d0e68c480f60a188a67a9defa2d647b SHA512 d822a198f0099b9fd7496644ced07f41f3ab7d18f48e84f73244a321efce572cd5ec51d788e4a8456d4fabef841edcf800f62d518e0a7fc120bf5cd3b3db800b WHIRLPOOL 1d6de8f28066e61ad7fcf9af387fe7ff91abd2a0c4d603875abbc05fea32a2e4c94890a21f107c1ec36999eb2684c717470756053d72364c1b10243cc537df42
+MISC ChangeLog 670 SHA256 863500c4330462172ccad25da88544de5a1bb81d2c498d60ca4db3f75b5a24a4 SHA512 ab92a248f5f7b59cc6ee9066db34ae3a27ebd9fe3fca036c2b5cedcb16cc49a443fd8cc5b3aaa8535165b2a25865750f96b7ca35a3deb84231c97d2366a36c82 WHIRLPOOL 4de384d2c7cc2ef214854594b95b053f9863ba6928f2c211525c9bb27b9f17903042e1714b1eebc61e5c439a7810b4358ff136d80301d312223b3467c9045409
+MISC metadata.xml 1899 SHA256 92ebf84b54e9d7533fa806ee61ea51567bf8a71915723aa3df98f869f9260ab4 SHA512 70ccf0c46982b5eeb33f291797e5c5131fb2b5819566f00290e3fccc0c952ca6036bc0042d5cdbe86c3a0285c1c24a3003fa5bffa92772fd94c7e58799a13df5 WHIRLPOOL 0706ada6d875bc114575ccdb2b4e9787db4e6701a56b20b93ecb117f1b02faf5fe04c8d74ab2a1e9a7fba22431c89e89295c582df1dcc483b836374c1ad82034
diff --git a/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-makefile.patch b/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-makefile.patch
new file mode 100644
index 0000000..ec6e927
--- /dev/null
+++ b/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index adf7749..36427f1 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 -ldl -lrt
++EXTRALIBS ?= -lasound -lpthread -ldl -lrt
+ EXECUTABLE ?= squeezelite
+ 
+ SOURCES = main.c slimproto.c utils.c output.c buffer.c stream.c decode.c flac.c pcm.c mad.c vorbis.c faad.c mpg.c
+@@ -11,7 +11,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-0.9_beta_p7-gentoo-optional-codecs.patch b/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-optional-codecs.patch
new file mode 100644
index 0000000..e8e119b
--- /dev/null
+++ b/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-optional-codecs.patch
@@ -0,0 +1,124 @@
+diff --git a/decode.c b/decode.c
+index 9e09c26..4ebf1f3 100644
+--- a/decode.c
++++ b/decode.c
+@@ -100,14 +100,24 @@ void decode_init(log_level level, const char *opt) {
+ 	// register codecs
+ 	// alc,wma,wmap,wmal,aac,spt,ogg,ogf,flc,aif,pcm,mp3
+ 	i = 0;
++#ifndef SL_NO_AAC
+ 	if (!opt || strstr(opt, "aac"))  codecs[i++] = register_faad();
++#endif
++#ifndef SL_NO_OGG
+ 	if (!opt || strstr(opt, "ogg"))  codecs[i++] = register_vorbis();
++#endif
++#ifndef SL_NO_FLAC
+ 	if (!opt || strstr(opt, "flac")) codecs[i++] = register_flac();
++#endif
+ 	if (!opt || strstr(opt, "pcm"))  codecs[i++] = register_pcm();
+ 
+ 	// try mad then mpg for mp3 unless command line option passed
++#ifndef SL_NO_MAD
+ 	if ( !opt || strstr(opt, "mp3") || strstr(opt, "mad"))                codecs[i] = register_mad();
++#endif
++#ifndef SL_NO_MPG123
+ 	if ((!opt || strstr(opt, "mp3") || strstr(opt, "mpg")) && !codecs[i]) codecs[i] = register_mpg();
++#endif
+ 
+ #if LINUX || OSX
+ 	pthread_attr_t attr;
+diff --git a/faad.c b/faad.c
+index a2fa14f..f95f94d 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
+@@ -575,3 +577,5 @@ struct codec *register_faad(void) {
+ 
+ 	return &ret;
+ }
++
++#endif
+diff --git a/flac.c b/flac.c
+index 69e3ba6..5e15171 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 {
+@@ -214,3 +216,5 @@ struct codec *register_flac(void) {
+ 
+ 	return &ret;
+ }
++
++#endif
+diff --git a/mad.c b/mad.c
+index 8bb89f2..631b1b5 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
+@@ -310,3 +312,5 @@ struct codec *register_mad(void) {
+ 
+ 	return &ret;
+ }
++
++#endif
+diff --git a/mpg.c b/mpg.c
+index 92f2121..5ec084b 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
+@@ -222,3 +224,5 @@ struct codec *register_mpg(void) {
+ 
+ 	return &ret;
+ }
++
++#endif
+diff --git a/vorbis.c b/vorbis.c
+index 748dfae..217ca49 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
+ 
+@@ -245,3 +247,5 @@ struct codec *register_vorbis(void) {
+ 
+ 	return &ret;
+ }
++
++#endif
diff --git a/media-sound/squeezelite/metadata.xml b/media-sound/squeezelite/metadata.xml
index ffd1107..85c4b0d 100644
--- a/media-sound/squeezelite/metadata.xml
+++ b/media-sound/squeezelite/metadata.xml
@@ -27,7 +27,9 @@
     <remote-id type="google-code">squeezelite</remote-id>
   </upstream>
   <use>
-    <flag name='mp3'>Supports streaming MP3 from the server, utilising <pkg>media-libs/libmad</pkg></flag>
+	  <flag name='mp3'>(pre-0.9) Supports streaming MP3 from the server, utilising <pkg>media-libs/libmad</pkg></flag>
+	  <flag name='mad'>(post-0.9) Supports streaming MP3 from the server, utilising <pkg>media-libs/libmad</pkg></flag>
+	  <flag name='mpg123'>(post-0.9) Supports streaming MP3 from the server, utilising <pkg>media-sound/mpg123</pkg></flag>
     <flag name='flac'>Supports streaming FLAC from the server, utilising <pkg>media-libs/flac</pkg></flag>
     <flag name='vorbis'>Supports streaming Ogg/Vorbis from the server, utilising <pkg>media-libs/libvorbis</pkg></flag>
     <flag name='aac'>Supports streaming AAC from the server, utilising <pkg>media-libs/faad2</pkg></flag>
diff --git a/media-sound/squeezelite/squeezelite-0.9_beta_p7.ebuild b/media-sound/squeezelite/squeezelite-0.9_beta_p7.ebuild
new file mode 100644
index 0000000..2d90ba3
--- /dev/null
+++ b/media-sound/squeezelite/squeezelite-0.9_beta_p7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Squeezelite is a small headless Squeezebox emulator for Linux using ALSA audio output"
+HOMEPAGE="https://code.google.com/p/squeezelite"
+SRC_URI="https://squeezelite.googlecode.com/archive/ec4180b405ae4b67800096968a8ecbc7e33e4acb.zip"
+S="${WORKDIR}/squeezelite-ec4180b405ae"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac vorbis mad mpg123 aac"
+
+DEPEND="media-libs/alsa-lib
+		flac? ( media-libs/flac )
+		vorbis? ( media-libs/libvorbis )
+		mad? ( media-libs/libmad )
+		mpg123? ( media-sound/mpg123 )
+		aac? ( media-libs/faad2 )
+"
+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() {
+
+	# Configure 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."
+}