git: 135ca672a699 - main - multimedia/audacious*: Update to 4.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Jun 2024 17:53:02 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=135ca672a6990dd1481c6226aec3a6b2f0f7e848
commit 135ca672a6990dd1481c6226aec3a6b2f0f7e848
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-06-13 17:51:18 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-06-13 17:51:18 +0000
multimedia/audacious*: Update to 4.4
Upstream moved to qt6 and gtk3 as main UI, so make that the default
flavor.
Cleaned up Makefile, reordering variables according to best practices
and reordered/reflowed content of many variables.
Please check UPDATING if already using the qt6 flavor.
---
MOVED | 2 +
UPDATING | 12 ++
multimedia/audacious-plugins/Makefile | 202 ++++++++++++++-------
multimedia/audacious-plugins/distinfo | 8 +-
multimedia/audacious-plugins/pkg-plist | 6 +-
multimedia/audacious/Makefile | 99 +++++-----
multimedia/audacious/distinfo | 6 +-
.../audacious/files/patch-src_libaudcore_i18n.h | 4 +-
.../audacious/files/patch-src_libaudcore_vfs.h | 4 +-
multimedia/audacious/pkg-plist | 10 +-
10 files changed, 223 insertions(+), 130 deletions(-)
diff --git a/MOVED b/MOVED
index 3392ad7cc5d3..94ba30e65fde 100644
--- a/MOVED
+++ b/MOVED
@@ -3304,3 +3304,5 @@ databases/galera|databases/galera26|2024-06-11|Has expired: Does not build. Supe
databases/tsearch_extras||2024-06-12|Has no consumer both in ports and upstream project
lang/zig011||2024-06-12|No consumers in ports
devel/py-ZopeUndo||2024-06-13|No consumers in ports
+multimedia/audacious-qt6|multimedia/audacious|2024-06-13|qt6 flavor is now the default flavor, following upstream change
+multimedia/audacious-plugins-qt6|multimedia/audacious-plugins|2024-06-13|qt6 flavor is now the default flavor, following upstream change
diff --git a/UPDATING b/UPDATING
index 2e8d7602d915..7dc496c8d4e7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20240613:
+ AFFECTS: multimedia/audacios and multimedia/audacious-plugins
+ AUTHOR: madpilot@FreeBSD.org
+
+ Upstream project made qt6 the new default, so the port flavors have
+ been updated to follow this change.
+
+ If you are using the qt6 flavor, you should uninstall it and install
+ the unflavored package. If you want to keep using the qt5 version it
+ will be updated automatically to the qt6 version. If you should
+ uninstall the unflavored package and instal the qt5 version.
+
20240606:
AFFECTS: users of net-mgmt/unifi8
AUTHOR: ronald@FreeBSD.org
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 359172ba1830..ae1323863ced 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -1,12 +1,8 @@
PORTNAME= audacious-plugins
-PORTVERSION= 4.3.1
-PORTREVISION= 4
+DISTVERSION= 4.4
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
-PATCH_SITES= https://github.com/audacious-media-player/${PORTNAME}/commit/
-PATCHFILES= 1f0bc4c6940d27905d11e3324e30c6a63fad6392.patch:-p1
-
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Plugins needed for audacious
WWW= https://audacious-media-player.org/
@@ -14,74 +10,102 @@ WWW= https://audacious-media-player.org/
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
- libdbus-1.so:devel/dbus \
+LIB_DEPENDS= libdbus-1.so:devel/dbus \
+ libdbus-glib-1.so:devel/dbus-glib \
libfontconfig.so:x11-fonts/fontconfig \
- libfreetype.so:print/freetype2 \
- libmpg123.so:audio/mpg123
+ libfreetype.so:print/freetype2
-FLAVORS= qt5 qt6 gtk2 gtk3
+FLAVORS= qt6 qt5 gtk2 gtk3
FLAVOR?= ${FLAVORS:[1]}
-USES= compiler:c++11-lib gettext-tools gmake gnome iconv \
- localbase meson pkgconfig tar:bzip2 xorg
-USE_GNOME= glib20 libxml2 gdkpixbuf2
-USE_XORG= x11
-
-CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
-MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
-MESON_ARGS= -Dmms=false -Dcoreaudio=false
-
-qt5_CONFLICTS_INSTALL= audacious-plugins-qt6 audacious-plugins-gtk2 audacious-plugins-gtk3
-qt5_RUN_DEPENDS= audacious:multimedia/audacious@qt5
-qt5_BUILD_DEPENDS= audacious:multimedia/audacious@qt5
-
-qt6_PKGNAMESUFFIX= -qt6
-qt6_CONFLICTS_INSTALL= audacious-plugins audacious-plugins-gtk2 audacious-plugins-gtk3
-qt6_RUN_DEPENDS= audacious:multimedia/audacious@qt6
-qt6_BUILD_DEPENDS= audacious:multimedia/audacious@qt6
-
gtk2_PKGNAMESUFFIX= -gtk2
-gtk2_CONFLICTS_INSTALL= audacious-plugins audacious-plugins-qt6 audacious-plugins-gtk3
+gtk2_BUILD_DEPENDS= audacious:multimedia/audacious@gtk2
gtk2_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
gtk2_RUN_DEPENDS= audacious:multimedia/audacious@gtk2
-gtk2_BUILD_DEPENDS= audacious:multimedia/audacious@gtk2
+gtk2_CONFLICTS_INSTALL= audacious-plugins audacious-plugins-gtk3 \
+ audacious-plugins-qt6
gtk3_PKGNAMESUFFIX= -gtk3
-gtk3_CONFLICTS_INSTALL= audacious-plugins audacious-plugins-qt6 audacious-plugins-gtk2
+gtk3_BUILD_DEPENDS= audacious:multimedia/audacious@gtk3
gtk3_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
gtk3_RUN_DEPENDS= audacious:multimedia/audacious@gtk3
-gtk3_BUILD_DEPENDS= audacious:multimedia/audacious@gtk3
+gtk3_CONFLICTS_INSTALL= audacious-plugins audacious-plugins-gtk2 \
+ audacious-plugins-qt6
+
+qt5_PKGNAMESUFFIX= -qt5
+qt5_BUILD_DEPENDS= audacious:multimedia/audacious@qt5
+qt5_RUN_DEPENDS= audacious:multimedia/audacious@qt5
+qt5_CONFLICTS_INSTALL= audacious-plugins-gtk2 audacious-plugins-gtk3 \
+ audacious-plugins-qt6
+
+qt6_BUILD_DEPENDS= audacious:multimedia/audacious@qt6
+qt6_RUN_DEPENDS= audacious:multimedia/audacious@qt6
+qt6_CONFLICTS_INSTALL= audacious-plugins audacious-plugins-gtk2 \
+ audacious-plugins-gtk3
+
+USES= compiler:c++11-lib gettext-tools gmake gnome iconv localbase \
+ meson pkgconfig tar:bzip2 xorg
+USE_GNOME= gdkpixbuf2 glib20 libxml2
+USE_XORG= x11
+
+CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
+MESON_ARGS= -Dcoreaudio=false \
+ -Dmms=false
+MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
.if ${FLAVOR} == qt5
-MESON_ARGS+= -Dqt=true -Dqt6=false -Dgtk=false -Dgtk3=false
-USES+= qt:5
-USE_QT= core gui multimedia network widgets x11extras
-PLIST_SUB= QT="" QT5="" GTK="@comment "
+MESON_ARGS+= -Dgtk2=false \
+ -Dgtk=false \
+ -Dqt5=true \
+ -Dqt=true
+USES+= qt:5
+USE_QT= core gui multimedia network svg widgets x11extras
+PLIST_SUB= GTK="@comment " \
+ QT5="" \
+ QT=""
.elif ${FLAVOR} == qt6
-MESON_ARGS+= -Dqt=true -Dqt6=true -Dgtk=false -Dgtk3=false
-USES+= qt:6
-USE_QT= base multimedia
-PLIST_SUB= QT="" QT5="@comment " GTK="@comment "
+MESON_ARGS+= -Dgtk2=false \
+ -Dgtk=false \
+ -Dqt5=false \
+ -Dqt=true
+USES+= qt:6
+USE_QT= base multimedia svg
+PLIST_SUB= GTK="@comment " \
+ QT5="@comment " \
+ QT=""
.elif ${FLAVOR} == gtk2
-MESON_ARGS+= -Dqt=false -Dqt6=false -Dgtk=true -Dgtk3=false -Dhotkey=true
-USE_GNOME+= cairo gtk20
-PLIST_SUB= QT="@comment " QT6="@comment " GTK=""
+LIB_DEPENDS+= libjson-glib-1.0.so:devel/json-glib
+MESON_ARGS+= -Dgtk2=true \
+ -Dgtk=true \
+ -Dhotkey=true \
+ -Dqt5=false \
+ -Dqt=false
+USE_GNOME+= cairo gtk20
+PLIST_SUB= GTK="" \
+ QT6="@comment " \
+ QT="@comment "
.elif ${FLAVOR} == gtk3
-MESON_ARGS+= -Dqt=false -Dqt6=false -Dgtk=true -Dgtk3=true -Dhotkey=true
-USE_GNOME+= cairo gtk30
-PLIST_SUB= QT="@comment " QT6="@comment " GTK=""
+LIB_DEPENDS+= libjson-glib-1.0.so:devel/json-glib
+MESON_ARGS+= -Dgtk2=false \
+ -Dgtk=true \
+ -Dhotkey=true \
+ -Dqt5=false \
+ -Dqt=false
+USE_GNOME+= cairo gtk30
+PLIST_SUB= GTK="" \
+ QT6="@comment " \
+ QT="@comment "
.endif
-OPTIONS_DEFINE= AAC ADPLUG AMIDI BS2B CDDA CONSOLE CUE FFMPEG FLAC LAME LIRC \
- MODPLUG MPG123 MPRIS NEON NLS NOTIFY OPENGL OPENMPT OPUS \
- SAMPLERATE SCROBBLER SID SNDFILE SOXR SPEEDPITCH VORBIS \
- WAVPACK
+OPTIONS_DEFINE= AAC ADPLUG AMIDI BS2B CDDA CONSOLE CUE FFMPEG FLAC LAME \
+ LIRC MODPLUG MPG123 MPRIS NEON NLS NOTIFY OPENGL \
+ OPENMPT OPUS SAMPLERATE SCROBBLER SID SNDFILE SOXR \
+ SPEEDPITCH VORBIS WAVPACK
+OPTIONS_DEFAULT= AAC ADPLUG CDDA CUE FFMPEG FILEWRITER FLAC MPG123 MPRIS \
+ NEON NLS NOTIFY OPENMPT OPUS OSS PIPEWIRE PULSEAUDIO \
+ SCROBBLER SID VORBIS WAVPACK
OPTIONS_MULTI= OUTPUT
OPTIONS_MULTI_OUTPUT= ALSA FILEWRITER JACK OSS PIPEWIRE PULSEAUDIO SDL SNDIO
-OPTIONS_DEFAULT= AAC ADPLUG CDDA CUE FILEWRITER FFMPEG FLAC MPRIS \
- MPG123 NEON NLS NOTIFY OPENMPT OPUS OSS PIPEWIRE PULSEAUDIO \
- SCROBBLER SID VORBIS WAVPACK
OPTIONS_SUB= yes
.if ${FLAVOR} == gtk2 || ${FLAVOR} == gtk3
@@ -104,84 +128,120 @@ SPEEDPITCH_DESC= Speed and Pitch plugin
AAC_LIB_DEPENDS= libfaad.so:audio/faad
AAC_MESON_TRUE= aac
+
ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug \
libbinio.so:devel/libbinio
ADPLUG_MESON_TRUE= adplug
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_MESON_TRUE= alsa
+
AMIDI_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
AMIDI_MESON_TRUE= amidiplug
-AOSD_USES= xorg
-AOSD_USE= gnome=pango xorg=xrender
+
AOSD_LIB_DEPENDS= libXcomposite.so:x11/libXcomposite
+AOSD_USES= xorg
+AOSD_USE= GNOME=pango \
+ XORG=xrender
AOSD_MESON_TRUE= aosd
+
BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b
BS2B_MESON_TRUE= bs2b
-CDDA_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \
- libcddb.so:audio/libcddb \
- libcdio.so:sysutils/libcdio
+
+CDDA_LIB_DEPENDS= libcddb.so:audio/libcddb \
+ libcdio.so:sysutils/libcdio \
+ libcdio_cdda.so:sysutils/libcdio-paranoia
CDDA_MESON_TRUE= cdaudio
+
CONSOLE_MESON_TRUE= console
+
CUE_LIB_DEPENDS= libcue.so:textproc/libcue
CUE_MESON_TRUE= cue
-FILEWRITER_MESON_TRUE= filewriter
+
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
FFMPEG_MESON_TRUE= ffaudio
+
+FILEWRITER_MESON_TRUE= filewriter
+
FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
FLAC_MESON_TRUE= flac
+
JACK_LIB_DEPENDS= libjack.so:audio/jack \
libsamplerate.so:audio/libsamplerate
JACK_MESON_TRUE= jack
+
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
+
LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
LIRC_MESON_TRUE= lirc
+
MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
MODPLUG_MESON_TRUE= modplug
+
+MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123
+MPG123_MESON_TRUE= mpg123
+
MPRIS_MESON_TRUE= mpris2
+
NEON_LIB_DEPENDS= libneon.so:www/neon
NEON_MESON_TRUE= neon
-MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123
-MPG123_MESON_TRUE= mpg123
+
NLS_USES= gettext-runtime
+
NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
NOTIFY_MESON_TRUE= notify
+
OPENGL_USES= gl
-OPENGL_USE= gl=gl
+OPENGL_USE= GL=gl
.if ${FLAVOR} == qt5
-OPENGL_USE+= qt=opengl
+OPENGL_USE+= QT=opengl
.endif
OPENGL_MESON_TRUE= gl-spectrum
+
OPENMPT_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt
OPENMPT_MESON_TRUE= openmpt
-OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile \
- libopus.so:audio/opus
+
+OPUS_LIB_DEPENDS= libopus.so:audio/opus \
+ libopusfile.so:audio/opusfile
OPUS_MESON_TRUE= opus
+
OSS_MESON_TRUE= oss
+
PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire
PIPEWIRE_MESON_TRUE= pipewire
+
PULSEAUDIO_LIB_DEPENDS= libpulse-mainloop-glib.so:audio/pulseaudio
PULSEAUDIO_MESON_TRUE= pulse
+
SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
SAMPLERATE_MESON_TRUE= resample
+
SCROBBLER_LIB_DEPENDS= libcurl.so:ftp/curl
SCROBBLER_MESON_TRUE= scrobbler2
-SDL_MESON_TRUE= sdlout
+
SDL_USES= sdl
SDL_USE= SDL=sdl2
+SDL_MESON_TRUE= sdlout
+
SID_LIB_DEPENDS= libsidplayfp.so:audio/libsidplayfp
SID_MESON_TRUE= sid
+
SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile
SNDFILE_MESON_TRUE= sndfile
+
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_MESON_TRUE= sndio
+
SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr
SOXR_MESON_TRUE= soxr
-SPEEDPITCH_MESON_TRUE= speedpitch
+
SPEEDPITCH_IMPLIES= SAMPLERATE
-VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \
- libogg.so:audio/libogg
+SPEEDPITCH_MESON_TRUE= speedpitch
+
+VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \
+ libvorbis.so:audio/libvorbis
VORBIS_MESON_TRUE= vorbis
+
WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
WAVPACK_MESON_TRUE= wavpack
@@ -204,7 +264,9 @@ MESON_ARGS+= -Dfilewriter-ogg=true
MESON_ARGS+= -Dfilewriter-ogg=false
.endif
.else
-MESON_ARGS+= -Dfilewriter-flac=false -Dfilewriter-mp3=false -Dfilewriter-ogg=false
+MESON_ARGS+= -Dfilewriter-flac=false \
+ -Dfilewriter-mp3=false \
+ -Dfilewriter-ogg=false
.endif
post-patch-NLS-off:
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 3800d03357c6..88c0043cf6ad 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1716832065
-SHA256 (audacious-plugins-4.3.1.tar.bz2) = 2dea26e3af583a2d684df240b27b2b2932bcd653df4db500a85f4fe5d5fdc8a6
-SIZE (audacious-plugins-4.3.1.tar.bz2) = 1786114
-SHA256 (1f0bc4c6940d27905d11e3324e30c6a63fad6392.patch) = 600eed6250c56327cc02c84c6b93ee44d011145e09e0e31b5ab4e68990aca78b
-SIZE (1f0bc4c6940d27905d11e3324e30c6a63fad6392.patch) = 1023
+TIMESTAMP = 1718261672
+SHA256 (audacious-plugins-4.4.tar.bz2) = 3caf3a5fe5b6f2808f461f85132fbff4ae22a53ef9f3d26d9e6030f6c6d5baa2
+SIZE (audacious-plugins-4.4.tar.bz2) = 1810406
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 77c8e9f2a246..63090ddbe19f 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -5,6 +5,7 @@ lib/audacious/Container/audpl.so
lib/audacious/Container/m3u.so
lib/audacious/Container/pls.so
lib/audacious/Container/xspf.so
+lib/audacious/Effect/background_music.so
lib/audacious/Effect/bitcrusher.so
%%BS2B%%lib/audacious/Effect/bs2b.so
lib/audacious/Effect/compressor.so
@@ -27,7 +28,8 @@ lib/audacious/General/delete-files.so
%%GTK%%lib/audacious/General/gtkui.so
%%GTK%%lib/audacious/General/hotkey.so
%%LIRC%%lib/audacious/General/lirc.so
-%%QT%%lib/audacious/General/lyricwiki-qt.so
+%%GTK%%lib/audacious/General/lyrics-gtk.so
+%%QT%%lib/audacious/General/lyrics-qt.so
%%MPRIS%%lib/audacious/General/mpris2.so
%%NOTIFY%%lib/audacious/General/notify.so
%%GTK%%lib/audacious/General/playlist-manager.so
@@ -49,7 +51,7 @@ lib/audacious/General/song_change.so
%%CONSOLE%%lib/audacious/Input/console.so
%%FFMPEG%%lib/audacious/Input/ffaudio.so
%%FLAC%%lib/audacious/Input/flacng.so
-lib/audacious/Input/madplug.so
+%%MPG123%%lib/audacious/Input/madplug.so
lib/audacious/Input/metronom.so
%%MODPLUG%%lib/audacious/Input/modplug.so
%%ADPLUG%%lib/audacious/Input/adplug.so
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 002542b984bb..725a4119df08 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -1,6 +1,5 @@
PORTNAME= audacious
-PORTVERSION= 4.3.1
-PORTREVISION= 3
+DISTVERSION= 4.4
CATEGORIES= multimedia audio
MASTER_SITES= https://distfiles.audacious-media-player.org/
@@ -12,68 +11,83 @@ LICENSE= BSD2CLAUSE BSD3CLAUSE
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libfontconfig.so:x11-fonts/fontconfig
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-FLAVORS= qt5 qt6 gtk2 gtk3
+FLAVORS= qt6 qt5 gtk3 gtk2
FLAVOR?= ${FLAVORS:[1]}
-USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \
- gnome iconv localbase meson pkgconfig tar:bzip2 xorg
-USE_GNOME= glib20
-USE_XORG= x11 sm
-USE_LDCONFIG= yes
-SUB_FILES= pkg-message
+gtk2_PKGNAMESUFFIX= -gtk2
+gtk2_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
+gtk2_CONFLICTS_INSTALL= audacious audacious-gtk3 audacious-qt6
-CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
-MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
+gtk3_PKGNAMESUFFIX= -gtk3
+gtk3_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
+gtk3_CONFLICTS_INSTALL= audacious audacious-gtk2 audacious-qt6
-qt5_CONFLICTS_INSTALL= audacious-qt6 audacious-gtk2 audacious-gtk3
+qt5_PKGNAMESUFFIX= -qt5
+qt5_CONFLICTS_INSTALL= audacious-gtk2 audacious-gtk3 audacious-qt6
-qt6_PKGNAMESUFFIX= -qt6
qt6_CONFLICTS_INSTALL= audacious audacious-gtk2 audacious-gtk3
-gtk2_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
-gtk2_PKGNAMESUFFIX= -gtk2
-gtk2_CONFLICTS_INSTALL= audacious audacious-qt6 audacious-gtk3
+USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake gnome \
+ iconv localbase meson pkgconfig tar:bzip2 xorg
+USE_GNOME= glib20
+USE_LDCONFIG= yes
+USE_XORG= sm x11
-gtk3_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
-gtk3_PKGNAMESUFFIX= -gtk3
-gtk3_CONFLICTS_INSTALL= audacious audacious-qt6 audacious-gtk2
+CONFIGURE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
+MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib"
+
+SUB_FILES= pkg-message
.if ${FLAVOR} == qt5
-MESON_ARGS+= -Dqt=true -Dqt6=false -Dgtk=false -Dgtk3=false
-USES+= qt:5
-USE_QT= buildtools:build core gui widgets
-PLIST_SUB= QT="" GTK="@comment "
+MESON_ARGS+= -Dgtk2=false \
+ -Dgtk=false \
+ -Dqt5=true \
+ -Dqt=true
+USES+= qt:5
+USE_QT= core gui svg widgets buildtools:build
+PLIST_SUB= GTK="@comment " \
+ QT=""
.elif ${FLAVOR} == qt6
-MESON_ARGS+= -Dqt=true -Dqt6=true -Dgtk=false -Dgtk3=false
-USES+= qt:6
-USE_QT= base
-PLIST_SUB= QT="" GTK="@comment "
+MESON_ARGS+= -Dgtk2=false \
+ -Dgtk=false \
+ -Dqt5=false \
+ -Dqt=true
+USES+= qt:6
+USE_QT= base svg
+PLIST_SUB= GTK="@comment " \
+ QT=""
.elif ${FLAVOR} == gtk2
-MESON_ARGS+= -Dqt=false -Dqt6=false -Dgtk=true -Dgtk3=false
-USE_GNOME+= cairo gdkpixbuf2 gtk20
-PLIST_SUB= QT="@comment " GTK=""
+MESON_ARGS+= -Dgtk2=true \
+ -Dgtk=true \
+ -Dqt5=false \
+ -Dqt=false
+USE_GNOME+= cairo gdkpixbuf2 gtk20
+PLIST_SUB= GTK="" \
+ QT="@comment "
.elif ${FLAVOR} == gtk3
-MESON_ARGS+= -Dqt=false -Dqt6=false -Dgtk=true -Dgtk3=true
-USE_GNOME+= cairo gdkpixbuf2 gtk30
-PLIST_SUB= QT="@comment " GTK=""
+MESON_ARGS+= -Dgtk2=false \
+ -Dgtk=true \
+ -Dqt5=false \
+ -Dqt=false
+USE_GNOME+= cairo gdkpixbuf2 gtk30
+PLIST_SUB= GTK="" \
+ QT="@comment "
.endif
-OPTIONS_DEFINE= NLS LIBARCHIVE EXECINFO
+OPTIONS_DEFINE= EXECINFO LIBARCHIVE NLS
OPTIONS_DEFAULT= EXECINFO
OPTIONS_SUB= yes
+
EXECINFO_DESC= Build with libexecinfo support
LIBARCHIVE_DESC= Build with libarchive support
-LIBARCHIVE_MESON_TRUE= libarchive
LIBARCHIVE_USES= libarchive
+LIBARCHIVE_MESON_TRUE= libarchive
-NLS_USES= gettext-runtime
-
-post-patch-NLS-off:
- @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
+NLS_USES= gettext-runtime
post-patch-EXECINFO-on:
@${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \
@@ -81,6 +95,9 @@ post-patch-EXECINFO-on:
@${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \
${WRKSRC}/audacious.pc.in
+post-patch-NLS-off:
+ @${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
+
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
${INSTALL_DATA} ${WRKSRC}/contrib/audacious.appdata.xml \
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index ea9883f0daa7..959766d01db5 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682842590
-SHA256 (audacious-4.3.1.tar.bz2) = 85e9e26841505b51e342ee72a2d05f19bef894f567a029ebb3f3e0c1adb42042
-SIZE (audacious-4.3.1.tar.bz2) = 630820
+TIMESTAMP = 1718261565
+SHA256 (audacious-4.4.tar.bz2) = aadc5d26ea2954236a00153e424094d9e6eb55c5c324c08fd0491b7c2ae2f830
+SIZE (audacious-4.4.tar.bz2) = 635856
diff --git a/multimedia/audacious/files/patch-src_libaudcore_i18n.h b/multimedia/audacious/files/patch-src_libaudcore_i18n.h
index de75cd1c038f..902b786931c8 100644
--- a/multimedia/audacious/files/patch-src_libaudcore_i18n.h
+++ b/multimedia/audacious/files/patch-src_libaudcore_i18n.h
@@ -1,6 +1,6 @@
---- src/libaudcore/i18n.h.orig 2022-07-10 01:11:00 UTC
+--- src/libaudcore/i18n.h.orig 2024-06-12 20:16:04 UTC
+++ src/libaudcore/i18n.h
-@@ -34,8 +34,9 @@
+@@ -36,8 +36,9 @@
#else
diff --git a/multimedia/audacious/files/patch-src_libaudcore_vfs.h b/multimedia/audacious/files/patch-src_libaudcore_vfs.h
index 9c6edc1ee551..8d1803ab21c7 100644
--- a/multimedia/audacious/files/patch-src_libaudcore_vfs.h
+++ b/multimedia/audacious/files/patch-src_libaudcore_vfs.h
@@ -1,4 +1,4 @@
---- src/libaudcore/vfs.h.orig 2023-04-29 20:10:24 UTC
+--- src/libaudcore/vfs.h.orig 2024-06-12 20:16:04 UTC
+++ src/libaudcore/vfs.h
@@ -51,6 +51,7 @@ enum VFSSeekType
@@ -7,4 +7,4 @@
+ VFS_SEEK_UNK = -1,
VFS_SEEK_SET = 0,
VFS_SEEK_CUR = 1,
- VFS_SEEK_END = 2
+ VFS_SEEK_END = 2,
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index c98e6216f89b..9207640afda0 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -45,13 +45,13 @@ include/libaudcore/visualizer.h
%%GTK%%include/libaudgui/menu.h
lib/libaudcore.so
lib/libaudcore.so.5
-lib/libaudcore.so.5.4.0
+lib/libaudcore.so.5.5.0
%%GTK%%lib/libaudgui.so
-%%GTK%%lib/libaudgui.so.5
-%%GTK%%lib/libaudgui.so.5.2.0
+%%GTK%%lib/libaudgui.so.6
+%%GTK%%lib/libaudgui.so.6.0.0
%%QT%%lib/libaudqt.so
-%%QT%%lib/libaudqt.so.2
-%%QT%%lib/libaudqt.so.2.4.0
+%%QT%%lib/libaudqt.so.3
+%%QT%%lib/libaudqt.so.3.0.0
lib/libaudtag.so
lib/libaudtag.so.3
lib/libaudtag.so.3.0.0