Date: Mon, 25 Mar 2019 23:43:12 +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: r496859 - in head/audio/x42-plugins-lv2: . files Message-ID: <201903252343.x2PNhCmj092553@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Mar 25 23:43:12 2019 New Revision: 496859 URL: https://svnweb.freebsd.org/changeset/ports/496859 Log: Remove dependency on llvm50 Apply upstream commit to avoid buggy code and a dependency on llvm50. https://github.com/x42/tuna.lv2/commit/8630a73317a5c44fe2ad2220eacd2b340a3e6ca6 PR: 236409 Approved by: maintainer timeout Added: head/audio/x42-plugins-lv2/files/ head/audio/x42-plugins-lv2/files/patch-meters.lv2_src_spectr.c (contents, props changed) head/audio/x42-plugins-lv2/files/patch-onsettrigger.lv2_src_spectr.c (contents, props changed) head/audio/x42-plugins-lv2/files/patch-tuna.lv2_src_spectr.c (contents, props changed) Modified: head/audio/x42-plugins-lv2/Makefile Modified: head/audio/x42-plugins-lv2/Makefile ============================================================================== --- head/audio/x42-plugins-lv2/Makefile Mon Mar 25 22:04:55 2019 (r496858) +++ head/audio/x42-plugins-lv2/Makefile Mon Mar 25 23:43:12 2019 (r496859) @@ -42,13 +42,6 @@ OPTIONS_DEFAULT_i386= SSE SSE_MAKE_ARGS= PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse" -# It suffers from the regression in clang-6: https://bugs.llvm.org/show_bug.cgi?id=36915 -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} - post-patch: @${REINPLACE_CMD} 's| -O3||' \ ${WRKSRC}/*.lv2/Makefile Added: head/audio/x42-plugins-lv2/files/patch-meters.lv2_src_spectr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/x42-plugins-lv2/files/patch-meters.lv2_src_spectr.c Mon Mar 25 23:43:12 2019 (r496859) @@ -0,0 +1,23 @@ +--- meters.lv2/src/spectr.c.orig ++++ meters.lv2/src/spectr.c +@@ -30,10 +30,17 @@ + # define csqrt(XX) std::sqrt(XX) + # define creal(XX) std::real(XX) + # define cimag(XX) std::imag(XX) +-# define _I ((complex_t)(1i)) +- #ifdef __cpp_lib_complex_udls ++ ++# ifdef __cpp_lib_complex_udls + using namespace std::literals::complex_literals; +- #endif ++# endif ++ ++# if defined __clang_major__ && __clang_major__ > 4 ++# define _I (std::complex<double>(0.0,1.0)) ++# else ++# define _I ((complex_t)(1i)) ++# endif ++ + typedef std::complex<double> complex_t; + #else + # include <complex.h> Added: head/audio/x42-plugins-lv2/files/patch-onsettrigger.lv2_src_spectr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/x42-plugins-lv2/files/patch-onsettrigger.lv2_src_spectr.c Mon Mar 25 23:43:12 2019 (r496859) @@ -0,0 +1,23 @@ +--- onsettrigger.lv2/src/spectr.c.orig ++++ onsettrigger.lv2/src/spectr.c +@@ -30,10 +30,17 @@ + # define csqrt(XX) std::sqrt(XX) + # define creal(XX) std::real(XX) + # define cimag(XX) std::imag(XX) +-# define _I ((complex_t)(1i)) +- #ifdef __cpp_lib_complex_udls ++ ++# ifdef __cpp_lib_complex_udls + using namespace std::literals::complex_literals; +- #endif ++# endif ++ ++# if defined __clang_major__ && __clang_major__ > 4 ++# define _I (std::complex<double>(0.0,1.0)) ++# else ++# define _I ((complex_t)(1i)) ++# endif ++ + typedef std::complex<double> complex_t; + #else + # include <complex.h> Added: head/audio/x42-plugins-lv2/files/patch-tuna.lv2_src_spectr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/x42-plugins-lv2/files/patch-tuna.lv2_src_spectr.c Mon Mar 25 23:43:12 2019 (r496859) @@ -0,0 +1,23 @@ +--- tuna.lv2/src/spectr.c.orig ++++ tuna.lv2/src/spectr.c +@@ -30,10 +30,17 @@ + # define csqrt(XX) std::sqrt(XX) + # define creal(XX) std::real(XX) + # define cimag(XX) std::imag(XX) +-# define _I ((complex_t)(1i)) +- #ifdef __cpp_lib_complex_udls ++ ++# ifdef __cpp_lib_complex_udls + using namespace std::literals::complex_literals; +- #endif ++# endif ++ ++# if defined __clang_major__ && __clang_major__ > 4 ++# define _I (std::complex<double>(0.0,1.0)) ++# else ++# define _I ((complex_t)(1i)) ++# endif ++ + typedef std::complex<double> complex_t; + #else + # include <complex.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903252343.x2PNhCmj092553>