diff --git a/.gitignore b/.gitignore index 183a0ff..43fabef 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ f1dfbb50db27.tar.bz2 /luxblend25-ad6536b0dda8.tar.bz2 /lux-d0b0e20c47cc.tar.bz2 /luxrays-7459cd8a9583.tar.bz2 +/luxrender-lux-dfd211d6faa0.tar.bz2 +/luxrender-luxblend25-a249c861c2f3.tar.bz2 +/luxrender-luxrays-7c7127ee1fa4.tar.bz2 diff --git a/LuxRender.spec b/LuxRender.spec index 43c2364..ca7b55b 100644 --- a/LuxRender.spec +++ b/LuxRender.spec @@ -1,36 +1,38 @@ # [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 hash0 d0b0e20c47cc -%global hash1 ad6536b0dda8 -%global hash2 7459cd8a9583 +%global hash0 dfd211d6faa0 +%global hash1 a249c861c2f3 +%global hash2 7c7127ee1fa4 -Name: LuxRender -Version: 1.3.1 -Release: 33%{?dist} -Summary: Lux Renderer, an unbiased rendering system +Name: LuxRender +Version: 1.4 +Release: 1%{?dist} +Summary: Lux Renderer, an unbiased rendering system -Group: Applications/Multimedia License: GPLv3+ and BSD URL: http://www.luxrender.net #Taken from http://src.luxrender.net/lux/archive/XXXXX.tar.bz2 AKA said release -Source0: http://src.luxrender.net/lux/archive/lux-%{hash0}.tar.bz2 -Source1: http://src.luxrender.net/luxblend25/archive/luxblend25-%{hash1}.tar.bz2 -Source2: http://src.luxrender.net/luxrays/file/luxrays-%{hash2}.tar.bz2 +Source0: http://src.luxrender.net/lux/archive/luxrender-lux-%{hash0}.tar.bz2 +Source1: http://src.luxrender.net/luxblend25/archive/luxrender-luxblend25-%{hash1}.tar.bz2 +Source2: http://src.luxrender.net/luxrays/file/luxrender-luxrays-%{hash2}.tar.bz2 Source3: luxblend-default.cfg -Patch0: lux-1.3-boost-fs-iostreams.patch +#Patch0: lux-1.3-boost-fs-iostreams.patch # https://bitbucket.org/luxrender/lux/commits/0c9c093 -Patch1: lux-1.3.1-gcc6.patch +#Patch1: lux-1.3.1-gcc6.patch #LuxRender use intensively SSE3 -ExclusiveArch: %{ix86} x86_64 ia64 +%if 0%{?fedora} < 26 +ExclusiveArch: %{ix86} x86_64 +%else +ExclusiveArch: x86_64 +%endif BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: cmake BuildRequires: dos2unix - BuildRequires: bison BuildRequires: boost-devel BuildRequires: fftw-devel @@ -38,20 +40,20 @@ BuildRequires: flex BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: freeimage-devel +BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: qt4-devel BuildRequires: libpng-devel BuildRequires: libjpeg-turbo-devel BuildRequires: libtiff-devel +BuildRequires: ilmbase-devel BuildRequires: OpenEXR-devel -BuildRequires: python-devel +BuildRequires: OpenImageIO-devel +BuildRequires: python3-devel BuildRequires: wxGTK-devel - BuildRequires: libXdamage-devel BuildRequires: libXmu-devel - BuildRequires: blender-rpm-macros - BuildRequires: opencl-headers BuildRequires: ocl-icd-devel @@ -70,7 +72,6 @@ The %{name}-lib package contains shared library for %{name}. %package core Summary: Core binaries for %{name} -Group: Applications/Multimedia Requires: %{name}-lib%{?_isa} = %{version}-%{release} %description core @@ -78,7 +79,6 @@ The %{name}-core package contains core binaries for using %{name}. %package blender Summary: Blender export plugin to %{name} -Group: Applications/Multimedia Requires: %{name}%{?_isa} = %{version}-%{release} Requires: blender(ABI) = %{blender_api} @@ -88,7 +88,6 @@ to export into %{name} %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}-lib%{?_isa} = %{version}-%{release} Provides: %{name}-devel-docs = %{version}-%{release} Obsoletes: %{name}-devel-docs < 0.7 @@ -100,11 +99,9 @@ developing applications that use %{name}. %prep -%setup -q -n lux-%{hash0} -%setup -q -D -T -a 1 -n lux-%{hash0} -%setup -q -D -T -a 2 -n lux-%{hash0} -%patch0 -p1 -%patch1 -p1 +%autosetup -n luxrender-lux-%{hash0} +%autosetup -D -T -a 1 -n luxrender-lux-%{hash0} +%autosetup -D -T -a 2 -n luxrender-lux-%{hash0} #Disable tweaking %if 0 sed -i -e 's/-O3//' CMakeLists.txt @@ -122,8 +119,8 @@ sed -i -e 's/-mfpmath=sse//' CMakeLists.txt %build #Building luxrays -mkdir -p luxrays-%{hash2}/build -pushd luxrays-%{hash2}/build +mkdir -p luxrender-luxrays-%{hash2}/build +pushd luxrender-luxrays-%{hash2}/build %cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ @@ -149,10 +146,12 @@ pushd build %cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DLUXRAYS_INCLUDE_DIRS=%{_builddir}/%{buildsubdir}/luxrays-%{hash2}/include \ - -DLUXRAYS_LIBRARY=%{_builddir}/%{buildsubdir}/luxrays-%{hash2}/build/lib/libluxrays.a \ - -DSLG_INCLUDE_DIRS=%{_builddir}/%{buildsubdir}/luxrays-%{hash2}/include \ - -DSLG_LIBRARY=%{_builddir}/%{buildsubdir}/luxrays-%{hash2}/build/lib/libsmallluxgpu.a \ + -DLUXCORE_INCLUDE_DIRS=%{_builddir}/%{buildsubdir}/luxrender-luxrays-%{hash2}/include \ + -DLUXCORE_LIBRARY=%{_builddir}/%{buildsubdir}/luxrender-luxrays-%{hash2}/build/lib/libluxcore.a \ + -DLUXRAYS_INCLUDE_DIRS=%{_builddir}/%{buildsubdir}/luxrender-luxrays-%{hash2}/include \ + -DLUXRAYS_LIBRARY=%{_builddir}/%{buildsubdir}/luxrender-luxrays-%{hash2}/build/lib/libluxrays.a \ + -DSLG_INCLUDE_DIRS=%{_builddir}/%{buildsubdir}/luxrender-luxrays-%{hash2}/include \ + -DSLG_LIBRARY=%{_builddir}/%{buildsubdir}/luxrender-luxrays-%{hash2}/build/lib/libsmallluxgpu.a \ -DLUXRAYS_DISABLE_OPENCL:BOOL=OFF \ -DCMAKE_CXX_FLAGS="$CXXFLAGS -DLUXRAYS_DISABLE_OPENCL=0" \ %if %{?_lib} == "lib64" @@ -160,32 +159,30 @@ pushd build %endif .. -make %{?_smp_mflags} VERBOSE=1 +make -j1 VERBOSE=1 popd %install pushd build - -make install DESTDIR=$RPM_BUILD_ROOT - +%make_install popd desktop-file-install --vendor "" --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --dir %{buildroot}%{_datadir}/applications \ --remove-category Application \ - $RPM_BUILD_ROOT%{_datadir}/applications/luxrender.desktop + %{buildroot}%{_datadir}/applications/luxrender.desktop +# Install addons for Blender +mkdir -p %{buildroot}%{blender_libdir}/scripts/bpydata/config +mkdir -p %{buildroot}%{blender_addons} -mkdir -p $RPM_BUILD_ROOT%{blender_libdir}/scripts/bpydata/config -mkdir -p $RPM_BUILD_ROOT%{blender_addons} - -cp -pr luxblend25-%{hash1}/src/luxrender \ - $RPM_BUILD_ROOT%{blender_addons}/ +cp -pr luxrender-luxblend25-%{hash1}/src/luxrender \ + %{buildroot}%{blender_addons}/ install -pm 0644 %{SOURCE3} \ - $RPM_BUILD_ROOT%{blender_libdir}/scripts/bpydata/config/luxblend.cfg + %{buildroot}%{blender_libdir}/scripts/bpydata/config/luxblend.cfg # Register as an application to be visible in the software center # @@ -194,8 +191,8 @@ install -pm 0644 %{SOURCE3} \ # # See http://www.freedesktop.org/software/appstream/docs/ for more details. # -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/luxrender.appdata.xml < %{buildroot}%{_datadir}/appdata/luxrender.appdata.xml <