Date: Fri, 28 Jul 2023 08:30:45 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1b52dea5504c - main - audio/rezound: try to unbreak the port's build on recent -CURRENT Message-ID: <202307280830.36S8UjUX009423@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b52dea5504c8f00424456eedcc8e113d8b30a06 commit 1b52dea5504c8f00424456eedcc8e113d8b30a06 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-07-28 08:29:30 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-07-28 08:29:30 +0000 audio/rezound: try to unbreak the port's build on recent -CURRENT While here, add a bunch of FOO_CONFIGURE_OFF=--disable-foo knobs to prevent picking up disabled features and fix FFTW option dependency. Reported by: pkg-fallout --- audio/rezound/Makefile | 23 ++++++++- .../patch-src_backend_CrezSoundTranslator.cpp | 56 +++++++++++++++++++++- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile index b1c754dec985..b302c232d60b 100644 --- a/audio/rezound/Makefile +++ b/audio/rezound/Makefile @@ -28,12 +28,15 @@ CDRDAO_DESC= Burning audio files to CD support LARGEFILE_CONFIGURE_ON= --enable-largefile JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_CONFIGURE_OFF= --disable-jack 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_LIB_DEPENDS= libvorbis.so:audio/libvorbis FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FFTW_LIB_DEPENDS= libfftw.so:math/fftw +FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 +FFTW_CONFIGURE_OFF= --disable-fftw3 SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa LADSPA_CONFIGURE_OFF= --disable-ladspa @@ -55,7 +58,7 @@ post-patch: .SILENT ${REINPLACE_CMD} -E '/atoll|round|nearbyint/d' \ ${WRKSRC}/config/platform/bsd.h ${REINPLACE_CMD} -E 's,(_nl_expand_alias \()\),\1...), ; \ - /^C(XX)?FLAGS=/d ; /CXXFLAGS="\$$CXXFLAGS -[gW]/d ; \ + /^C(XX)?FLAGS=/d ; /CXXFLAGS="\$$CXXFLAGS -[gsW]/d ; \ /^return /s,\(int\)( n?gettext),(long)\1, ; \ /boost header not found/d' \ ${WRKSRC}/configure @@ -75,6 +78,22 @@ post-patch: .SILENT ${WRKSRC}/src/backend/Remaster/Makefile.in \ ${WRKSRC}/src/backend/LADSPA/Makefile.in \ ${WRKSRC}/src/frontend_fox/Makefile.in + ${REINPLACE_CMD} -e '/^#include/s,soundtouch/,,' \ + ${WRKSRC}/src/backend/DSP/T*Changer.h + ${REINPLACE_CMD} -e 's,auto_ptr,unique_ptr,' \ + ${WRKSRC}/src/backend/AAction.* \ + ${WRKSRC}/src/backend/Effects/CFlangeEffect.cpp \ + ${WRKSRC}/src/backend/Effects/CVariedRepeatEffect.cpp + ${REINPLACE_CMD} -e '/unsigned/s,register ,,' \ + ${WRKSRC}/src/backend/CSound.h + ${REINPLACE_CMD} -e '/size_t/s,register ,,' \ + ${WRKSRC}/src/backend/CSoundPlayerChannel.cpp + ${REINPLACE_CMD} -e '/const/s,register ,,' \ + ${WRKSRC}/src/backend/CSound_defs.h \ + ${WRKSRC}/src/backend/Filters/CBiquadResFilter.cpp \ + ${WRKSRC}/src/backend/Filters/CSinglePoleFilter.cpp + ${REINPLACE_CMD} -e '/int/s,register ,,' \ + ${WRKSRC}/src/misc/endian_util.h .if ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/AUTHORS/d; /COPYING/d' ${WRKSRC}/Makefile.in .else diff --git a/audio/rezound/files/patch-src_backend_CrezSoundTranslator.cpp b/audio/rezound/files/patch-src_backend_CrezSoundTranslator.cpp index d1be2054a6e6..cab88c3333d9 100644 --- a/audio/rezound/files/patch-src_backend_CrezSoundTranslator.cpp +++ b/audio/rezound/files/patch-src_backend_CrezSoundTranslator.cpp @@ -1,6 +1,6 @@ --- src/backend/CrezSoundTranslator.cpp.orig 2013-02-10 06:35:01 UTC +++ src/backend/CrezSoundTranslator.cpp -@@ -43,7 +43,7 @@ CrezSoundTranslator::~CrezSoundTranslato +@@ -43,7 +43,7 @@ CrezSoundTranslator::~CrezSoundTranslator() // need to include this I use some of the template *methods* for types that are no where else // so the explicit instantation at the bottom of CSound.cpp doesn't instantiate everything @@ -9,3 +9,57 @@ struct RFormatInfo1 { +@@ -63,7 +63,7 @@ struct RFormatInfo1 + { + // unpack the values from r into the data members + +- register unsigned offset=0; ++ unsigned offset=0; + + memcpy(&version,r+offset,sizeof(version)); + lethe(&version); +@@ -103,7 +103,7 @@ struct RFormatInfo2 + { + // unpack the values from r into the data members + +- register unsigned offset=0; ++ unsigned offset=0; + + memcpy(&version,r+offset,sizeof(version)); + lethe(&version); +@@ -149,7 +149,7 @@ struct RFormatInfo3 + { + // pack the values of the data members into r + +- register unsigned offset=0; ++ unsigned offset=0; + + uint32_t tVersion=hetle(version); + memcpy(r+offset,&tVersion,sizeof(version)); +@@ -175,7 +175,7 @@ struct RFormatInfo3 + { + // unpack the values from r into the data members + +- register unsigned offset=0; ++ unsigned offset=0; + + memcpy(&version,r+offset,sizeof(version)); + lethe(&version); +@@ -221,7 +221,7 @@ typedef TPoolAccesser<RFormatInfo3::PackedChunk,CSound + // loads data from poolfile as type src_t and writes into dest as sample_t + template<typename src_t> inline bool CrezSoundTranslator::load_samples_from_X_to_native(unsigned i,CSound::PoolFile_t &loadFromFile,CSound *sound,const TStaticPoolAccesser<src_t,CSound::PoolFile_t> &src,const sample_pos_t size,CStatusBar &statusBar,Endians endian) + { +- const register sample_pos_t chunkSize=size/100; ++ const sample_pos_t chunkSize=size/100; + CSound::CInternalRezPoolAccesser dest=sound->getAudioInternal(i); + sample_pos_t pos=0; + +@@ -276,7 +276,7 @@ inline bool CrezSoundTranslator::load_samples__sample_ + { + CSound::CInternalRezPoolAccesser dest=sound->getAudioInternal(i); + +- const register sample_pos_t chunkSize=size/100; ++ const sample_pos_t chunkSize=size/100; + + for(unsigned int t=0;t<100 && chunkSize>0;t++) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307280830.36S8UjUX009423>