Date: Mon, 25 Mar 2019 23:44:57 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496860 - in head/audio/caps-lv2: . files Message-ID: <201903252344.x2PNiv28092800@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Mar 25 23:44:56 2019 New Revision: 496860 URL: https://svnweb.freebsd.org/changeset/ports/496860 Log: Remove dependency on llvm50. Apply a patch use sinf/cosf rather then __builtin_ versions as template arguments must have external linkage. This allows building without pinning an obsolete llvm version. PR: 236411 Approved by: maintainer timeout Added: head/audio/caps-lv2/files/ head/audio/caps-lv2/files/patch-dsp_v4f.h (contents, props changed) head/audio/caps-lv2/files/patch-dsp_v4f__IIR2.h (contents, props changed) Modified: head/audio/caps-lv2/Makefile Modified: head/audio/caps-lv2/Makefile ============================================================================== --- head/audio/caps-lv2/Makefile Mon Mar 25 23:43:12 2019 (r496859) +++ head/audio/caps-lv2/Makefile Mon Mar 25 23:44:56 2019 (r496860) @@ -19,13 +19,6 @@ USE_GITHUB= yes GH_ACCOUNT= moddevices GH_TAGNAME= 072e2fe -# It suffers from the regression in clang-6: https://bugs.llvm.org/show_bug.cgi?id=36916 -LLVM_VER= 50 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} -CPP= clang-cpp${LLVM_VER} -CC= clang${LLVM_VER} -CXX= clang++${LLVM_VER} - .if exists(/usr/lib/libstdc++.so) CXXFLAGS+= -stdlib=libstdc++ LDFLAGS+= -stdlib=libstdc++ Added: head/audio/caps-lv2/files/patch-dsp_v4f.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/caps-lv2/files/patch-dsp_v4f.h Mon Mar 25 23:44:56 2019 (r496860) @@ -0,0 +1,16 @@ +--- dsp/v4f.h.orig ++++ dsp/v4f.h +@@ -150,10 +150,10 @@ + { + v4f_t *y = data(); + v4f_t w = -v4f_pi * f; +- y[0] = v4f_map<__builtin_sinf> (w); +- y[1] = v4f_map<__builtin_sinf> (v4f_2 * w); ++ y[0] = v4f_map<sinf> (w); ++ y[1] = v4f_map<sinf> (v4f_2 * w); + /* b in above scalar implementation is y[2] in the flat data */ +- y[2] = v4f_2 * v4f_map<__builtin_cosf> (w); /* b */ ++ y[2] = v4f_2 * v4f_map<cosf> (w); /* b */ + z = 0; + } + Added: head/audio/caps-lv2/files/patch-dsp_v4f__IIR2.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/caps-lv2/files/patch-dsp_v4f__IIR2.h Mon Mar 25 23:44:56 2019 (r496860) @@ -0,0 +1,25 @@ +--- dsp/v4f_IIR2.h.orig ++++ dsp/v4f_IIR2.h +@@ -45,8 +45,8 @@ + { + v4f_t w = v4f_2pi * f; + +- sin = v4f_map<__builtin_sinf> (w); +- cos = v4f_map<__builtin_cosf> (w); ++ sin = v4f_map<sinf> (w); ++ cos = v4f_map<cosf> (w); + + alpha = sin / (v4f_2 * Q); + } +@@ -549,9 +549,9 @@ + { + v4f_t * a = state + i*Item; + f *= v4f_2pi; +- a[0] = v4f_map<__builtin_sinf> (f); ++ a[0] = v4f_map<sinf> (f); + a[0] *= gain; +- a[5] = v4f_map<__builtin_cosf> (f); ++ a[5] = v4f_map<cosf> (f); + set_r (i, r); + } + void set_r (int i, v4f_t r)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903252344.x2PNiv28092800>