diff options
author | Stuart Hickinbottom <stuart@hickinbottom.com> | 2013-04-17 19:28:39 +0100 |
---|---|---|
committer | Stuart Hickinbottom <stuart@hickinbottom.com> | 2013-04-17 19:28:39 +0100 |
commit | b7fbc0117efff440333a3e9e33cf186cb005cc6c (patch) | |
tree | a265c6eb755578131581251d5187a74876fa0fa6 | |
parent | Merge tag 'lms-bin-7.7.2-r2-2' into develop (diff) | |
download | squeezebox-b7fbc0117efff440333a3e9e33cf186cb005cc6c.tar.gz squeezebox-b7fbc0117efff440333a3e9e33cf186cb005cc6c.tar.bz2 squeezebox-b7fbc0117efff440333a3e9e33cf186cb005cc6c.zip |
Bumped squeezelite to new upstream 1.1
-rw-r--r-- | media-sound/squeezelite/ChangeLog | 10 | ||||
-rw-r--r-- | media-sound/squeezelite/Manifest | 10 | ||||
-rw-r--r-- | media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-makefile.patch | 20 | ||||
-rw-r--r-- | media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-optional-codecs.patch | 154 | ||||
-rw-r--r-- | media-sound/squeezelite/files/squeezelite-1.1-gentoo-makefile.patch | 21 | ||||
-rw-r--r-- | media-sound/squeezelite/files/squeezelite-1.1-gentoo-optional-codecs.patch | 124 | ||||
-rw-r--r-- | media-sound/squeezelite/squeezelite-1.1.ebuild (renamed from media-sound/squeezelite/squeezelite-0.7_alpha_p2.ebuild) | 29 |
7 files changed, 178 insertions, 190 deletions
diff --git a/media-sound/squeezelite/ChangeLog b/media-sound/squeezelite/ChangeLog index 1321b1d..79485a5 100644 --- a/media-sound/squeezelite/ChangeLog +++ b/media-sound/squeezelite/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*squeezelite-1.1 (17 Apr 2013) + + 17 Apr 2013; Stuart Hickinbottom <stuart@hickinbottom.com> + -squeezelite-0.7_alpha_p2.ebuild, + -files/squeezelite-0.7_alpha_p2-gentoo-makefile.patch, + -files/squeezelite-0.7_alpha_p2-gentoo-optional-codecs.patch, + +squeezelite-1.1.ebuild, +files/squeezelite-1.1-gentoo-makefile.patch, + +files/squeezelite-1.1-gentoo-optional-codecs.patch: + Updated for upstream 1.1 release + *squeezelite-0.9_beta_p7 (15 Jan 2013) 15 Jan 2013; Stuart Hickinbottom <stuart@hickinbottom.com> diff --git a/media-sound/squeezelite/Manifest b/media-sound/squeezelite/Manifest index 0dc3603..7317a24 100644 --- a/media-sound/squeezelite/Manifest +++ b/media-sound/squeezelite/Manifest @@ -1,12 +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-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.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 7c64f298b78e9d3ef69ab29fc33c455a55dfe9ec.zip 54295 SHA256 f854099d1885d6a406fe6b834995006db35cf868ff05b2df504b6d893d626834 SHA512 95308c46f0daba2cd7bab18f3cfcb1f39c460e37406bd9721bbf4ee13665752963764e93f165d87286521ff6a586a057ade67a590e1dea41f345e0f55e0d0890 WHIRLPOOL aec0c19c067801b2a38a9555d3e184b53b7fa7f4d9cc84336736fc13a9c1b7d58876134cd5831c0cd38988adc8d9cc40a72a4da7cf2aead617affc6a9886a287 DIST ec4180b405ae4b67800096968a8ecbc7e33e4acb.zip 158785 SHA256 872da2d3e639850587d0fa7a4cd61975454579997557cfc8d6cfe292118432b8 SHA512 27f53447e2873f2e7ccb0d7486d4c074f4c3c17eea74d1c5c31f740f6b894e79fc22e75d60595ef951af673cb0a653365cbae45c30919c275879a5f47fac6cc9 WHIRLPOOL 3ae5e0bb73cf9260e55977fd8ff13d84dd0bf6aa743e2fd96209a04f4fffdae696963a0b0dbd559c74636235b50924f25e932c92817c55c4e459d2f9777056cc -EBUILD squeezelite-0.7_alpha_p2.ebuild 2102 SHA256 3fa402ae0c42bee63f4d68f69d7089370dd73fac58becc881679026a0cc96a1b SHA512 e484b78b12554aece345465a22b812f9cf87591f1be0ecd3d55482f12a315701bc7ad0405b73828b6c4152bd45b65fa74e81c3b0b610b55e4596f541515a88b9 WHIRLPOOL 195f4e8efebd88d495fa18ca2c8a1f803acd9ffd83b3f39fa6c6f5223706e31de7d3e12034c2ac1d380561c99063870bb438c3a7790492524dc227bd14f77bbe EBUILD squeezelite-0.9_beta_p7.ebuild 2272 SHA256 760af66f85c8c8bff0c0bcccc2ac5ec01d0e68c480f60a188a67a9defa2d647b SHA512 d822a198f0099b9fd7496644ced07f41f3ab7d18f48e84f73244a321efce572cd5ec51d788e4a8456d4fabef841edcf800f62d518e0a7fc120bf5cd3b3db800b WHIRLPOOL 1d6de8f28066e61ad7fcf9af387fe7ff91abd2a0c4d603875abbc05fea32a2e4c94890a21f107c1ec36999eb2684c717470756053d72364c1b10243cc537df42 -MISC ChangeLog 670 SHA256 863500c4330462172ccad25da88544de5a1bb81d2c498d60ca4db3f75b5a24a4 SHA512 ab92a248f5f7b59cc6ee9066db34ae3a27ebd9fe3fca036c2b5cedcb16cc49a443fd8cc5b3aaa8535165b2a25865750f96b7ca35a3deb84231c97d2366a36c82 WHIRLPOOL 4de384d2c7cc2ef214854594b95b053f9863ba6928f2c211525c9bb27b9f17903042e1714b1eebc61e5c439a7810b4358ff136d80301d312223b3467c9045409 +EBUILD squeezelite-1.1.ebuild 2272 SHA256 9de674158faa0809d812eef6606e4b6290d2e63a88f63ba2a22f2b428c5327ab SHA512 cf68cfa109d095fc55975b77a225a92cd4d3110015bbe8bb665934806ea80647baaaf74d676da3ce1c37582fa24fa0fed8f9a00877f6236c467a43fac686202d WHIRLPOOL 24fe918a94a6d6b6eb4b142f09d8b3cd53c4320bccaa46da215091a42ef1dc68f0eff29dc74fd579421716cc13245777e839c96338a2ec8e6a63828ab76b28fb +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.7_alpha_p2-gentoo-makefile.patch b/media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-makefile.patch deleted file mode 100644 index 302db6f..0000000 --- a/media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Makefile b/Makefile -index d1aaf3c..038ab84 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,10 +1,12 @@ --CFLAGS = -Wall -fPIC -O2 --LDFLAGS = -lasound -lpthread -ldl -lrt -+MYLIBS = -lasound -lpthread -ldl -lrt - - all: squeezelite - -+clean: -+ rm *.o squeezelite 2>/dev/null || true -+ - squeezelite: main.o slimproto.o utils.o output.o buffer.o stream.o decode.o flac.o pcm.o mad.o vorbis.o faad.o -- $(CC) $(CFLAGS) main.o slimproto.o utils.o output.o buffer.o stream.o decode.o flac.o pcm.o mad.o vorbis.o faad.o $(LDFLAGS) -o squeezelite -+ $(CC) $(CFLAGS) main.o slimproto.o utils.o output.o buffer.o stream.o decode.o flac.o pcm.o mad.o vorbis.o faad.o $(LDFLAGS) $(MYLIBS) -o squeezelite - - main.o: main.c squeezelite.h - $(CC) $(CFLAGS) -c main.c -o main.o diff --git a/media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-optional-codecs.patch b/media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-optional-codecs.patch deleted file mode 100644 index 99653d0..0000000 --- a/media-sound/squeezelite/files/squeezelite-0.7_alpha_p2-gentoo-optional-codecs.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/Makefile b/Makefile -index 038ab84..f3385d3 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,37 +9,37 @@ squeezelite: main.o slimproto.o utils.o output.o buffer.o stream.o decode.o flac - $(CC) $(CFLAGS) main.o slimproto.o utils.o output.o buffer.o stream.o decode.o flac.o pcm.o mad.o vorbis.o faad.o $(LDFLAGS) $(MYLIBS) -o squeezelite - - main.o: main.c squeezelite.h -- $(CC) $(CFLAGS) -c main.c -o main.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c main.c -o main.o - - slimproto.o: slimproto.c squeezelite.h slimproto.h -- $(CC) $(CFLAGS) -c slimproto.c -o slimproto.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c slimproto.c -o slimproto.o - - utils.o: utils.c squeezelite.h -- $(CC) $(CFLAGS) -c utils.c -o utils.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c utils.c -o utils.o - - output.o: output.c squeezelite.h -- $(CC) $(CFLAGS) -c output.c -o output.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c output.c -o output.o - - buffer.o: buffer.c squeezelite.h -- $(CC) $(CFLAGS) -c buffer.c -o buffer.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c buffer.c -o buffer.o - - stream.o: stream.c squeezelite.h -- $(CC) $(CFLAGS) -c stream.c -o stream.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c stream.c -o stream.o - - decode.o: decode.c squeezelite.h -- $(CC) $(CFLAGS) -c decode.c -o decode.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c decode.c -o decode.o - - flac.o: flac.c squeezelite.h -- $(CC) $(CFLAGS) -c flac.c -o flac.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c flac.c -o flac.o - - pcm.o: pcm.c squeezelite.h -- $(CC) $(CFLAGS) -c pcm.c -o pcm.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c pcm.c -o pcm.o - - mad.o: mad.c squeezelite.h -- $(CC) $(CFLAGS) -c mad.c -o mad.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c mad.c -o mad.o - - vorbis.o: vorbis.c squeezelite.h -- $(CC) $(CFLAGS) -c vorbis.c -o vorbis.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c vorbis.c -o vorbis.o - - faad.o: faad.c squeezelite.h -- $(CC) $(CFLAGS) -c faad.c -o faad.o -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c faad.c -o faad.o -diff --git a/decode.c b/decode.c -index 9839d2e..340f580 100644 ---- a/decode.c -+++ b/decode.c -@@ -95,11 +95,19 @@ void decode_init(log_level level, const char *opt) { - // register codecs - // alc,wma,wmap,wmal,aac,spt,ogg,ogf,flc,aif,pcm,mp3 - int i = 0; -+#ifndef SL_NO_AAC - if (!opt || !strcmp(opt, "aac")) codecs[i++] = register_faad(); -+#endif -+#ifndef SL_NO_OGG - if (!opt || !strcmp(opt, "ogg")) codecs[i++] = register_vorbis(); -+#endif -+#ifndef SL_NO_FLAC - if (!opt || !strcmp(opt, "flac")) codecs[i++] = register_flac(); -+#endif - if (!opt || !strcmp(opt, "pcm")) codecs[i++] = register_pcm(); -+#ifndef SL_NO_MP3 - if (!opt || !strcmp(opt, "mp3")) codecs[i++] = register_mad(); -+#endif - - pthread_attr_t attr; - pthread_attr_init(&attr); -diff --git a/faad.c b/faad.c -index 40b18a0..71cc77f 100644 ---- a/faad.c -+++ b/faad.c -@@ -20,6 +20,8 @@ - - #include "squeezelite.h" - -+#ifndef SL_NO_AAC -+ - #include <neaacdec.h> - #include <dlfcn.h> - -@@ -569,3 +571,5 @@ struct codec *register_faad(void) { - - return &ret; - } -+ -+#endif -diff --git a/flac.c b/flac.c -index 07e9c55..020a8eb 100644 ---- a/flac.c -+++ b/flac.c -@@ -20,6 +20,8 @@ - - #include "squeezelite.h" - -+#ifndef SL_NO_FLAC -+ - #include <FLAC/stream_decoder.h> - #include <dlfcn.h> - -@@ -212,3 +214,5 @@ struct codec *register_flac(void) { - - return &ret; - } -+ -+#endif -diff --git a/mad.c b/mad.c -index 842ec77..3ae14c7 100644 ---- a/mad.c -+++ b/mad.c -@@ -20,6 +20,8 @@ - - #include "squeezelite.h" - -+#ifndef SL_NO_MP3 -+ - #include <mad.h> - #include <dlfcn.h> - -@@ -298,3 +300,5 @@ struct codec *register_mad(void) { - - return &ret; - } -+ -+#endif -diff --git a/vorbis.c b/vorbis.c -index 3aa820e..5ecc024 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: - #define LIBVORBIS "libvorbisfile.so.3" - #define LIBTREMOR "libvorbisidec.so.1" -@@ -236,3 +238,5 @@ struct codec *register_vorbis(void) { - - return &ret; - } -+ -+#endif diff --git a/media-sound/squeezelite/files/squeezelite-1.1-gentoo-makefile.patch b/media-sound/squeezelite/files/squeezelite-1.1-gentoo-makefile.patch new file mode 100644 index 0000000..ec6e927 --- /dev/null +++ b/media-sound/squeezelite/files/squeezelite-1.1-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-1.1-gentoo-optional-codecs.patch b/media-sound/squeezelite/files/squeezelite-1.1-gentoo-optional-codecs.patch new file mode 100644 index 0000000..dfef099 --- /dev/null +++ b/media-sound/squeezelite/files/squeezelite-1.1-gentoo-optional-codecs.patch @@ -0,0 +1,124 @@ +diff --git a/decode.c b/decode.c +index 81589a3..6ba6680 100644 +--- a/decode.c ++++ b/decode.c +@@ -103,14 +103,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 + + mutex_create(decode.mutex); + +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 df335c6..67b07a7 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 + +@@ -252,3 +254,5 @@ struct codec *register_vorbis(void) { + + return &ret; + } ++ ++#endif diff --git a/media-sound/squeezelite/squeezelite-0.7_alpha_p2.ebuild b/media-sound/squeezelite/squeezelite-1.1.ebuild index 9d261db..d190449 100644 --- a/media-sound/squeezelite/squeezelite-0.7_alpha_p2.ebuild +++ b/media-sound/squeezelite/squeezelite-1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -8,18 +8,19 @@ 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/866fcc7c7e14f354da27fd64f50069e762abd835.zip" -S="${WORKDIR}/squeezelite-866fcc7c7e14" +SRC_URI="https://squeezelite.googlecode.com/archive/7c64f298b78e9d3ef69ab29fc33c455a55dfe9ec.zip" +S="${WORKDIR}/squeezelite-7c64f298b78e" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="flac vorbis mp3 aac" +IUSE="flac vorbis mad mpg123 aac" DEPEND="media-libs/alsa-lib flac? ( media-libs/flac ) vorbis? ( media-libs/libvorbis ) - mp3? ( media-libs/libmad ) + mad? ( media-libs/libmad ) + mpg123? ( media-sound/mpg123 ) aac? ( media-libs/faad2 ) " RDEPEND="${DEPEND} @@ -41,19 +42,25 @@ 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-cppflags "-DSL_NO_FLAC" + append-cflags "-DSL_NO_FLAC" einfo "FLAC support disabled; add 'flac' USE flag if you need it" fi if ! use vorbis; then - append-cppflags "-DSL_NO_OGG" + append-cflags "-DSL_NO_OGG" einfo "Ogg/Vorbis support disabled; add 'vorbis' USE flag if you need it" fi - if ! use mp3; then - append-cppflags "-DSL_NO_MP3" - einfo "MP3 support disabled; add 'mp3' USE flag if you need it" + 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-cppflags "-DSL_NO_AAC" + append-cflags "-DSL_NO_AAC" einfo "AAC support disabled; add 'aac' USE flag if you need it" fi |