diff --git a/.gitignore b/.gitignore index 3ab3b4c..748705b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /luxcorerender_v2.1beta4.tar.gz /blendluxcore_v2.1.tar.gz /luxcorerender_v2.1.tar.gz +/luxcorerender_v2.2alpha1.tar.gz +/blendluxcore_v2.2alpha1.tar.gz diff --git a/luxcorerender.spec b/luxcorerender.spec index a202418..886b344 100644 --- a/luxcorerender.spec +++ b/luxcorerender.spec @@ -1,12 +1,12 @@ # [Fedora] Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%global with_prerelease 0 -#%%global prerelease beta4 +%global with_prerelease 1 +%global prerelease alpha1 Name: luxcorerender -Version: 2.1 +Version: 2.2 %if %{with_prerelease} -Release: 0.3.%{prerelease}%{?dist} +Release: 0.1.%{prerelease}%{?dist} %else Release: 4%{?dist} %endif @@ -18,19 +18,17 @@ Source0: https://github.com/%{name}/LuxCore/archive/luxcorerender_v%{version}%{? Source1: https://github.com/%{name}/BlendLuxCore/archive/blendluxcore_v%{version}%{?prerelease}.tar.gz Source3: blender-%{name}.metainfo.xml -# Upstream patch address boost requirement -Patch0: use-non_native-fp_classify-for-boost-106900.patch -# Temporarily disable slg library -#Patch1: luxcorerender-ignore-slg-library.patch +# add python build dependency +Patch0: python.patch +# drop eos portable archiver (Manjaro) +Patch1: boost016900_serialization.patch -#LuxCoreRender use intensively SSE3 -#ExclusiveArch: %%{ix86} x86_64 ia64 +# Upstream only uses 64 bit archtecture ExclusiveArch: x86_64 BuildRequires: bison BuildRequires: blender-rpm-macros BuildRequires: blosc-devel -BuildRequires: boost-devel BuildRequires: boost-python3-devel BuildRequires: chrpath BuildRequires: cmake @@ -48,19 +46,23 @@ BuildRequires: libpng-devel BuildRequires: libjpeg-turbo-devel BuildRequires: libtiff-devel BuildRequires: ocl-icd-devel +BuildRequires: oidn-devel BuildRequires: opencl-headers BuildRequires: OpenEXR-devel BuildRequires: OpenImageIO-devel BuildRequires: openvdb-devel BuildRequires: python3-devel +BuildRequires: pyside-tools BuildRequires: python3-pillow-devel -#BuildRequires: python-pyside-devel BuildRequires: tbb-devel Requires: %{name}-core = %{version}-%{release} Obsoletes: LuxRender < 2.0 Provides: LuxRender = 2.0 +# Use python dependency generator +%{?python_enable_dependency_generator} + %description LuxCoreRender is a rendering system for physically correct image synthesis. @@ -114,32 +116,25 @@ The %{name}-examples package contains sample binaries using %{name}. %autosetup -p1 -n LuxCore-%{name}_v%{version}%{?prerelease} %setup -q -T -D -a 1 -n LuxCore-%{name}_v%{version}%{?prerelease} -sed -i \ - -e 's|Boost|BOOST|g' \ - CMakeLists.txt +# Disable slg library # Fix all Python shebangs recursively in . -# -p preserves timestamps -# -n prevents creating ~backup files -# -i specifies the interpreter for the shebang -# Need to list files that do not match ^[a-zA-Z0-9_]+\.py$ explicitly! pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build -# Suppress unused-direct-shlib-dependency warning -export CXXFLAGS="%{optflags} -Wl,--as-needed" - mkdir -p build pushd build #Building lux %cmake \ + -DCMAKE_CXX_FLAGS="%{optflags} -Wl,--as-needed" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DBOOST_LOCATION=%{_libdir} \ -DLUXRAYS_DISABLE_OPENCL=0 \ - -DPYTHON_V=%{python3_version_nodots} \ + -DBUILD_SHARED_LIBS=ON \ +S -DPYTHON_V=%{python3_version_nodots} \ .. -popd %make_build +popd + %install mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_datadir}/%{name} @@ -193,8 +188,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/blender-%{name %{_includedir}/{luxcore,luxrays,slg} %changelog +* Sun Mar 31 2019 Luya Tshimbalanga - 2.2-0.1.alpha1 +- Update to 2.2alpha1 + * Fri Mar 29 2019 Luya Tshimbalanga - 2.1-4 -- Patch using non-native fp_classify for boost 1.69 +- Patch for boost 1.69 serialisation * Fri Mar 22 2019 Luya Tshimbalanga - 2.1-3 - Rebuilt for embree 3.5.2 diff --git a/sources b/sources index 98bb253..1e37531 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (blendluxcore_v2.1.tar.gz) = 7174cf6411e3a22a7dbde2e84b8bab6f4629200023164374b8998e3beed3283723fa5070349f8f21d6dee0462eb497b6b30603097f41ed2070ecc18e2ed5f970 -SHA512 (luxcorerender_v2.1.tar.gz) = a0ade8e7639578fdc670bbfe29ecaea206548c10f9eb0741dbaf86f3bf68949c742eebc63bb2091e5189918bd44b91468d0c6db562ef76a6d7036c94cd85cc7f +SHA512 (luxcorerender_v2.2alpha1.tar.gz) = 3f554dd307f04dd70e8d128012e9d702b552bd8d7c03eb054513e5a9aec2e333a0f310c2618ce9422827d31c6808fba4759212265667bd0d6c5be7107ca87543 +SHA512 (blendluxcore_v2.2alpha1.tar.gz) = 6db2da0d3b3868f136d145b222cdf5c0f44cd9aa66dc0a99aefda78949fda036e956305140127a545efe9df7fa75582f5828417cdb2c07106bc66538f0fc7038