From e36d9c85370847b8403b7ab4b01c62ef42a4e969 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mar 30 2019 04:34:42 +0000 Subject: Patch using non-native fp_classify for boost 1.69 --- diff --git a/luxcorerender.spec b/luxcorerender.spec index fa5afe2..a202418 100644 --- a/luxcorerender.spec +++ b/luxcorerender.spec @@ -8,7 +8,7 @@ Version: 2.1 %if %{with_prerelease} Release: 0.3.%{prerelease}%{?dist} %else -Release: 3%{?dist} +Release: 4%{?dist} %endif Summary: LuxCore Renderer, an unbiased rendering system @@ -19,7 +19,7 @@ Source1: https://github.com/%{name}/BlendLuxCore/archive/blendluxcore_v%{version Source3: blender-%{name}.metainfo.xml # Upstream patch address boost requirement -#Patch0: use-non_native-fp_classify-for-boost-106900.patch +Patch0: use-non_native-fp_classify-for-boost-106900.patch # Temporarily disable slg library #Patch1: luxcorerender-ignore-slg-library.patch @@ -56,7 +56,6 @@ BuildRequires: python3-devel BuildRequires: python3-pillow-devel #BuildRequires: python-pyside-devel BuildRequires: tbb-devel -BuildRequires: /usr/bin/pathfix.py Requires: %{name}-core = %{version}-%{release} Obsoletes: LuxRender < 2.0 @@ -112,7 +111,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-examples package contains sample binaries using %{name}. %prep -%autosetup -n LuxCore-%{name}_v%{version}%{?prerelease} +%autosetup -p1 -n LuxCore-%{name}_v%{version}%{?prerelease} %setup -q -T -D -a 1 -n LuxCore-%{name}_v%{version}%{?prerelease} sed -i \ @@ -135,13 +134,12 @@ pushd build #Building lux %cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DBOOST_LOCATION=%{_prefix} \ + -DBOOST_LOCATION=%{_libdir} \ -DLUXRAYS_DISABLE_OPENCL=0 \ - -DPYTHON_V=%{python3_pkgversion} \ + -DPYTHON_V=%{python3_version_nodots} \ .. -%make_build popd - +%make_build %install mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_datadir}/%{name} @@ -195,6 +193,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/blender-%{name %{_includedir}/{luxcore,luxrays,slg} %changelog +* Fri Mar 29 2019 Luya Tshimbalanga - 2.1-4 +- Patch using non-native fp_classify for boost 1.69 + * Fri Mar 22 2019 Luya Tshimbalanga - 2.1-3 - Rebuilt for embree 3.5.2