diff --git a/lv2-x42-plugins-complex.patch b/lv2-x42-plugins-complex.patch new file mode 100644 index 0000000..5f61d76 --- /dev/null +++ b/lv2-x42-plugins-complex.patch @@ -0,0 +1,14 @@ +diff --git a/tuna.lv2/src/spectr.c b/tuna.lv2/src/spectr.c +index 665ad4f..e9e06cc 100644 +--- a/tuna.lv2/src/spectr.c ++++ b/tuna.lv2/src/spectr.c +@@ -31,6 +31,9 @@ + # define creal(XX) std::real(XX) + # define cimag(XX) std::imag(XX) + # define _I ((complex_t)(1i)) ++ #ifdef __cpp_lib_complex_udls ++ using namespace std::literals::complex_literals; ++ #endif + typedef std::complex complex_t; + #else + # include diff --git a/lv2-x42-plugins-ftbs-glibc-2.27.patch b/lv2-x42-plugins-ftbs-glibc-2.27.patch new file mode 100644 index 0000000..1bc0277 --- /dev/null +++ b/lv2-x42-plugins-ftbs-glibc-2.27.patch @@ -0,0 +1,13 @@ +diff --git a/meters.lv2/gui/phasewheel.c b/meters.lv2/gui/phasewheel.c +index 44a6e70..48fa20a 100644 +--- a/meters.lv2/gui/phasewheel.c ++++ b/meters.lv2/gui/phasewheel.c +@@ -812,7 +812,7 @@ static bool cb_set_gain (RobWidget* handle, void *data) { + queue_draw(ui->m2); + } + #ifdef __USE_GNU +- const float thresh = pow10f(.05 * (MIN_CUTOFF - val)); ++ const float thresh = exp10f(.05 * (MIN_CUTOFF - val)); + #else + const float thresh = powf(10, .05 * (MIN_CUTOFF - val)); + #endif diff --git a/lv2-x42-plugins.spec b/lv2-x42-plugins.spec index 57198e9..71468ac 100644 --- a/lv2-x42-plugins.spec +++ b/lv2-x42-plugins.spec @@ -2,7 +2,7 @@ Name: lv2-x42-plugins Version: 0.3.0 -Release: 0.4.%{prerelease}%{?dist} +Release: 0.5.%{prerelease}%{?dist} Summary: A number of LV2 plugins # files in balance.lv2/pugl are ISC, the rest are GPLv2+ @@ -11,6 +11,14 @@ URL: https://github.com/x42/x42-plugins # A tarball is now provided at http://gareus.org/misc/x42-plugins.php Source0: http://gareus.org/misc/x42-plugins/x42-plugins-%{prerelease}.tar.xz Source1: README.md + +# Obsolete pow10 functions +# https://sourceware.org/git/?p=glibc.git;a=commit;h=5a80d39d0d2587e9bd8e72f19e92eeb2a66fbe9e +Patch0: %{name}-ftbs-glibc-2.27.patch +# complex operator""i are declared in the namespace std::literals::complex_literals +# http://en.cppreference.com/w/cpp/numeric/complex/operator%22%22i +Patch1: %{name}-complex.patch + BuildRequires: gcc-c++ BuildRequires: lv2-devel >= 1.8.1 BuildRequires: zita-convolver-devel @@ -40,6 +48,8 @@ convolver, fader, parametric equalizer, auto-tune. %prep %setup -q -n x42-plugins-%{prerelease} +%patch0 -p1 +%patch1 -p1 cp -p %{SOURCE1} . %build @@ -57,6 +67,7 @@ export FONTFILE="/usr/share/fonts/gnu-free/FreeSansBold.ttf" export STRIP=/bin/true export OPTIMIZATIONS="%{optflags} ${flags}" export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" export LDFLAGS="%{__global_ldflags} -lpthread" %make_build LIBDIR=%{_libdir} LV2DIR=%{_libdir}/lv2 PREFIX=%{_prefix} @@ -72,6 +83,9 @@ export LDFLAGS="%{__global_ldflags} -lpthread" %{_mandir}/man1/x42* %changelog +* Tue Feb 13 2018 Guido Aulisi - 0.3.0-0.5.20170428 +- Fix FTBS with glibc 2.27 and gcc 8 + * Thu Feb 08 2018 Fedora Release Engineering - 0.3.0-0.4.20170428 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild