This updates Aqualung to the latest version. The main change is a
switch from Gtk2 to Gtk3. Release announcement at
https://github.com/jeremyevans/aqualung/releases/tag/2.0
Ports-wise, this drops the CDDA support from the build. My experience
is the CDDA support causes problems if you are trying to rip a CD while
playing audio with Aqualung, even if you aren't using Aqualung to play
an audio CD. This drops all distpatches, as they are included in the
release. This also bumps the autoconf version.
Will be committing in a couple days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 Makefile
--- Makefile 10 Sep 2023 03:21:19 -0000 1.62
+++ Makefile 17 Feb 2025 22:56:17 -0000
@@ -1,9 +1,8 @@
COMMENT= advanced music player
-VERSION= 1.2
+VERSION= 2.0
DISTNAME= aqualung-${VERSION}
EPOCH= 0
-REVISION= 0
CATEGORIES= audio
HOMEPAGE= https://github.com/jeremyevans/aqualung
@@ -18,17 +17,12 @@ WANTLIB += Xrandr Xrender atk-1.0 bz2 c
WANTLIB += freetype gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
WANTLIB += harfbuzz iconv intl m mp3lame ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio ${COMPILER_LIBCXX}
-WANTLIB += vorbis vorbisenc vorbisfile z gtk-x11-2.0 gdk-x11-2.0
+WANTLIB += vorbis vorbisenc vorbisfile z cairo-gobject gdk-3 gtk-3
WANTLIB += gdk_pixbuf-2.0 xml2 MAC mad mpcdec FLAC avcodec
-WANTLIB += avformat avutil wavpack lrdf oggz speex cddb cdio
-WANTLIB += cdio_cdda cdio_paranoia modplug ${MODLUA_WANTLIB}
+WANTLIB += avformat avutil wavpack lrdf oggz speex cddb
+WANTLIB += modplug ${MODLUA_WANTLIB}
SITES= https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
-SITES.github = https://github.com/jeremyevans/aqualung/commit/
-PATCHFILES.github =
aqualung-lavc-fix{0ecc6721d5078c0bc9cae771d485c8d676443c23}.diff \
-
aqualung-mac-fix1{a991c13d0df734a5d0fea7db6b181176858f3e58}.diff \
-
aqualung-mac-fix2{d2c88317b6042a05c236faf3c09f600337c6379e}.diff
-PATCH_DIST_STRIP= -p1
COMPILER = base-clang ports-gcc base-gcc
@@ -38,8 +32,6 @@ MODLUA_SA= Yes
LIB_DEPENDS= audio/flac \
audio/lame \
- audio/libcdio \
- audio/libcdio-paranoia \
audio/libcddb \
audio/libmad \
audio/libmodplug \
@@ -54,7 +46,7 @@ LIB_DEPENDS= audio/flac \
multimedia/oggz \
textproc/liblrdf \
textproc/libxml \
- x11/gtk+2 \
+ x11/gtk+3 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS= devel/desktop-file-utils
@@ -64,7 +56,7 @@ CFLAGS+= -DPTHREAD_MIN_PRIORITY=0 -DPTHR
-I${LOCALBASE}/include -I${MODLUA_INCL_DIR}
BUILD_DEPENDS= devel/gettext,-tools
-AUTOCONF_VERSION=2.69
+AUTOCONF_VERSION=2.71
AUTOMAKE_VERSION=1.16
CONFIGURE_STYLE= gnu autoreconf
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib " \
@@ -72,8 +64,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/l
lua_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
# ifp (requires libifp) - no package
-CONFIGURE_ARGS= --with-cdda \
- --with-cddb \
+CONFIGURE_ARGS= --with-cddb \
--with-flac \
--with-ladspa \
--with-lame \
@@ -91,6 +82,7 @@ CONFIGURE_ARGS= --with-cdda \
--with-vorbisenc \
--with-wavpack \
--without-alsa \
+ --without-cdda \
--without-ifp \
--without-jack \
--without-oss \
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/aqualung/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 10 Sep 2023 03:21:19 -0000 1.10
+++ distinfo 17 Feb 2025 22:56:17 -0000
@@ -1,8 +1,2 @@
-SHA256 (aqualung-1.2.tar.gz) = Myv6Dqni97/ZZrl5h7dTf2i42o1WO6xKuYb6RBjc7TI=
-SHA256 (aqualung-lavc-fix.diff) = Gn02s7AupRnhFaok5eSqXUPEkNUBSg8oFI/ghurzd8Y=
-SHA256 (aqualung-mac-fix1.diff) = dlWy85euQNvffxULYNtW+lzI/7oKjoEIMgl2A7zvXAs=
-SHA256 (aqualung-mac-fix2.diff) = FQZt6MN1QNv1uVLhjVLjVbzz1csBY/eFSpkt8CZXDSI=
-SIZE (aqualung-1.2.tar.gz) = 1974910
-SIZE (aqualung-lavc-fix.diff) = 745
-SIZE (aqualung-mac-fix1.diff) = 7159
-SIZE (aqualung-mac-fix2.diff) = 1641
+SHA256 (aqualung-2.0.tar.gz) = RP/p2Ai7QxQHaIT5H47OKEpvkkUA5jHRIiWQa9v4CBo=
+SIZE (aqualung-2.0.tar.gz) = 1657433
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/aqualung/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST
--- pkg/PLIST 11 Mar 2022 18:20:04 -0000 1.11
+++ pkg/PLIST 17 Feb 2025 22:56:17 -0000
@@ -28,118 +28,30 @@ share/aqualung/ms-track.png
share/aqualung/music_store.png
share/aqualung/playlist.png
share/aqualung/rva.png
-share/aqualung/skin/
-share/aqualung/skin/dark/
-share/aqualung/skin/dark/btn_bg1.png
-share/aqualung/skin/dark/btn_bg2.png
-share/aqualung/skin/dark/btn_bg3.png
-share/aqualung/skin/dark/next.png
-share/aqualung/skin/dark/pause.png
-share/aqualung/skin/dark/play.png
-share/aqualung/skin/dark/play_pause.png
-share/aqualung/skin/dark/prev.png
-share/aqualung/skin/dark/rc
-share/aqualung/skin/dark/repeat.png
-share/aqualung/skin/dark/repeat_all.png
-share/aqualung/skin/dark/scale_bg.png
-share/aqualung/skin/dark/shuffle.png
-share/aqualung/skin/dark/stop.png
-share/aqualung/skin/dark/time_bg.png
-share/aqualung/skin/dark/title_bg.png
-share/aqualung/skin/default/
-share/aqualung/skin/default/bg.png
-share/aqualung/skin/default/bg2.png
-share/aqualung/skin/default/bg3.png
-share/aqualung/skin/default/bg4.png
-share/aqualung/skin/default/bg5.png
-share/aqualung/skin/default/next.png
-share/aqualung/skin/default/pause.png
-share/aqualung/skin/default/play.png
-share/aqualung/skin/default/play_pause.png
-share/aqualung/skin/default/prev.png
-share/aqualung/skin/default/rc
-share/aqualung/skin/default/repeat.png
-share/aqualung/skin/default/repeat_all.png
-share/aqualung/skin/default/shuffle.png
-share/aqualung/skin/default/stop.png
-share/aqualung/skin/metal/
-share/aqualung/skin/metal/bg1.png
-share/aqualung/skin/metal/bg2.png
-share/aqualung/skin/metal/bg3.png
-share/aqualung/skin/metal/bg4.png
-share/aqualung/skin/metal/bg5.png
-share/aqualung/skin/metal/bg6.png
-share/aqualung/skin/metal/next.png
-share/aqualung/skin/metal/pause.png
-share/aqualung/skin/metal/play.png
-share/aqualung/skin/metal/play_pause.png
-share/aqualung/skin/metal/prev.png
-share/aqualung/skin/metal/rc
-share/aqualung/skin/metal/repeat.png
-share/aqualung/skin/metal/repeat_all.png
-share/aqualung/skin/metal/scale_bg.png
-share/aqualung/skin/metal/shuffle.png
-share/aqualung/skin/metal/stop.png
-share/aqualung/skin/no_skin/
-share/aqualung/skin/no_skin/next.png
-share/aqualung/skin/no_skin/pause.png
-share/aqualung/skin/no_skin/play.png
-share/aqualung/skin/no_skin/play_pause.png
-share/aqualung/skin/no_skin/prev.png
-share/aqualung/skin/no_skin/rc
-share/aqualung/skin/no_skin/repeat.png
-share/aqualung/skin/no_skin/repeat_all.png
-share/aqualung/skin/no_skin/shuffle.png
-share/aqualung/skin/no_skin/stop.png
-share/aqualung/skin/ocean/
-share/aqualung/skin/ocean/bg.png
-share/aqualung/skin/ocean/bg2.png
-share/aqualung/skin/ocean/bg3.png
-share/aqualung/skin/ocean/fx.png
-share/aqualung/skin/ocean/ms.png
-share/aqualung/skin/ocean/next.png
-share/aqualung/skin/ocean/pause.png
-share/aqualung/skin/ocean/pl.png
-share/aqualung/skin/ocean/play.png
-share/aqualung/skin/ocean/play_pause.png
-share/aqualung/skin/ocean/prev.png
-share/aqualung/skin/ocean/rc
-share/aqualung/skin/ocean/repeat.png
-share/aqualung/skin/ocean/repeat_all.png
-share/aqualung/skin/ocean/shuffle.png
-share/aqualung/skin/ocean/stop.png
-share/aqualung/skin/plain/
-share/aqualung/skin/plain/next.png
-share/aqualung/skin/plain/pause.png
-share/aqualung/skin/plain/play.png
-share/aqualung/skin/plain/play_pause.png
-share/aqualung/skin/plain/prev.png
-share/aqualung/skin/plain/rc
-share/aqualung/skin/plain/repeat.png
-share/aqualung/skin/plain/repeat_all.png
-share/aqualung/skin/plain/shuffle.png
-share/aqualung/skin/plain/stop.png
-share/aqualung/skin/woody/
-share/aqualung/skin/woody/next.png
-share/aqualung/skin/woody/pause.png
-share/aqualung/skin/woody/pine.png
-share/aqualung/skin/woody/play.png
-share/aqualung/skin/woody/play_pause.png
-share/aqualung/skin/woody/prev.png
-share/aqualung/skin/woody/rc
-share/aqualung/skin/woody/repeat.png
-share/aqualung/skin/woody/repeat_all.png
-share/aqualung/skin/woody/scale_bg.png
-share/aqualung/skin/woody/shuffle.png
-share/aqualung/skin/woody/stop.png
-share/aqualung/skin/woody/time_bg.png
-share/aqualung/skin/woody/wood1.png
-share/aqualung/skin/woody/wood2.png
-share/aqualung/skin/woody/wood3.png
-share/aqualung/skin/woody/wood4.png
-share/aqualung/skin/woody/wood5.png
-share/aqualung/skin/woody/wood6.png
share/aqualung/tab-close.png
+share/aqualung/theme/
+share/aqualung/theme/dark/
+share/aqualung/theme/dark/next.png
+share/aqualung/theme/dark/pause.png
+share/aqualung/theme/dark/play.png
+share/aqualung/theme/dark/play_pause.png
+share/aqualung/theme/dark/prev.png
+share/aqualung/theme/dark/repeat.png
+share/aqualung/theme/dark/repeat_all.png
+share/aqualung/theme/dark/shuffle.png
+share/aqualung/theme/dark/stop.png
+share/aqualung/theme/dark/theme.css
+share/aqualung/theme/default/
+share/aqualung/theme/default/next.png
+share/aqualung/theme/default/pause.png
+share/aqualung/theme/default/play.png
+share/aqualung/theme/default/play_pause.png
+share/aqualung/theme/default/prev.png
+share/aqualung/theme/default/repeat.png
+share/aqualung/theme/default/repeat_all.png
+share/aqualung/theme/default/shuffle.png
+share/aqualung/theme/default/stop.png
+share/aqualung/theme/default/theme.css
share/doc/aqualung/
share/doc/aqualung/README
share/doc/aqualung/aqualung-doc.css
