git: f826d5bc3318 - main - audio/squeezelite: Update to 1.9.9.1422
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 19 Mar 2023 21:03:00 UTC
The branch main has been updated by diizzy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f826d5bc3318501b675e8f1817b09730544a4422
commit f826d5bc3318501b675e8f1817b09730544a4422
Author: Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-03-19 20:59:49 +0000
Commit: Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-03-19 21:00:34 +0000
audio/squeezelite: Update to 1.9.9.1422
Fixes build with FFmpeg 6.0 and removes need of patches
PR: 270196
Reviewed by: Joachim Werner <jockl@pianojockl.org> (maintainer)
Tested by: Joachim Werner <jockl@pianojockl.org> (maintainer)
---
audio/squeezelite/Makefile | 12 +++++-----
audio/squeezelite/distinfo | 6 ++---
audio/squeezelite/files/patch-Makefile | 28 ------------------------
audio/squeezelite/files/patch-decode.c | 15 -------------
audio/squeezelite/files/patch-main.c | 11 ----------
audio/squeezelite/files/patch-squeezelite.h | 34 -----------------------------
6 files changed, 10 insertions(+), 96 deletions(-)
diff --git a/audio/squeezelite/Makefile b/audio/squeezelite/Makefile
index 3ec03328d5bc..7b94a2499034 100644
--- a/audio/squeezelite/Makefile
+++ b/audio/squeezelite/Makefile
@@ -1,6 +1,5 @@
PORTNAME= squeezelite
-PORTVERSION= 1.9.7.1253
-PORTREVISION= 1
+DISTVERSION= 1.9.9.1422
CATEGORIES= audio
MAINTAINER= jockl@pianojockl.org
@@ -17,10 +16,13 @@ LIB_DEPENDS= libfaad.so:audio/faad \
libvorbis.so:audio/libvorbis \
libogg.so:audio/libogg
-USES= gmake ssl
+USES= gmake localbase:ldflags ssl
USE_GITHUB= yes
GH_ACCOUNT= ralph-irving
-GH_TAGNAME= 7b13fd9
+GH_TAGNAME= 6394b3f
+
+CPPFLAGS+= -I${PREFIX}/include/portaudio2
+LDFLAGS+= -lportaudio -lm
OPTIONS_DEFINE= SSL FFMPEG RESAMPLE DSD SELFPIPE OPUS LINKALL
OPTIONS_DEFAULT=SSL RESAMPLE FFMPEG DSD LINKALL
@@ -38,7 +40,7 @@ LINKALL_VARS= MENV+=" -DLINKALL"
SELFPIPE_VARS= MENV+=" -DSELFPIPE"
OPUS_VARS= MENV+=" -DOPUS"
-MAKE_ENV= OPTS="-DGPIO ${MENV}"
+MAKE_ENV= OPTS="-DGPIO -DNO_MAD ${MENV}"
OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile \
libopus.so:audio/opus
diff --git a/audio/squeezelite/distinfo b/audio/squeezelite/distinfo
index f1b361f2216d..a5d58b3845c9 100644
--- a/audio/squeezelite/distinfo
+++ b/audio/squeezelite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591519528
-SHA256 (ralph-irving-squeezelite-1.9.7.1253-7b13fd9_GH0.tar.gz) = c79c5194d3ac39c4c11b0489c12a4158c6aff86eef4b5042494ad34393ebae0c
-SIZE (ralph-irving-squeezelite-1.9.7.1253-7b13fd9_GH0.tar.gz) = 166420
+TIMESTAMP = 1678789031
+SHA256 (ralph-irving-squeezelite-1.9.9.1422-6394b3f_GH0.tar.gz) = e7d7ab836d30f1fae6cbea53c3b4397976c97edb6870e4f6ebe7b184b83e5a3d
+SIZE (ralph-irving-squeezelite-1.9.9.1422-6394b3f_GH0.tar.gz) = 167177
diff --git a/audio/squeezelite/files/patch-Makefile b/audio/squeezelite/files/patch-Makefile
deleted file mode 100644
index 8920e6131b84..000000000000
--- a/audio/squeezelite/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig 2020-06-04 15:03:39 UTC
-+++ Makefile
-@@ -1,3 +1,7 @@
-+# FreeBSD's portaudio lives in usr/local
-+CPPFLAGS = -I/usr/local/include -I/usr/local/include/portaudio2 -I/usr/local/include/opus
-+LDFLAGS = -L/usr/local/lib /usr/local/lib/libportaudio.a -lm
-+
- #Cross compile support - create a Makefile which defines these three variables and then includes this Makefile...
- CFLAGS ?= -Wall -fPIC -O2
- CFLAGS += -fcommon
-@@ -24,7 +28,7 @@ OPT_PULSEAUDIO = -DPULSEAUDIO
- 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 output_pulse.c decode.c \
-- flac.c pcm.c mad.c vorbis.c mpg.c
-+ flac.c pcm.c vorbis.c mpg.c
-
- SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c
- SOURCES_FF = ffmpeg.c
-@@ -45,7 +49,7 @@ LINK_PULSEAUDIO = -lpulse
- LINK_SSL = -lssl -lcrypto
- LINK_ALAC = -lalac
-
--LINKALL = -lmad -lmpg123 -lFLAC -lvorbisfile -lvorbis -logg
-+LINKALL = -lmpg123 -lFLAC -lvorbisfile -lvorbis -logg
- LINKALL_FF = -lavformat -lavcodec -lavutil
- LINKALL_RESAMPLE = -lsoxr
- LINKALL_IR = -llirc_client
diff --git a/audio/squeezelite/files/patch-decode.c b/audio/squeezelite/files/patch-decode.c
deleted file mode 100644
index dff92cbd0348..000000000000
--- a/audio/squeezelite/files/patch-decode.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- decode.c.orig 2020-06-07 11:02:26 UTC
-+++ decode.c
-@@ -183,11 +183,7 @@ void decode_init(log_level level, const char *include_
- if (!strstr(exclude_codecs, "pcm") && (!include_codecs || (order_codecs = strstr(include_codecs, "pcm"))))
- sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_pcm());
-
-- // try mad then mpg for mp3 unless command line option passed
-- if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) &&
-- (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mad"))))
-- sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mad());
-- else if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) &&
-+ if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) &&
- (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mpg"))))
- sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg());
-
diff --git a/audio/squeezelite/files/patch-main.c b/audio/squeezelite/files/patch-main.c
deleted file mode 100644
index 1cb7edaf643c..000000000000
--- a/audio/squeezelite/files/patch-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig 2020-06-07 11:03:18 UTC
-+++ main.c
-@@ -51,7 +51,7 @@
- #else
- #define CODECS_DSD ""
- #endif
--#define CODECS_MP3 " (mad,mpg for specific mp3 codec)"
-+#define CODECS_MP3 ""
-
- #define CODECS CODECS_BASE CODECS_AAC CODECS_FF CODECS_OPUS CODECS_DSD CODECS_MP3
-
diff --git a/audio/squeezelite/files/patch-squeezelite.h b/audio/squeezelite/files/patch-squeezelite.h
deleted file mode 100644
index 1d3372c4202e..000000000000
--- a/audio/squeezelite/files/patch-squeezelite.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- squeezelite.h.orig 2020-06-07 11:03:51 UTC
-+++ squeezelite.h
-@@ -191,7 +191,6 @@
-
- #if LINUX
- #define LIBFLAC "libFLAC.so.8"
--#define LIBMAD "libmad.so.0"
- #define LIBMPG "libmpg123.so.0"
- #define LIBVORBIS "libvorbisfile.so.3"
- #define LIBOPUS "libopusfile.so.0"
-@@ -206,7 +205,6 @@
-
- #if OSX
- #define LIBFLAC "libFLAC.8.dylib"
--#define LIBMAD "libmad.0.dylib"
- #define LIBMPG "libmpg123.0.dylib"
- #define LIBVORBIS "libvorbisfile.3.dylib"
- #define LIBTREMOR "libvorbisidec.1.dylib"
-@@ -220,7 +218,6 @@
-
- #if WIN
- #define LIBFLAC "libFLAC.dll"
--#define LIBMAD "libmad-0.dll"
- #define LIBMPG "libmpg123-0.dll"
- #define LIBVORBIS "libvorbisfile.dll"
- #define LIBOPUS "libopusfile-0.dll"
-@@ -234,7 +231,6 @@
-
- #if FREEBSD
- #define LIBFLAC "libFLAC.so.8"
--#define LIBMAD "libmad.so.0"
- #define LIBMPG "libmpg123.so.0"
- #define LIBVORBIS "libvorbisfile.so.3"
- #define LIBTREMOR "libvorbisidec.so.1"