git: 808ee001974a - main - audio/rezound: add PulseAudio support + miscellaneous improvements

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Fri, 28 Jul 2023 11:06:13 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=808ee001974ad89ef96f43cd4d924c4b61cd8a54

commit 808ee001974ad89ef96f43cd4d924c4b61cd8a54
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-07-28 11:05:02 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-07-28 11:05:02 +0000

    audio/rezound: add PulseAudio support + miscellaneous improvements
    
    - Unbreak the build against various options with NLS disabled [*]
    - Allow to build with PulseAudio support (keep off by default)
    - Sprinkle some FOO_IMPLIES to ensure we don't have unregistered
      dependencies
    - Drop MAKE_JOBS_UNSAFE added in r300554 (now commit df187e25d75f)
      eleven years ago for version 0.12.3beta without much rationale
      except rather vague "fails to build on my Q9550"; if the problem
      is still here, let's get new build log and reset it accordingly,
      but so far I could not trigger it
    
    Reported by:    William Bulley [*]
---
 audio/rezound/Makefile                               | 14 +++++++-------
 .../files/patch-src_backend_CPulseSoundPlayer.cpp    | 11 +++++++++++
 .../files/patch-src_backend_Effects_Makefile.in      | 20 ++++++++++++++++++++
 .../files/patch-src_backend_Filters_Makefile.in      | 20 ++++++++++++++++++++
 audio/rezound/files/patch-src_backend_Makefile.in    | 20 ++++++++++++++++++++
 .../files/patch-src_frontend__fox_Makefile.in        | 20 ++++++++++++++++++++
 6 files changed, 98 insertions(+), 7 deletions(-)

diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index b302c232d60b..e8fe199e158e 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -15,10 +15,9 @@ LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 USES=		bison compiler:c++11-lang pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa
-MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	LARGEFILE JACK AUDIOFILE PORTAUDIO OGG VORBIS FLAC FFTW \
-		SOUNDTOUCH LADSPA LAME CDRDAO DOCS NLS
+		SOUNDTOUCH PULSEAUDIO LADSPA LAME CDRDAO DOCS NLS
 OPTIONS_DEFAULT=	AUDIOFILE PORTAUDIO OGG VORBIS FLAC SOUNDTOUCH \
 		LADSPA LAME
 
@@ -33,11 +32,16 @@ AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CONFIGURE_OFF=--disable-portaudio
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
+VORBIS_IMPLIES=		OGG
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+FLAC_IMPLIES=		OGG
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW_CONFIGURE_OFF=	--disable-fftw3
 SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
+PULSEAUDIO_IMPLIES=	FLAC VORBIS
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_OFF=--disable-pulse
 LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_OFF=	--disable-ladspa
 LAME_RUN_DEPENDS=	lame:audio/lame
@@ -68,16 +72,12 @@ post-patch: .SILENT
 		${WRKSRC}/src/misc/CNestedDataFile/Makefile.in \
 		${WRKSRC}/src/PoolFile/Makefile.in \
 		${WRKSRC}/src/backend/DSP/Makefile.in \
-		${WRKSRC}/src/backend/Makefile.in \
 		${WRKSRC}/src/backend/File/Makefile.in \
 		${WRKSRC}/src/backend/Edits/Makefile.in \
-		${WRKSRC}/src/backend/Effects/Makefile.in \
-		${WRKSRC}/src/backend/Filters/Makefile.in \
 		${WRKSRC}/src/backend/Looping/Makefile.in \
 		${WRKSRC}/src/backend/Generate/Makefile.in \
 		${WRKSRC}/src/backend/Remaster/Makefile.in \
-		${WRKSRC}/src/backend/LADSPA/Makefile.in \
-		${WRKSRC}/src/frontend_fox/Makefile.in
+		${WRKSRC}/src/backend/LADSPA/Makefile.in
 	${REINPLACE_CMD} -e '/^#include/s,soundtouch/,,' \
 		${WRKSRC}/src/backend/DSP/T*Changer.h
 	${REINPLACE_CMD} -e 's,auto_ptr,unique_ptr,' \
diff --git a/audio/rezound/files/patch-src_backend_CPulseSoundPlayer.cpp b/audio/rezound/files/patch-src_backend_CPulseSoundPlayer.cpp
new file mode 100644
index 000000000000..d2e07e78d013
--- /dev/null
+++ b/audio/rezound/files/patch-src_backend_CPulseSoundPlayer.cpp
@@ -0,0 +1,11 @@
+--- src/backend/CPulseSoundPlayer.cpp.orig	2013-12-27 03:54:12 UTC
++++ src/backend/CPulseSoundPlayer.cpp
+@@ -30,6 +30,8 @@ using namespace std;
+ #include <pulse/simple.h>
+ #include <pulse/error.h>
+ 
++#include <TAutoBuffer.h>
++
+ #include "settings.h"
+ 
+ #define BUFFER_COUNT gDesiredOutputBufferCount
diff --git a/audio/rezound/files/patch-src_backend_Effects_Makefile.in b/audio/rezound/files/patch-src_backend_Effects_Makefile.in
new file mode 100644
index 000000000000..1e34f677ac1c
--- /dev/null
+++ b/audio/rezound/files/patch-src_backend_Effects_Makefile.in
@@ -0,0 +1,20 @@
+--- src/backend/Effects/Makefile.in.orig	2013-12-29 20:48:20 UTC
++++ src/backend/Effects/Makefile.in
+@@ -293,7 +293,7 @@ INCLUDES = \
+ 
+ 
+ # doc directory
+-pkgdocdir = $(prefix)/doc/@PACKAGE@
++pkgdocdir = $(datadir)/doc/@PACKAGE@
+ noinst_LTLIBRARIES = libEffects.la
+ libEffects_la_SOURCES = \
+ 		CChangeAmplitudeEffect.cpp \
+@@ -317,6 +317,8 @@ noinst_HEADERS = \
+ 		CDistortionEffect.h \
+ 		CTestEffect.h \
+ 		EffectActions.h
++
++AM_CXXFLAGS = @fftw3_CFLAGS@
+ 
+ all: all-am
+ 
diff --git a/audio/rezound/files/patch-src_backend_Filters_Makefile.in b/audio/rezound/files/patch-src_backend_Filters_Makefile.in
new file mode 100644
index 000000000000..2943c53ea84c
--- /dev/null
+++ b/audio/rezound/files/patch-src_backend_Filters_Makefile.in
@@ -0,0 +1,20 @@
+--- src/backend/Filters/Makefile.in.orig	2013-12-29 20:48:20 UTC
++++ src/backend/Filters/Makefile.in
+@@ -292,7 +292,7 @@ INCLUDES = \
+ 
+ 
+ # doc directory
+-pkgdocdir = $(prefix)/doc/@PACKAGE@
++pkgdocdir = $(datadir)/doc/@PACKAGE@
+ noinst_HEADERS = \
+ 		CConvolutionFilter.h \
+ 		CArbitraryFIRFilter.h \
+@@ -309,6 +309,8 @@ libFilters_la_SOURCES = \
+ 			CMorphingArbitraryFIRFilter.cpp \
+ 			CSinglePoleFilter.cpp \
+ 			CBiquadResFilter.cpp 
++
++AM_CXXFLAGS = @fftw3_CFLAGS@
+ 
+ all: all-am
+ 
diff --git a/audio/rezound/files/patch-src_backend_Makefile.in b/audio/rezound/files/patch-src_backend_Makefile.in
new file mode 100644
index 000000000000..7cbe345ac08c
--- /dev/null
+++ b/audio/rezound/files/patch-src_backend_Makefile.in
@@ -0,0 +1,20 @@
+--- src/backend/Makefile.in.orig	2013-12-29 20:48:20 UTC
++++ src/backend/Makefile.in
+@@ -345,7 +345,7 @@ INCLUDES = \
+ 
+ 
+ # doc directory
+-pkgdocdir = $(prefix)/doc/@PACKAGE@
++pkgdocdir = $(datadir)/doc/@PACKAGE@
+ SUBDIRS = \
+ 	DSP  \
+ 	File  \
+@@ -469,7 +469,7 @@ libbackend_la_SOURCES = \
+ 
+ 
+ # soundtouch_CFLAGS is in Remaster/Makefile.am
+-AM_CXXFLAGS = @audiofile_CFLAGS@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @PULSE_CFLAGS@ @ogg_CFLAGS@ @vorbis_CFLAGS@ @flacpp_CFLAGS@ @flac_CFLAGS@ @fftw3_CFLAGS@
++AM_CXXFLAGS = @audiofile_CFLAGS@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @PORTAUDIO_19_CFLAGS@ @PULSE_CFLAGS@ @ogg_CFLAGS@ @vorbis_CFLAGS@ @flacpp_CFLAGS@ @flac_CFLAGS@ @fftw3_CFLAGS@
+ 
+ # soundtouch_LIBS is in Remaster/Makefile.am
+ libbackend_la_LIBADD = @LTLIBINTL@ @audiofile_LIBS@ @ALSA_LIBS@ @JACK_LIBS@ @PULSE_LIBS@ @ogg_LIBS@ @vorbisfile_LIBS@ @vorbisenc_LIBS@ @vorbis_LIBS@ @flacpp_LIBS@ @flac_LIBS@ @fftw3_LIBS@
diff --git a/audio/rezound/files/patch-src_frontend__fox_Makefile.in b/audio/rezound/files/patch-src_frontend__fox_Makefile.in
new file mode 100644
index 000000000000..d979088eefd2
--- /dev/null
+++ b/audio/rezound/files/patch-src_frontend__fox_Makefile.in
@@ -0,0 +1,20 @@
+--- src/frontend_fox/Makefile.in.orig	2013-12-29 20:48:20 UTC
++++ src/frontend_fox/Makefile.in
+@@ -331,7 +331,7 @@ INCLUDES = \
+ 
+ 
+ # doc directory
+-pkgdocdir = $(prefix)/doc/@PACKAGE@
++pkgdocdir = $(datadir)/doc/@PACKAGE@
+ noinst_LTLIBRARIES = libfrontend.la
+ libfrontend_la_SOURCES = \
+ 			CFOXIcons.cpp \
+@@ -405,7 +405,7 @@ _rezound_LDADD = libfrontend.la\
+ 
+ rezound_LDADD = $(_rezound_LDADD) @FOX_LIBS@
+ rezound_DEPENDENCIES = $(_rezound_LDADD)
+-AM_CXXFLAGS = @FOX_CFLAGS@
++AM_CXXFLAGS = @FOX_CFLAGS@ @audiofile_CFLAGS@ @fftw3_CFLAGS@
+ noinst_HEADERS = \
+ 	CFOXIcons.h \
+ 	fox_compat.h \