Attachment #248961 for bug #276601




PORTNAME=	aqualung
DISTVERSION=	1.2
PORTREVISION=	26
CATEGORIES=	audio
MASTER_SITES=	SF

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 \

		libmpcdec.so:audio/musepack \
		libspeex.so:audio/speex \
		libwavpack.so:audio/wavpack \
		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 \
		libfontconfig.so:x11-fonts/fontconfig

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

CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg/libdata/pkgconfig"
MAKE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg/libdata/pkgconfig"
LDFLAGS+=	-L${LOCALBASE}/ffmpeg/lib

DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
		"Audio;AudioVideo;GTK;" ""


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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/audio/aqualung/distinfo (-2 / +3 lines)
1	SHA256 (aqualung-1.0.tar.gz) = c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347	1	TIMESTAMP = 1709685891
2	SIZE (aqualung-1.0.tar.gz) = 2014854	2	SHA256 (jeremyevans-aqualung-1.2_GH0.tar.gz) = 361f7d493db46134eef1976805eb5b097bde3f181eb7eaeaa2a27541b4b328e9
		3	SIZE (jeremyevans-aqualung-1.2_GH0.tar.gz) = 1354656




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




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;
 




--- src/decoder/dec_mac.cpp.orig	2024-03-05 17:20:36 UTC
+++ src/decoder/dec_mac.cpp
@@ -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);
 

Return to bug 276601

Lines 1-24 Link Here

(-)b/audio/aqualung/Makefile (-18 / +18 lines)
1	PORTNAME= aqualung	1	PORTNAME= aqualung
2	PORTVERSION= 1.0	2	DISTVERSION= 1.2
3	PORTREVISION= 26
4	CATEGORIES= audio	3	CATEGORIES= audio
5	MASTER_SITES= SF
6		4
7	MAINTAINER= ports@FreeBSD.org	5	MAINTAINER= portmaster@BSDforge.com
8	COMMENT= Music player with rich features	6	COMMENT= Music player with rich features
9	WWW= https://aqualung.jeremyevans.net/	7	WWW= https://aqualung.jeremyevans.net/
10		8
11	LICENSE= GPLv2+	9	LICENSE= GPLv2+
12	LICENSE_FILE= ${WRKSRC}/COPYING	10	LICENSE_FILE= ${WRKSRC}/COPYING
13		11
14	DEPRECATED= Depends on legacy libraries such as GTK2 and FFmpeg 4, consider using audio/strawberry instead
15	EXPIRATION_DATE=2024-02-29
16
17	LIB_DEPENDS= libFLAC.so:audio/flac \	12	LIB_DEPENDS= libFLAC.so:audio/flac \
18	libmp3lame.so:audio/lame \	13	libmp3lame.so:audio/lame \
19	libcddb.so:audio/libcddb \	14	libcddb.so:audio/libcddb \
20	libmad.so:audio/libmad \	15	libmad.so:audio/libmad \
21	libmodplug.so:audio/libmodplug \	16	libmodplug.so:audio/libmodplug \
		17	libogg.so:audio/libogg \
22	liboggz.so:audio/liboggz \	18	liboggz.so:audio/liboggz \
23	libsamplerate.so:audio/libsamplerate \	19	libsamplerate.so:audio/libsamplerate \
24	libsndfile.so:audio/libsndfile \	20	libsndfile.so:audio/libsndfile \
Lines 27-47 LIB_DEPENDS= libFLAC.so:audio/flac \ Link Here
27	libmpcdec.so:audio/musepack \	23	libmpcdec.so:audio/musepack \
28	libspeex.so:audio/speex \	24	libspeex.so:audio/speex \
29	libwavpack.so:audio/wavpack \	25	libwavpack.so:audio/wavpack \
30	libavcodec.so.58:multimedia/ffmpeg4 \	26	libavcodec.so:multimedia/ffmpeg \
		27	libfreetype.so:print/freetype2 \
		28	libharfbuzz.so:print/harfbuzz \
		29	libcdio.so:sysutils/libcdio \
31	libcdio_paranoia.so:sysutils/libcdio-paranoia \	30	libcdio_paranoia.so:sysutils/libcdio-paranoia \
32	liblrdf.so:textproc/liblrdf	31	liblrdf.so:textproc/liblrdf \
		32	libfontconfig.so:x11-fonts/fontconfig
33		33
34	USES= compiler:c++11-lang cpe gettext gnome localbase lua:52 pkgconfig	34	USES= autoreconf compiler:c++11-lang cpe gettext gnome localbase lua:52 pkgconfig
35	USE_GNOME= gtk20 libxml2 libxslt	35	USE_GITHUB= yes
		36	GH_ACCOUNT= jeremyevans
		37	USE_GNOME+= cairo gdkpixbuf2 gtk20 libxml2 libxslt
