diff --git a/0001-Make-optional-AAC-support-via-libfaad.patch b/0001-Make-optional-AAC-support-via-libfaad.patch deleted file mode 100644 index 9bc1e26..0000000 --- a/0001-Make-optional-AAC-support-via-libfaad.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 12618412cbd482953b911d5ec3f01c94057635b3 Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Tue, 24 Apr 2018 13:58:36 +0100 -Subject: [PATCH] Make optional AAC support via libfaad - ---- - Makefile | 13 +++++++++++-- - decode.c | 2 ++ - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index cc7b52a..f59c7fc 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,11 +12,12 @@ OPT_VIS = -DVISEXPORT - OPT_IR = -DIR - OPT_GPIO = -DGPIO - OPT_RPI = -DRPI -+OPT_FAAD = -DFAAD - - SOURCES = \ - main.c slimproto.c buffer.c stream.c utils.c \ - output.c output_alsa.c output_pa.c output_stdout.c output_pack.c decode.c \ -- flac.c pcm.c mad.c vorbis.c faad.c mpg.c -+ flac.c pcm.c mad.c vorbis.c mpg.c - - SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c - SOURCES_FF = ffmpeg.c -@@ -24,14 +25,16 @@ SOURCES_RESAMPLE = process.c resample.c - SOURCES_VIS = output_vis.c - SOURCES_IR = ir.c - SOURCES_GPIO = gpio.c -+SOURCES_FAAD = faad.c - - LINK_LINUX = -ldl - LINK_RPI = -lwiringPi - --LINKALL = -lFLAC -lmad -lvorbisfile -lfaad -lmpg123 -+LINKALL = -lFLAC -lmad -lvorbisfile -lmpg123 - LINKALL_FF = -lavcodec -lavformat -lavutil - LINKALL_RESAMPLE = -lsoxr - LINKALL_IR = -llirc_client -+LINKALL_FAAD = -lfaad - - DEPS = squeezelite.h slimproto.h - -@@ -63,6 +66,9 @@ ifeq (,$(findstring $(SOURCES_GPIO), $(SOURCES))) - SOURCES += $(SOURCES_GPIO) - endif - endif -+ifneq (,$(findstring $(OPT_FAAD), $(OPTS))) -+ SOURCES += $(SOURCES_FAAD) -+endif - - # add optional link options - ifneq (,$(findstring $(OPT_LINKALL), $(OPTS))) -@@ -79,6 +85,9 @@ endif - ifneq (,$(findstring $(OPT_RPI), $(OPTS))) - LDADD += $(LINK_RPI) - endif -+ifneq (,$(findstring $(OPT_FAAD), $(OPTS))) -+ LDADD += $(LINKALL_FAAD) -+endif - else - # if not LINKALL and linux add LINK_LINUX - ifeq ($(UNAME), Linux) -diff --git a/decode.c b/decode.c -index 7a63a4d..161d5ac 100644 ---- a/decode.c -+++ b/decode.c -@@ -165,8 +165,10 @@ void decode_init(log_level level, const char *include_codecs, const char *exclud - if (!strstr(exclude_codecs, "wma") && (!include_codecs || (order_codecs = strstr(include_codecs, "wma")))) - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_ff("wma")); - #endif -+#if FAAD - if (!strstr(exclude_codecs, "aac") && (!include_codecs || (order_codecs = strstr(include_codecs, "aac")))) - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_faad()); -+#endif - if (!strstr(exclude_codecs, "ogg") && (!include_codecs || (order_codecs = strstr(include_codecs, "ogg")))) - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_vorbis()); - if (!strstr(exclude_codecs, "flac") && (!include_codecs || (order_codecs = strstr(include_codecs, "flac")))) --- -2.14.3 - diff --git a/sources b/sources index c534775..b0a1dfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (squeezelite-8386ece5d705c695afcd68ace1996b4818c65eb1.tar.gz) = 9e5ba24da33a8ff495259ef29bee3b6a8707cc6124912435cf8ca4ca983bc42d0791bfcbf137a33a73324eef863b2a1a908959981f063bc5238414f4a42a3192 +SHA512 (squeezelite-7607bcf0df0d9a4f6e054f89d36879d396bff840.tar.gz) = 5853ee624defd1b07779cad223995b1f6d37ae336ee6492e2609b530e4ab043dd22065f7100ff949b4467f3cc93cb047413716054690e1457e5fc6e19732f97a diff --git a/squeezelite.spec b/squeezelite.spec index 2fd3661..75fd472 100644 --- a/squeezelite.spec +++ b/squeezelite.spec @@ -1,5 +1,5 @@ %global forgeurl https://github.com/ralph-irving/squeezelite/ -%global commit 8386ece5d705c695afcd68ace1996b4818c65eb1 +%global commit 7607bcf0df0d9a4f6e054f89d36879d396bff840 %forgemeta # Raspberry Pi-specific GPIO support depends on the WiringPi library, @@ -16,8 +16,8 @@ Name: squeezelite -Version: 1.8.7.1083 -Release: 6%{?dist} +Version: 1.9.0.1093 +Release: 1%{?dist} Summary: Headless music player for streaming from Logitech Media Server # Squeezelite is released under the GPLv3 licence. @@ -32,9 +32,6 @@ Source3: %{name}.service.7.md Source4: %{name}.sysconfig Source5: %{name}.user.preset -# https://github.com/ralph-irving/squeezelite/pull/44 -Patch0: 0001-Make-optional-AAC-support-via-libfaad.patch - BuildRequires: alsa-lib-devel %if %{with faad} BuildRequires: faad2-devel @@ -65,13 +62,12 @@ used in place of dedicated Squeezebox network music playing hardware. %prep %forgesetup -%patch0 -p1 %build %set_build_flags -%make_build %{?with_ffmpeg:CPPFLAGS+="-I/usr/include/ffmpeg"} OPTS="-DDSD -DLINKALL -DRESAMPLE -DVISEXPORT -DIR -DGPIO %{?with_wiringpi:-DRPI} %{?with_ffmpeg:-DFFMPEG} %{?with_faad:-DFAAD}" +%make_build %{?with_ffmpeg:CPPFLAGS+="-I/usr/include/ffmpeg"} OPTS="-DDSD -DLINKALL -DRESAMPLE -DVISEXPORT -DIR -DGPIO %{?with_wiringpi:-DRPI} %{?with_ffmpeg:-DFFMPEG} %{?!with_faad:-DNO_FAAD}" pandoc --to=man --standalone --output=%{name}.service.7 %{SOURCE3} @@ -125,6 +121,9 @@ exit 0 %changelog +* Mon Apr 30 2018 Peter Oliver - 1.9.0.1093-7 +- Update to 1.9.0.1093. + * Thu Apr 26 2018 Peter Oliver - 1.8.7.1083-6 - Don't replace config file on update.