Merge branch 'release/squeezelite-1.2'squeezelite-1.2

4 files changed, 26 insertions, 25 deletions

diff --git a/media-sound/squeezelite/Manifest b/media-sound/squeezelite/Manifest
index 7317a24..0686023 100644
--- a/media-sound/squeezelite/Manifest
+++ b/media-sound/squeezelite/Manifest
@@ -1,12 +1,11 @@
-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-1.1-gentoo-makefile.patch 693 SHA256 9ff5f4a775249a554a2492a437fa4c1bd47018aa791d5021eb88c963d444eba1 SHA512 2a3c27b28f5d34c3707ab8ef50fc6682daa0cda9c91c317f3044bd9d5f8663d45ebdb33066bd54ea7c68d9619aeba4c53ec1a17b652306bc05531a249c3673f3 WHIRLPOOL f56ef27b08629a1f4054b44f3d9799ed837db9ea9bc9030832cf7a070c31552d34e80f0602d6db32b66968865390b739ffca8dc5ef4839d0f94dffddb20a7bff
 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
 DIST 7c64f298b78e9d3ef69ab29fc33c455a55dfe9ec.zip 54295 SHA256 f854099d1885d6a406fe6b834995006db35cf868ff05b2df504b6d893d626834 SHA512 95308c46f0daba2cd7bab18f3cfcb1f39c460e37406bd9721bbf4ee13665752963764e93f165d87286521ff6a586a057ade67a590e1dea41f345e0f55e0d0890 WHIRLPOOL aec0c19c067801b2a38a9555d3e184b53b7fa7f4d9cc84336736fc13a9c1b7d58876134cd5831c0cd38988adc8d9cc40a72a4da7cf2aead617affc6a9886a287
-DIST ec4180b405ae4b67800096968a8ecbc7e33e4acb.zip 158785 SHA256 872da2d3e639850587d0fa7a4cd61975454579997557cfc8d6cfe292118432b8 SHA512 27f53447e2873f2e7ccb0d7486d4c074f4c3c17eea74d1c5c31f740f6b894e79fc22e75d60595ef951af673cb0a653365cbae45c30919c275879a5f47fac6cc9 WHIRLPOOL 3ae5e0bb73cf9260e55977fd8ff13d84dd0bf6aa743e2fd96209a04f4fffdae696963a0b0dbd559c74636235b50924f25e932c92817c55c4e459d2f9777056cc
-EBUILD squeezelite-0.9_beta_p7.ebuild 2272 SHA256 760af66f85c8c8bff0c0bcccc2ac5ec01d0e68c480f60a188a67a9defa2d647b SHA512 d822a198f0099b9fd7496644ced07f41f3ab7d18f48e84f73244a321efce572cd5ec51d788e4a8456d4fabef841edcf800f62d518e0a7fc120bf5cd3b3db800b WHIRLPOOL 1d6de8f28066e61ad7fcf9af387fe7ff91abd2a0c4d603875abbc05fea32a2e4c94890a21f107c1ec36999eb2684c717470756053d72364c1b10243cc537df42
 EBUILD squeezelite-1.1.ebuild 2272 SHA256 9de674158faa0809d812eef6606e4b6290d2e63a88f63ba2a22f2b428c5327ab SHA512 cf68cfa109d095fc55975b77a225a92cd4d3110015bbe8bb665934806ea80647baaaf74d676da3ce1c37582fa24fa0fed8f9a00877f6236c467a43fac686202d WHIRLPOOL 24fe918a94a6d6b6eb4b142f09d8b3cd53c4320bccaa46da215091a42ef1dc68f0eff29dc74fd579421716cc13245777e839c96338a2ec8e6a63828ab76b28fb
+EBUILD squeezelite-1.2.ebuild 2269 SHA256 05c575c54a5c1cc736d577308d20fc935044f1a7933cb944172c367ce47b4a45 SHA512 ddbf2f6b88579cf09dec8dba956c50679bf7bc92717cfb2a52b0a98bcf6a30659f2e2916ad5566b97a4dcccea9b3ddf7701b61c2174ecfc69ee24df51ec8870e WHIRLPOOL a84d8951338dbfe24b75fdb34a8d776168d62741647316d0e2d8cd7a68e85c605ff5fd3d5e8194746235a57a13ded35d96f5162420140de14b74cd49d7732c6e
 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-0.9_beta_p7-gentoo-makefile.patch b/media-sound/squeezelite/files/squeezelite-1.2-gentoo-makefile.patch
index ec6e927..8769f3a 100644
--- a/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-makefile.patch
+++ b/media-sound/squeezelite/files/squeezelite-1.2-gentoo-makefile.patch
@@ -1,15 +1,15 @@
 diff --git a/Makefile b/Makefile