36	GNU_CONFIGURE= yes	38	GNU_CONFIGURE= yes
37	GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share	39	GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
38
39	LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib
40	CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
41	MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
42
43	CONFIGURE_ARGS= --with-ifp=no	40	CONFIGURE_ARGS= --with-ifp=no
44		41
		42	CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg/libdata/pkgconfig"
		43	MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg/libdata/pkgconfig"
		44	LDFLAGS+= -L${LOCALBASE}/ffmpeg/lib
		45
45	DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \	46	DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
46	"Audio;AudioVideo;GTK;" ""	47	"Audio;AudioVideo;GTK;" ""
47		48
Lines 63-69 SNDIO_CONFIGURE_OFF= --with-sndio=no Link Here
63	post-patch:	64	post-patch:
64	# Remove unused duplicate global symbols (-fno-common)	65	# Remove unused duplicate global symbols (-fno-common)
65	@${REINPLACE_CMD} -E '/^g?char command/d' \	66	@${REINPLACE_CMD} -E '/^g?char command/d' \
66	${WRKSRC}/src/gui_main.c \	67	${WRKSRC}/src/gui_main.c
67	${WRKSRC}/src/playlist.c
68		68
69	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Removed Link Here

(-)a/audio/aqualung/files/patch-configure (-46 lines)
1	--- configure.orig 2022-05-07 20:29:57 UTC
2	+++ configure
3	@@ -9665,12 +9665,12 @@ if test -n "$mad_CFLAGS"; then
4	pkg_cv_mad_CFLAGS="$mad_CFLAGS"
5	elif test -n "$PKG_CONFIG"; then
6	if test -n "$PKG_CONFIG" && \
7	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5
8	- ($PKG_CONFIG --exists --print-errors "mad") 2>&5
9	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5
10	+ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5
11	ac_status=$?
12	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13	test $ac_status = 0; }; then
14	- pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "mad" 2>/dev/null`
15	+ pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "libmad" 2>/dev/null`
16	test "x$?" != "x0" && pkg_failed=yes
17	else
18	pkg_failed=yes
19	@@ -9682,12 +9682,12 @@ if test -n "$mad_LIBS"; then
20	pkg_cv_mad_LIBS="$mad_LIBS"
21	elif test -n "$PKG_CONFIG"; then
22	if test -n "$PKG_CONFIG" && \
23	- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5
24	- ($PKG_CONFIG --exists --print-errors "mad") 2>&5
25	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5
26	+ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5
27	ac_status=$?
28	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
29	test $ac_status = 0; }; then
30	- pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "mad" 2>/dev/null`
31	+ pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "libmad" 2>/dev/null`
32	test "x$?" != "x0" && pkg_failed=yes
33	else
34	pkg_failed=yes
35	@@ -9708,9 +9708,9 @@ else
36	_pkg_short_errors_supported=no
37	fi
38	if test $_pkg_short_errors_supported = yes; then
39	- mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mad" 2>&1`
40	+ mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmad" 2>&1`
41	else
42	- mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mad" 2>&1`
43	+ mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmad" 2>&1`
44	fi
45	# Put the nasty error message in config.log where it belongs
46	echo "$mad_PKG_ERRORS" >&5

Removed Link Here

(-)a/audio/aqualung/files/patch-ffmpeg3 (-24 lines)
1	From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
2	From: Jamie Heilman <jamie@audible.transient.net>
3	Date: Sun, 8 May 2016 19:34:36 +0000
4	Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
5
6	With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
7	were deprecated; the new default AVCodecContext.get_buffer2()
8	implementation works fine for us.
9
10	--- src/decoder/dec_lavc.c.orig 2015-04-19 12:49:49 UTC
11	+++ src/decoder/dec_lavc.c
12	@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char
13	return DECODER_OPEN_BADLIB;
14
15	pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
16	+#if LIBAVCODEC_VERSION_MAJOR < 55
17	#if LIBAVCODEC_VERSION_MAJOR >= 53
18	pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
19	pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
20	#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
21	+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
22
23	pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
24

Lines 1-11 Link Here

(-)b/audio/aqualung/files/patch-src_decoder_dec__mac.cpp (-6 / +6 lines)
1	--- src/decoder/dec_mac.cpp.orig 2015-04-19 12:49:49 UTC	1	--- src/decoder/dec_mac.cpp.orig 2024-03-05 17:20:36 UTC
2	+++ src/decoder/dec_mac.cpp	2	+++ src/decoder/dec_mac.cpp
3	@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char *	3	@@ -178,7 +178,7 @@
4		4	#ifdef __OpenBSD__
5		5	wchar_t * pUTF16 = GetUTF16FromANSI(filename);
6	int ret = 0;	6	#else
7	- wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);	7	- wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
8	+ wchar_t * pUTF16 = GetUTF16FromANSI(filename);	8	+ wchar_t * pUTF16 = GetUTF16FromANSI(filename);
		9	#endif
9	pdecompress = CreateIAPEDecompress(pUTF16, &ret);	10	pdecompress = CreateIAPEDecompress(pUTF16, &ret);
10	free(pUTF16);	11	free(pUTF16);
11