1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00

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)
This commit is contained in:
Daniel Engberg 2023-03-19 21:59:49 +01:00
parent b0cbe86dd9
commit f826d5bc33
6 changed files with 10 additions and 96 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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());

View File

@ -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

View File

@ -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"