aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Hutchinson <portmaster@bsdforge.com>2024-03-06 19:18:37 +0000
committerGleb Popov <arrowd@FreeBSD.org>2024-03-06 19:19:09 +0000
commit77482fd613f088409e3c2ea8b112c6b4581e89c1 (patch)
tree801744d7dbf4a7617613acb7c51ef4720bb4ca36
parentc6c4a66b656c716b4972101e6ae2bfc2dcf00a87 (diff)
downloadports-77482fd613f088409e3c2ea8b112c6b4581e89c1.tar.gz
ports-77482fd613f088409e3c2ea8b112c6b4581e89c1.zip
audio/aqualung: Update to 1.2
PR: 276601
-rw-r--r--audio/aqualung/Makefile32
-rw-r--r--audio/aqualung/distinfo5
-rw-r--r--audio/aqualung/files/patch-configure46
-rw-r--r--audio/aqualung/files/patch-ffmpeg324
-rw-r--r--audio/aqualung/files/patch-src_decoder_dec__mac.cpp12
5 files changed, 23 insertions, 96 deletions
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 617f021bdcc7..347c92970d54 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -1,24 +1,20 @@
PORTNAME= aqualung
-PORTVERSION= 1.0
-PORTREVISION= 26
+DISTVERSION= 1.2
CATEGORIES= audio
-MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= portmaster@BSDforge.com
COMMENT= Music player with rich features
WWW= https://aqualung.jeremyevans.net/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Depends on legacy libraries such as GTK2 and FFmpeg 4, consider using audio/strawberry instead
-EXPIRATION_DATE=2024-02-29
-
LIB_DEPENDS= libFLAC.so:audio/flac \
libmp3lame.so:audio/lame \
libcddb.so:audio/libcddb \
libmad.so:audio/libmad \
libmodplug.so:audio/libmodplug \
+ libogg.so:audio/libogg \
liboggz.so:audio/liboggz \
libsamplerate.so:audio/libsamplerate \
libsndfile.so:audio/libsndfile \
@@ -27,19 +23,20 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
libmpcdec.so:audio/musepack \
libspeex.so:audio/speex \
libwavpack.so:audio/wavpack \
- libavcodec.so.58:multimedia/ffmpeg4 \
+ libavcodec.so:multimedia/ffmpeg \
+ libfreetype.so:print/freetype2 \
+ libharfbuzz.so:print/harfbuzz \
+ libcdio.so:sysutils/libcdio \
libcdio_paranoia.so:sysutils/libcdio-paranoia \
- liblrdf.so:textproc/liblrdf
+ liblrdf.so:textproc/liblrdf \
+ libfontconfig.so:x11-fonts/fontconfig
-USES= compiler:c++11-lang cpe gettext gnome localbase lua:52 pkgconfig
-USE_GNOME= gtk20 libxml2 libxslt
+USES= autoreconf compiler:c++11-lang cpe gettext gnome localbase lua:52 pkgconfig
+USE_GITHUB= yes
+GH_ACCOUNT= jeremyevans
+USE_GNOME= cairo gdkpixbuf2 gtk20 libxml2 libxslt
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-
-LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib
-CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
-MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
-
CONFIGURE_ARGS= --with-ifp=no
DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
@@ -63,7 +60,6 @@ SNDIO_CONFIGURE_OFF= --with-sndio=no
post-patch:
# Remove unused duplicate global symbols (-fno-common)
@${REINPLACE_CMD} -E '/^g?char command/d' \
- ${WRKSRC}/src/gui_main.c \
- ${WRKSRC}/src/playlist.c
+ ${WRKSRC}/src/gui_main.c
.include <bsd.port.mk>
diff --git a/audio/aqualung/distinfo b/audio/aqualung/distinfo
index e6b0fc9c1317..3ae386d4122a 100644
--- a/audio/aqualung/distinfo
+++ b/audio/aqualung/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aqualung-1.0.tar.gz) = c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347
-SIZE (aqualung-1.0.tar.gz) = 2014854
+TIMESTAMP = 1709685891
+SHA256 (jeremyevans-aqualung-1.2_GH0.tar.gz) = 361f7d493db46134eef1976805eb5b097bde3f181eb7eaeaa2a27541b4b328e9
+SIZE (jeremyevans-aqualung-1.2_GH0.tar.gz) = 1354656
diff --git a/audio/aqualung/files/patch-configure b/audio/aqualung/files/patch-configure
deleted file mode 100644
index 9868a1bc3b4a..000000000000
--- a/audio/aqualung/files/patch-configure
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.orig 2022-05-07 20:29:57 UTC
-+++ configure
-@@ -9665,12 +9665,12 @@ if test -n "$mad_CFLAGS"; then
- pkg_cv_mad_CFLAGS="$mad_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "mad") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "mad" 2>/dev/null`
-+ pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "libmad" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -9682,12 +9682,12 @@ if test -n "$mad_LIBS"; then
- pkg_cv_mad_LIBS="$mad_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "mad") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "mad" 2>/dev/null`
-+ pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "libmad" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -9708,9 +9708,9 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mad" 2>&1`
-+ mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmad" 2>&1`
- else
-- mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mad" 2>&1`
-+ mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmad" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$mad_PKG_ERRORS" >&5
diff --git a/audio/aqualung/files/patch-ffmpeg3 b/audio/aqualung/files/patch-ffmpeg3
deleted file mode 100644
index 225b6e2e5841..000000000000
--- a/audio/aqualung/files/patch-ffmpeg3
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
-From: Jamie Heilman <jamie@audible.transient.net>
-Date: Sun, 8 May 2016 19:34:36 +0000
-Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
-
-With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
-were deprecated; the new default AVCodecContext.get_buffer2()
-implementation works fine for us.
-
---- src/decoder/dec_lavc.c.orig 2015-04-19 12:49:49 UTC
-+++ src/decoder/dec_lavc.c
-@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char
- return DECODER_OPEN_BADLIB;
-
- pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
-
- pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
-
diff --git a/audio/aqualung/files/patch-src_decoder_dec__mac.cpp b/audio/aqualung/files/patch-src_decoder_dec__mac.cpp
index a47ed4abc8fa..561f868e5094 100644
--- a/audio/aqualung/files/patch-src_decoder_dec__mac.cpp
+++ b/audio/aqualung/files/patch-src_decoder_dec__mac.cpp
@@ -1,11 +1,11 @@
---- src/decoder/dec_mac.cpp.orig 2015-04-19 12:49:49 UTC
+--- src/decoder/dec_mac.cpp.orig 2024-03-05 17:20:36 UTC
+++ src/decoder/dec_mac.cpp
-@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char *
-
-
- int ret = 0;
+@@ -178,7 +178,7 @@
+ #ifdef __OpenBSD__
+ wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+ #else
- wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+ wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+ #endif
pdecompress = CreateIAPEDecompress(pUTF16, &ret);
free(pUTF16);
-