From nobody Wed Oct 13 03:28:05 2021 X-Original-To: dev-commits-ports-all@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 584DD17F20D6; Wed, 13 Oct 2021 03:28:05 +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 4HTdK12251z3JRp; Wed, 13 Oct 2021 03:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 26A64200F2; Wed, 13 Oct 2021 03:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19D3S5Tv086828; Wed, 13 Oct 2021 03:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19D3S5vd086827; Wed, 13 Oct 2021 03:28:05 GMT (envelope-from git) Date: Wed, 13 Oct 2021 03:28:05 GMT Message-Id: <202110130328.19D3S5vd086827@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2e6d73e7ccec - main - audio/zrythm: fix build on non-x86 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e6d73e7ccec71b84dc9f103a614d084bbb6bcda Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e6d73e7ccec71b84dc9f103a614d084bbb6bcda commit 2e6d73e7ccec71b84dc9f103a614d084bbb6bcda Author: Piotr Kubaj AuthorDate: 2021-10-13 03:02:28 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-13 03:02:28 +0000 audio/zrythm: fix build on non-x86 - don't unconditionally enable SSE, it's enable conditionally for amd64 in the main meson.build anyway: cc: warning: argument unused during compilation: '-msse' [-Wunused-command-line-argument] cc: warning: argument unused during compilation: '-msse2' [-Wunused-command-line-argument] error: unknown FP unit 'sse' - disable LTO on powerpc64 since it's broken in LLVM. --- audio/zrythm/Makefile | 7 ++++++- audio/zrythm/files/patch-ext_qm-dsp_meson.build | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/audio/zrythm/Makefile b/audio/zrythm/Makefile index 0b4437ad1159..733bf955ddbc 100644 --- a/audio/zrythm/Makefile +++ b/audio/zrythm/Makefile @@ -56,11 +56,16 @@ SHEBANG_FILES= scripts/collect_translatables.sh GLIB_SCHEMAS= org.zrythm.Zrythm.gschema.xml - LDFLAGS+= ${LOCALBASE}/lib/libfftw3_threads.so ${LOCALBASE}/lib/libfftw3f_threads.so # these libs are required but aren't returned by pkg-config for fftw3 BINARY_ALIAS= git=false python3=${PYTHON_CMD} +.include + +.if ${ARCH} == powerpc64 +MESON_ARGS= -Db_lto=false +.endif + post-patch: # https://git.zrythm.org/zrythm/zrythm/issues/299 @${REINPLACE_CMD} 's|||' ${WRKSRC}/ext/midilib/src/*.c diff --git a/audio/zrythm/files/patch-ext_qm-dsp_meson.build b/audio/zrythm/files/patch-ext_qm-dsp_meson.build new file mode 100644 index 000000000000..b5249bf0ca47 --- /dev/null +++ b/audio/zrythm/files/patch-ext_qm-dsp_meson.build @@ -0,0 +1,12 @@ +--- ext/qm-dsp/meson.build.orig 2021-10-13 01:44:29 UTC ++++ ext/qm-dsp/meson.build +@@ -39,9 +39,6 @@ qm_dsp_lib = static_library ( + '-Wall', + '-Wextra', + '-O3', +- '-msse', +- '-msse2', +- '-mfpmath=sse', + '-ftree-vectorize', + '-DUSE_PTHREADS', + ],