git: 84f562147f3c - main - multimedia/audacious-plugins: Update to 4.3.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Sun, 30 Apr 2023 10:55:50 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=84f562147f3c30bd67a4d4852ccdc9122e1d0be6

commit 84f562147f3c30bd67a4d4852ccdc9122e1d0be6
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-04-30 10:55:20 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-04-30 10:55:20 +0000

    multimedia/audacious-plugins: Update to 4.3.1
    
    - Add CONSOLE option, to enable game console emulation for game console sound files
    - Add SOXR option, enabling audio resampling via libsoxr
---
 multimedia/audacious-plugins/Makefile              | 20 ++---
 multimedia/audacious-plugins/distinfo              |  6 +-
 .../files/patch-src_aac_meson.build                | 15 ----
 .../files/patch-src_filewriter_meson.build         | 18 ----
 .../files/patch-src_lirc_meson.build               | 22 -----
 multimedia/audacious-plugins/pkg-plist             | 99 +---------------------
 6 files changed, 15 insertions(+), 165 deletions(-)

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 038b98a4c0bc..6493c5b27720 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	audacious-plugins
-PORTVERSION=	4.3
-PORTREVISION=	6
+PORTVERSION=	4.3.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -27,7 +26,7 @@ USE_XORG=	x11
 
 CONFIGURE_ENV=		LIBRARY_PATH="${LOCALBASE}/lib"
 MAKE_ENV=		LIBRARY_PATH="${LOCALBASE}/lib"
-MESON_ARGS=		-Dconsole=false -Dmms=false -Dsoxr=false -Dcoreaudio=false
+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
@@ -70,9 +69,10 @@ USE_GNOME+=		cairo gtk30
 PLIST_SUB=		QT="@comment " QT6="@comment " GTK=""
 .endif
 
-OPTIONS_DEFINE=	AAC ADPLUG AMIDI BS2B CDDA CUE FFMPEG FLAC LAME LIRC \
+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 SPEEDPITCH VORBIS WAVPACK
+		SAMPLERATE SCROBBLER SID SNDFILE SOXR SPEEDPITCH 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 \
@@ -89,6 +89,7 @@ ADPLUG_DESC=		ADPLUG plugin
 AMIDI_DESC=		Amidi decoder
 AOSD_DESC=		Audacious OSD
 BS2B_DESC=		BS2B effect
+CONSOLE_DESC=		Game Console Music Emulation
 FILEWRITER_DESC=	File writer
 MPRIS_DESC=		NPRIS plugin
 NEON_DESC=		Neon plugin
@@ -118,6 +119,7 @@ CDDA_LIB_DEPENDS=	libcdio_cdda.so:sysutils/libcdio-paranoia \
 			libcddb.so:audio/libcddb \
 			libcdio.so:sysutils/libcdio
 CDDA_MESON_TRUE=	cdaudio
+CONSOLE_MESON_TRUE=	console
 CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
 CUE_MESON_TRUE=		cue
 FILEWRITER_MESON_TRUE=	filewriter
