From nobody Fri Jul 28 08:30:45 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RC16t2T0gz4p3HS; Fri, 28 Jul 2023 08:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RC16s64llz3HJP; Fri, 28 Jul 2023 08:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690533045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62Idn1m6gKqqtluFLn++G0K8eDRDmEm4Tx4BgH/XWes=; b=BlXm3Ys98Nv37zPdt+BXFCoVPJJZUmJ6vV3AqglPJrc7JeO5e6P2V/ZISC06MbiRdR7iCW rOXAYT0flzuGmNmutFg8JRJC9CycY7kYNLKzmb62v+M4669BSahaRwE5HTmvYspen+jvWw g+cI/shRwaAUmTNcbMRwIzBJpHqW75mjVwiaNhKVKpmuq87a2ARg4mZxlvuzVQNdywrrea wq6uneRYkuKgGfnkWqVJDN4oj1Yo52J6JaSlmJxib/HeCbrgQqaeSsGTXJA/ajKe2Jhq3H Ryli5hXXrzMD82cI+AnEILnrdVJGdImJVoZ1LMKpfysGbWUTo0OPU8reMnR8ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690533045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62Idn1m6gKqqtluFLn++G0K8eDRDmEm4Tx4BgH/XWes=; b=L00OyRhJ9SLLxp3IWCFjhvk2Yeq4nrm/H7B6WbMVUTbsk0J3Hf8dp0c3uPkr0Ui3T30gh1 tOB9az0KgkD26tgRrmKNUnBRmGvLTRE3vgMCK9cbtWW6dFtGDJfFB+OcrADxSUVT24awiR GsI2pbmsnZJWrFK7hoFNDFMcFpqO2TglMEKPqTsggtPVZX4yFb4LEo0kpjaJi1DRjU2Yf+ tBZ8bQgc5vETjjT/H3fn1k+ZtgUeOg8n+EzZRN5SDVdUaaanoSAxEfHidBuuLtTetXK8YY 9bd4mc+/iCghZUa4Pu79U3C7URhHJKS28iI2UBoKyLEjV+ry4WNpre1jHjfBZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690533045; a=rsa-sha256; cv=none; b=H28OQ45tItLwCzKGJLMBrHX7t2tTNAjq4e01ciMP172Y3icg61gDtg1wTNY8cX6sIEEToR wJDig1OqbIF2jg0zH4XeoM/yftPAlWoyrziyxn8rtGCyyF6eOZoL/NIEdsgHgwnBtSbRc/ EfDnGmycbZRg9tvrjdosHkd8Xif1XZq88GMUSVSeZbpgk2p597lxqUhuNGpsVhQOwBU6J9 SS7cNF87jOquTohWS+M3E385eS+4J9sFKxA7JrrVw3V7F7OzfDrTw0oIUcktARnGlrwHgS Lo7Z0gBP+v1lsQdwWcQrkhKcGFQq9TqRE8SZ2NeXPvak7h5zX38jimR+IUqqUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RC16s4tTGzkZh; Fri, 28 Jul 2023 08:30:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36S8Ujtt009424; Fri, 28 Jul 2023 08:30:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S8UjUX009423; Fri, 28 Jul 2023 08:30:45 GMT (envelope-from git) Date: Fri, 28 Jul 2023 08:30:45 GMT Message-Id: <202307280830.36S8UjUX009423@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 1b52dea5504c - main - audio/rezound: try to unbreak the port's build on recent -CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b52dea5504c8f00424456eedcc8e113d8b30a06 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b52dea5504c8f00424456eedcc8e113d8b30a06 commit 1b52dea5504c8f00424456eedcc8e113d8b30a06 Author: Alexey Dokuchaev AuthorDate: 2023-07-28 08:29:30 +0000 Commit: Alexey Dokuchaev 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 inline bool CrezSoundTranslator::load_samples_from_X_to_native(unsigned i,CSound::PoolFile_t &loadFromFile,CSound *sound,const TStaticPoolAccesser &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++) + {