-index adf7749..36427f1 100644
+index d304602..0d62ff2 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
+-LDFLAGS ?= -lasound -lpthread -lm -ldl -lrt
++EXTRALIBS ?= -lasound -lpthread -lm -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
+ SOURCES = main.c slimproto.c utils.c output.c buffer.c stream.c decode.c process.c resample.c flac.c pcm.c mad.c vorbis.c faad.c mpg.c
 @@ -11,7 +11,7 @@ OBJECTS = $(SOURCES:.c=.o)
  all: $(EXECUTABLE)
  
diff --git a/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-optional-codecs.patch b/media-sound/squeezelite/files/squeezelite-1.2-gentoo-optional-codecs.patch
index e8e119b..37bf880 100644
--- a/media-sound/squeezelite/files/squeezelite-0.9_beta_p7-gentoo-optional-codecs.patch
+++ b/media-sound/squeezelite/files/squeezelite-1.2-gentoo-optional-codecs.patch
@@ -1,8 +1,8 @@
 diff --git a/decode.c b/decode.c
-index 9e09c26..4ebf1f3 100644
+index 05fcdce..d9d9fa2 100644
 --- a/decode.c
 +++ b/decode.c
-@@ -100,14 +100,24 @@ void decode_init(log_level level, const char *opt) {
+@@ -131,14 +131,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;
@@ -25,10 +25,10 @@ index 9e09c26..4ebf1f3 100644
  	if ((!opt || strstr(opt, "mp3") || strstr(opt, "mpg")) && !codecs[i]) codecs[i] = register_mpg();
 +#endif
  
- #if LINUX || OSX
- 	pthread_attr_t attr;
+ 	mutex_create(decode.mutex);
+ 
 diff --git a/faad.c b/faad.c
-index a2fa14f..f95f94d 100644
+index 6adb88a..33a7f10 100644
 --- a/faad.c
 +++ b/faad.c
 @@ -20,6 +20,8 @@
@@ -40,14 +40,14 @@ index a2fa14f..f95f94d 100644
  #include <neaacdec.h>
  
  #define WRAPBUF_LEN 2048
-@@ -575,3 +577,5 @@ struct codec *register_faad(void) {
+@@ -601,3 +603,5 @@ struct codec *register_faad(void) {
  
  	return &ret;
  }
 +
 +#endif
 diff --git a/flac.c b/flac.c
-index 69e3ba6..5e15171 100644
+index 5d22bfe..cab6601 100644
 --- a/flac.c
 +++ b/flac.c
 @@ -20,6 +20,8 @@
@@ -59,14 +59,14 @@ index 69e3ba6..5e15171 100644
  #include <FLAC/stream_decoder.h>
  
  struct flac {
-@@ -214,3 +216,5 @@ struct codec *register_flac(void) {
+@@ -253,3 +255,5 @@ struct codec *register_flac(void) {
  
  	return &ret;
  }
 +
 +#endif
 diff --git a/mad.c b/mad.c
-index 8bb89f2..631b1b5 100644
+index 0e73b35..5058656 100644
 --- a/mad.c
 +++ b/mad.c
 @@ -20,6 +20,8 @@
@@ -78,14 +78,14 @@ index 8bb89f2..631b1b5 100644
  #include <mad.h>
  
  #define MAD_DELAY 529
-@@ -310,3 +312,5 @@ struct codec *register_mad(void) {
+@@ -350,3 +352,5 @@ struct codec *register_mad(void) {
  
  	return &ret;
  }
 +
 +#endif
 diff --git a/mpg.c b/mpg.c
-index 92f2121..5ec084b 100644
+index 4142282..7326af8 100644
 --- a/mpg.c
 +++ b/mpg.c
 @@ -20,6 +20,8 @@
@@ -97,14 +97,14 @@ index 92f2121..5ec084b 100644
  #include <mpg123.h>
  
  #define READ_SIZE  512
-@@ -222,3 +224,5 @@ struct codec *register_mpg(void) {
+@@ -261,3 +263,5 @@ struct codec *register_mpg(void) {
  
  	return &ret;
  }
 +
 +#endif
 diff --git a/vorbis.c b/vorbis.c
-index 748dfae..217ca49 100644
+index 37c544c..56eb046 100644
 --- a/vorbis.c
 +++ b/vorbis.c
 @@ -20,6 +20,8 @@
@@ -116,7 +116,7 @@ index 748dfae..217ca49 100644
  // 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) {
+@@ -293,3 +295,5 @@ struct codec *register_vorbis(void) {
  
  	return &ret;
  }
diff --git a/media-sound/squeezelite/squeezelite-0.9_beta_p7.ebuild b/media-sound/squeezelite/squeezelite-1.2.ebuild
index 2d90ba3..f215b65 100644
--- a/media-sound/squeezelite/squeezelite-0.9_beta_p7.ebuild
+++ b/media-sound/squeezelite/squeezelite-1.2.ebuild
@@ -4,12 +4,14 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic git-2
 
 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"
+
+EGIT_REPO_URI="https://code.google.com/p/squeezelite"
+GIT_ECLASS="git-2"
+EGIT_COMMIT="e0d50bbdf1729689a84e6ba3f3c2def72d5cfaae"
 
 LICENSE="GPL-3"
 SLOT="0"