@@ -170,6 +172,8 @@ 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 \
@@ -200,12 +204,6 @@ MESON_ARGS+=	-Dfilewriter-ogg=false
 MESON_ARGS+=	-Dfilewriter-flac=false -Dfilewriter-mp3=false -Dfilewriter-ogg=false
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/src/aac/meson.build \
-		${WRKSRC}/src/filewriter/meson.build \
-		${WRKSRC}/src/lirc/meson.build
-
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index a7ab95a74296..b780519174a2 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678125312
-SHA256 (audacious-plugins-4.3.tar.bz2) = 662ef6c8c4bd70d0f35fd1c5f08b91549b9436638b65f8a1a33956b09df89fc6
-SIZE (audacious-plugins-4.3.tar.bz2) = 1932184
+TIMESTAMP = 1682842744
+SHA256 (audacious-plugins-4.3.1.tar.bz2) = 2dea26e3af583a2d684df240b27b2b2932bcd653df4db500a85f4fe5d5fdc8a6
+SIZE (audacious-plugins-4.3.1.tar.bz2) = 1786114
diff --git a/multimedia/audacious-plugins/files/patch-src_aac_meson.build b/multimedia/audacious-plugins/files/patch-src_aac_meson.build
deleted file mode 100644
index 536ee6b8e1bb..000000000000
--- a/multimedia/audacious-plugins/files/patch-src_aac_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/aac/meson.build.orig	2023-03-05 17:51:20 UTC
-+++ src/aac/meson.build
-@@ -1,6 +1,10 @@
--faad_dep = cxx.find_library('faad', required: false)
--have_aac = faad_dep.found() and cxx.has_header('neaacdec.h')
-+faad_dep = dependency('faad2', required: false)
- 
-+if not faad_dep.found()
-+  faad_dep = cxx.find_library('faad', has_headers: 'neaacdec.h', required: false)
-+endif
-+
-+have_aac = faad_dep.found()
- 
- if have_aac
-   shared_module('aac-raw',
diff --git a/multimedia/audacious-plugins/files/patch-src_filewriter_meson.build b/multimedia/audacious-plugins/files/patch-src_filewriter_meson.build
deleted file mode 100644
index 147769b8249f..000000000000
--- a/multimedia/audacious-plugins/files/patch-src_filewriter_meson.build
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/filewriter/meson.build.orig	2023-03-05 17:51:20 UTC
-+++ src/filewriter/meson.build
-@@ -34,9 +34,13 @@ if get_option('filewriter-mp3')
- 
- 
- if get_option('filewriter-mp3')
--  lame_dep = cxx.find_library('mp3lame', required: false)
-+  lame_dep = dependency('lame', required: false)
- 
--  if lame_dep.found() and cxx.has_header('lame/lame.h')
-+  if not lame_dep.found()
-+    lame_dep = cxx.find_library('mp3lame', has_headers: 'lame/lame.h', required: false)
-+  endif
-+
-+  if lame_dep.found()
-     filewriter_deps += [lame_dep]
-     filewriter_srcs += ['mp3.cc']
- 
diff --git a/multimedia/audacious-plugins/files/patch-src_lirc_meson.build b/multimedia/audacious-plugins/files/patch-src_lirc_meson.build
deleted file mode 100644
index 0b4c2295d061..000000000000
--- a/multimedia/audacious-plugins/files/patch-src_lirc_meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/lirc/meson.build.orig	2023-03-05 17:51:20 UTC
-+++ src/lirc/meson.build
-@@ -1,13 +1,16 @@
--lirc_dep = cxx.find_library('lirc', required: false)
--have_lirc = lirc_dep.found() and cxx.has_header('lirc/lirc_client.h')
-+lirc_dep = dependency('lirc', required: false)
- 
-+if not lirc_dep.found()
-+  lirc_dep = cxx.find_library('lirc_client', has_headers: 'lirc/lirc_client.h', required: false)
-+endif
-+have_lirc = lirc_dep.found()
- 
-+
- if have_lirc
-   shared_module('lirc',
-     'lirc.cc',
-     dependencies: [audacious_dep, glib_dep, lirc_dep],
-     name_prefix: '',
--    link_args: ['-llirc_client'],
-     install: true,
-     install_dir: general_plugin_dir
-   )
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index cdbf5e195376..77c8e9f2a246 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -15,6 +15,7 @@ lib/audacious/Effect/echo.so
 lib/audacious/Effect/mixer.so
 %%SAMPLERATE%%lib/audacious/Effect/resample.so
 lib/audacious/Effect/silence-removal.so
+%%SOXR%%lib/audacious/Effect/sox-resampler.so
 %%SPEEDPITCH%%lib/audacious/Effect/speed-pitch.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
@@ -31,7 +32,7 @@ lib/audacious/General/delete-files.so
 %%NOTIFY%%lib/audacious/General/notify.so
 %%GTK%%lib/audacious/General/playlist-manager.so
 %%QT%%lib/audacious/General/playlist-manager-qt.so
-%%QT%%%%QT5%%lib/audacious/General/qthotkey.so
+%%QT%%lib/audacious/General/qthotkey.so
 %%QT%%lib/audacious/General/qtui.so
 %%SCROBBLER%%lib/audacious/General/scrobbler.so
 %%GTK%%lib/audacious/General/search-tool.so
@@ -45,6 +46,7 @@ lib/audacious/General/song_change.so
 %%AAC%%lib/audacious/Input/aac-raw.so
 %%AMIDI%%lib/audacious/Input/amidi-plug.so
 %%CDDA%%lib/audacious/Input/cdaudio-ng.so
+%%CONSOLE%%lib/audacious/Input/console.so
 %%FFMPEG%%lib/audacious/Input/ffaudio.so
 %%FLAC%%lib/audacious/Input/flacng.so
 lib/audacious/Input/madplug.so
@@ -118,101 +120,6 @@ share/audacious/Skins/Classic1.3/volume.png
 share/audacious/Skins/Default/cbuttons.png
 share/audacious/Skins/Default/eq_ex.png
 share/audacious/Skins/Default/eqmain.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-down.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-left.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-right.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-up.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-normal.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check1.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check2.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check3.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check4.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check5.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check6.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option1.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option2.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option3.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option4.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option5.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option6.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame.png
-share/audacious/Skins/Default/gtk-2.0/Handles/handle-h.png
-share/audacious/Skins/Default/gtk-2.0/Handles/handle-v.png
-share/audacious/Skins/Default/gtk-2.0/Lines/line-h.png
-share/audacious/Skins/Default/gtk-2.0/Lines/line-v.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
-share/audacious/Skins/Default/gtk-2.0/Others/null.png
-share/audacious/Skins/Default/gtk-2.0/Others/ruler.png
-share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
-share/audacious/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-vert.png
-share/audacious/Skins/Default/gtk-2.0/Range/trough-horizontal.png
-share/audacious/Skins/Default/gtk-2.0/Range/trough-vertical.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-in.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-out.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/text-.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/text-entry.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/notebook.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top.png
-share/audacious/Skins/Default/gtk-2.0/Toolbar/toolbar.png
-share/audacious/Skins/Default/gtk-2.0/gtkrc
-share/audacious/Skins/Default/gtk-2.0/panel.rc
 share/audacious/Skins/Default/main.png
 share/audacious/Skins/Default/monoster.png
 share/audacious/Skins/Default/nums_ex.png