package/squeezelite: bump to version 71c012ad9ba102feb95823b7b9dc17e5305689c7
PATCH 1/4 package/squeezelite: bump to version 71c012ad9ba102feb95823b7b9dc17e5305689c7
- Switch site to https://github.com/ralph-irving/squeezelite
- Remove all patches (already in version)
- Update hash of license file (new author added:
https://github.com/ralph-irving/squeezelite/commit/b8e5cd2d94fd280b8e858dd52ba05a7c6b07a514)
--- ...ile-allow-passing-CFLAGS-and-LDFLAGS.patch | 54 --------------- ...utput_alsa-use-mallopt-only-on-glibc.patch | 34 ---------- .../0003-Replace-deprecated-FFmpeg-API.patch | 65 ------------------- .../0004-Fix-FTBFS-with-FFmpeg-4.0.patch | 31 --------- package/squeezelite/Config.in | 2 +- package/squeezelite/squeezelite.hash | 4 +- package/squeezelite/squeezelite.mk | 4 +- 7 files changed, 5 insertions(+), 189 deletions(-) delete mode 100644 package/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch delete mode 100644 package/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch delete mode 100644 package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch delete mode 100644 package/squeezelite/0004-Fix-FTBFS-with-FFmpeg-4.0.patch
package/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch deleted +0 -54
@@ -1,54 +0,0 @@ -From a0f2e79d1373967dac9f3df4c500a71cd1b96b2b Mon Sep 17 00:00:00 2001 -From: Hiroshi Kawashima <[email protected]> -Date: Sun, 7 Feb 2016 18:04:53 +0100 -Subject: [PATCH] Makefile: allow passing CFLAGS and LDFLAGS - -This patch is applied to squeezelite Makefile to add override -directive for CFLAGS and LDFLAGS assignment. -This enables adding flags to CFLAGS and LDFLAGS in Makefile. - -Signed-off-by: Hiroshi Kawashima <[email protected]> ---- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index dca2abd..286c725 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,6 @@ - # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile... -+override CFLAGS += $(OPTS) -+override LDFLAGS += -lasound -lpthread -lm -lrt - CFLAGS ?= -Wall -fPIC -O2 $(OPTS) - LDFLAGS ?= -lasound -lpthread -lm -lrt - EXECUTABLE ?= squeezelite -@@ -52,20 +54,20 @@ endif - - # add optional link options - ifneq (,$(findstring $(OPT_LINKALL), $(CFLAGS))) -- LDFLAGS += $(LINKALL) -+ override LDFLAGS += $(LINKALL) - ifneq (,$(findstring $(OPT_FF), $(CFLAGS))) -- LDFLAGS += $(LINKALL_FF) -+ override LDFLAGS += $(LINKALL_FF) - endif - ifneq (,$(findstring $(OPT_RESAMPLE), $(CFLAGS))) -- LDFLAGS += $(LINKALL_RESAMPLE) -+ override LDFLAGS += $(LINKALL_RESAMPLE) - endif - ifneq (,$(findstring $(OPT_IR), $(CFLAGS))) -- LDFLAGS += $(LINKALL_IR) -+ override LDFLAGS += $(LINKALL_IR) - endif - else - # if not LINKALL and linux add LINK_LINUX - ifeq ($(UNAME), Linux) -- LDFLAGS += $(LINK_LINUX) -+ override LDFLAGS += $(LINK_LINUX) - endif - endif - --- -2.6.4 -
package/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 903922a7bcf06e04d9830b47bba6d65ed37304c1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Sun, 7 Feb 2016 18:05:56 +0100 -Subject: [PATCH] output_alsa: use mallopt() only on glibc - -The musl C library does not provide the glibc specific mallopt() -functionality, so use it only when __GLIBC__ is defined. - -uClibc pretends to be glibc by defining __GLIBC__, but it implements -mallopt(), so it works fine. - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - output_alsa.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/output_alsa.c b/output_alsa.c -index aa01560..44c9fc7 100644 ---- a/output_alsa.c -+++ b/output_alsa.c -@@ -862,8 +862,10 @@ void output_init_alsa(log_level level, const char *device, unsigned output_buf_s - LOG_INFO("memory locked"); - } - -+#ifdef __GLIBC__ - mallopt(M_TRIM_THRESHOLD, -1); - mallopt(M_MMAP_MAX, 0); -+#endif - - touch_memory(silencebuf, MAX_SILENCE_FRAMES * BYTES_PER_FRAME); - touch_memory(outputbuf->buf, outputbuf->size); --- -2.6.4 -
package/squeezelite/0003-Replace-deprecated-FFmpeg-API.patch deleted +0 -65
65 lines not on this page · raw message
package/squeezelite/0004-Fix-FTBFS-with-FFmpeg-4.0.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 4ad37284447e768d641768c7c8a69c4640c83181 Mon Sep 17 00:00:00 2001 -From: James Cowgill <[email protected]> -Date: Sat, 18 Aug 2018 13:26:59 +0200 -Subject: [PATCH] Fix FTBFS with FFmpeg 4.0 - -Bug-Debian: https://bugs.debian.org/888335 - -Downloaded from Debian: -https://sources.debian.org/src/squeezelite/1.8-4.1/debian/patches/ffmpeg4.0.patch/ - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - ffmpeg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ffmpeg.c b/ffmpeg.c -index bc9136c..d51b08e 100644 ---- a/ffmpeg.c -+++ b/ffmpeg.c -@@ -264,7 +264,7 @@ static decode_state ff_decode(void) { - ff->mmsh_bytes_left = ff->mmsh_bytes_pad = ff->mmsh_packet_len = 0; - - if (!ff->readbuf) { -- ff->readbuf = AV(ff, malloc, READ_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); -+ ff->readbuf = AV(ff, malloc, READ_SIZE + AV_INPUT_BUFFER_PADDING_SIZE); - } - - avio = AVIO(ff, alloc_context, ff->readbuf, READ_SIZE, 0, NULL, _read_data, NULL, NULL); --- -2.18.0 -
package/squeezelite/Config.in +1 -1
@@ -14,7 +14,7 @@ config BR2_PACKAGE_SQUEEZELITE help Logitech Media Server client - https://code.google.com/p/squeezelite/ + https://github.com/ralph-irving/squeezelite/ if BR2_PACKAGE_SQUEEZELITE
package/squeezelite/squeezelite.hash +2 -2
@@ -1,3 +1,3 @@ # Locally calculated -sha256 0c844e7714d3f15325629c59ee75e6309763116e61a6b73486b502e2e5cce5fd squeezelite-v1.8.tar.gz -sha256 3e4379e1f34b8c5da00e545cfe94369b94a57745902c5d12be43b6332c34c04e LICENSE.txt +sha256 7f0342f4943d3c3498d930060f5a1e8d63ccb7282b9c21f964926e310449d592 squeezelite-71c012ad9ba102feb95823b7b9dc17e5305689c7.tar.gz +sha256 dc01c3da33fea11ed918f9e437b88baa59c70401aab0dad747e33dd9e8035706 LICENSE.txt
package/squeezelite/squeezelite.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -SQUEEZELITE_VERSION = v1.8 -SQUEEZELITE_SITE = $(call github,robadenshi,squeezelite,$(SQUEEZELITE_VERSION)) +SQUEEZELITE_VERSION = 71c012ad9ba102feb95823b7b9dc17e5305689c7 +SQUEEZELITE_SITE = $(call github,ralph-irving,squeezelite,$(SQUEEZELITE_VERSION)) SQUEEZELITE_LICENSE = GPL-3.0 SQUEEZELITE_LICENSE_FILES = LICENSE.txt SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123
Signature · 1 line
2.20.1
PATCH 2/4 package/squeezelite: add optional lirc-tools dependency
--- package/squeezelite/Config.in | 8 ++++++++ package/squeezelite/squeezelite.mk | 5 +++++ 2 files changed, 13 insertions(+)
package/squeezelite/Config.in +8 -0
@@ -27,6 +27,14 @@ config BR2_PACKAGE_SQUEEZELITE_FFMPEG config BR2_PACKAGE_SQUEEZELITE_DSD bool "Enable DSD decoding" +config BR2_PACKAGE_SQUEEZELITE_LIRC + bool "Enable lirc support" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIRC_TOOLS + +comment "lirc support needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_SQUEEZELITE_RESAMPLE bool "Enable resampling support" select BR2_PACKAGE_LIBSOXR
package/squeezelite/squeezelite.mk +5 -0
@@ -20,6 +20,11 @@ ifeq ($(BR2_PACKAGE_SQUEEZELITE_DSD),y) SQUEEZELITE_MAKE_OPTS += -DDSD endif +ifeq ($(BR2_PACKAGE_SQUEEZELITE_LIRC),y) +SQUEEZELITE_DEPENDENCIES += lirc-tools +SQUEEZELITE_MAKE_OPTS += -DIR +endif + ifeq ($(BR2_PACKAGE_SQUEEZELITE_RESAMPLE),y) SQUEEZELITE_DEPENDENCIES += libsoxr SQUEEZELITE_MAKE_OPTS += -DRESAMPLE
Signature · 1 line
2.20.1
PATCH 3/4 package/squeezelite: add optional wiringpi dependency
In reply to Fabrice Fontaine--- package/squeezelite/squeezelite.mk | 5 +++++ 1 file changed, 5 insertions(+)
package/squeezelite/squeezelite.mk +5 -0
@@ -34,6 +34,11 @@ ifeq ($(BR2_PACKAGE_SQUEEZELITE_VISEXPORT),y) SQUEEZELITE_MAKE_OPTS += -DVISEXPORT endif +ifeq ($(BR2_PACKAGE_WIRINGPI),y) +SQUEEZELITE_DEPENDENCIES += wiringpi +SQUEEZELITE_MAKE_OPTS += -DRPI +endif + define SQUEEZELITE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ OPTS="$(SQUEEZELITE_MAKE_OPTS)" -C $(@D) all
Signature · 1 line
2.20.1
PATCH 4/4 package/squeezelite: faad2 is an optional dependency
In reply to Fabrice Fontaine--- package/squeezelite/Config.in | 1 - package/squeezelite/squeezelite.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
package/squeezelite/Config.in +0 -1
@@ -9,7 +9,6 @@ config BR2_PACKAGE_SQUEEZELITE select BR2_PACKAGE_FLAC select BR2_PACKAGE_LIBMAD select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_FAAD2 select BR2_PACKAGE_MPG123 help Logitech Media Server client
package/squeezelite/squeezelite.mk +7 -1
@@ -8,9 +8,15 @@ SQUEEZELITE_VERSION = 71c012ad9ba102feb95823b7b9dc17e5305689c7 SQUEEZELITE_SITE = $(call github,ralph-irving,squeezelite,$(SQUEEZELITE_VERSION)) SQUEEZELITE_LICENSE = GPL-3.0 SQUEEZELITE_LICENSE_FILES = LICENSE.txt -SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123 +SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis mpg123 SQUEEZELITE_MAKE_OPTS = -DLINKALL +ifeq ($(BR2_PACKAGE_FAAD2),y) +SQUEEZELITE_DEPENDENCIES += faad2 +else +SQUEEZELITE_MAKE_OPTS += -DNO_FAAD +endif + ifeq ($(BR2_PACKAGE_SQUEEZELITE_FFMPEG),y) SQUEEZELITE_DEPENDENCIES += ffmpeg SQUEEZELITE_MAKE_OPTS += -DFFMPEG
Signature · 1 line
2.20.1
PATCH 1/4 package/squeezelite: bump to version 71c012ad9ba102feb95823b7b9dc17e5305689c7
In reply to Fabrice FontaineHello,
Quoted 1 line · On Sat, 6 Apr 2019 18:57:57 +0200 Fabrice Fontaine…
- Switch site to https://github.com/ralph-irving/squeezelite
What makes this upstream better / more official than the current one we're using ? Admittedly, the current one doesn't look very official either, but I'm curious about how you decided to choose this "other" upstream.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/4 package/squeezelite: bump to version 71c012ad9ba102feb95823b7b9dc17e5305689c7
Hello,
Le mer. 10 avr. 2019 ? 19:41, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 6 lines
Hello,
On Sat, 6 Apr 2019 18:57:57 +0200
Fabrice Fontaine <[email protected]> wrote:
Quoted 6 lines
Quoted 1 line
- Switch site to https://github.com/ralph-irving/squeezelite
What makes this upstream better / more official than the current one we're using ? Admittedly, the current one doesn't look very official either, but I'm curious about how you decided to choose this "other" upstream.
The current upstream has been automatically exported from code.google.com/p/squeezelite and has seen no updates since 4 years.
The new upstream:
- is active (updated nineteen days ago)
- included our four patches
- is declared as the official repository on wikipedia
(https://en.wikipedia.org/wiki/Squeezelite)
- has drawn interest from debian maintainer
(https://github.com/ralph-irving/squeezelite/issues/29) even if debian did not switch to this fork (probably because of the lack of official releases).
That's why I decided to choose it as the "new" upstream. I'll open a new issue on github to ask for a new release.
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice