Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2019-10-12 22:31:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Sat Oct 12 22:31:00 2019 rev:120 rq:737385 version:2.80 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-09-26 20:41:05.002566645 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.2352/blender.changes 2019-10-12 22:31:03.335567569 +0200 @@ -1,0 +2,11 @@ +Wed Oct 2 09:19:39 UTC 2019 - Dave Plater <davejpla...@gmail.com> + +- Fix ppc build with 0006-add_ppc64el-s390x_support.patch. + +------------------------------------------------------------------- +Sun Sep 29 09:06:55 UTC 2019 - Dave Plater <davejpla...@gmail.com> + +- If $_threads are less than 4 undefine _lto_cflags as the value of + 3 or less fails at link time also build with one thread. + +------------------------------------------------------------------- New: ---- 0006-add_ppc64el-s390x_support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.Z62cOF/_old 2019-10-12 22:31:05.455562180 +0200 +++ /var/tmp/diff_new_pack.Z62cOF/_new 2019-10-12 22:31:05.459562170 +0200 @@ -53,6 +53,7 @@ Source3: geeko.README Source4: blender-sample Source8: %{name}.appdata.xml +Patch0: 0006-add_ppc64el-s390x_support.patch #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -101,6 +102,7 @@ BuildRequires: xz BuildRequires: xz-devel BuildRequires: cmake(pugixml) +BuildRequires: pkgconfig(IlmBase) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) @@ -210,11 +212,21 @@ for i in `grep -rl "/usr/bin/env python3"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done %build -%limit_build -m 1500 +%limit_build -m 2500 #The limit_build macro fails to give the same value to -flto= as it gives to -j #resulting in link time crashes echo $_threads -%define _lto_cflags -flto=$_threads + +export _smp_mflags=%{_smp_mflags} +if test "$_threads" -gt 3; +then \ +export _lto_cflags="-flto=$_threads" +else \ +export _lto_cflags="" +export _smp_mflags="" +fi +%define _lto_cflags $_lto_cflags + echo %{optflags} # sse options only on supported archs %ifarch %{ix86} x86_64 @@ -342,124 +354,7 @@ -DWITH_X11_XF86VMODE:BOOL=ON \ -DWITH_DOC_MANPAGE:BOOL=ON \ -DCYCLES_CUDA_BINARIES_ARCH="sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75" - -#Build at all costs -if ! make %{?_smp_mflags} -then \ -%define _lto_cflags %{nil} -cmake ../ \ -%if 0%{?debugbuild} == 1 - -DCMAKE_BUILD_TYPE:STRING=Debug \ - -DCMAKE_C_FLAGS_DEBUG:STRING="-fsanitize=address -ggdb" \ - -DCMAKE_CXX_FLAGS_DEBUG:STRING="-fsanitize=address -ggdb" \ - -DWITH_MEM_VALGRIND:BOOL=ON \ - -DWITH_ASSERT_ABORT:BOOL=ON \ -%else - -DCMAKE_C_FLAGS:STRING="$CFLAGS %{optflags} -fPIC ${sseflags} -fopenmp" \ - -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC ${sseflags} -fopenmp" \ -%endif - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-pie" \ - -DBUILD_SHARED_LIBS:BOOL=OFF \ - -DWITH_INSTALL_PORTABLE:BOOL=OFF \ -%if 0%{?is_opensuse} == 1 - -DWITH_MEM_JEMALLOC:BOOL=ON \ -%endif -%if %{with alembic} - -DWITH_ALEMBIC:BOOL=ON \ -%endif - -DWITH_BUILDINFO:BOOL=ON \ - -DWITH_BULLET:BOOL=ON \ - -DWITH_CODEC_AVI:BOOL=ON \ - -DWITH_CODEC_FFMPEG:BOOL=ON \ - -DWITH_CODEC_SNDFILE:BOOL=ON \ - -DLIBSNDFILE_ROOT_DIR:FILE=%{_prefix} \ -%ifarch ppc ppc64 ppc64le - -DWITH_CYCLES:BOOL=OFF \ -%else - -DWITH_CYCLES:BOOL=ON \ -%if %{with osl} - -DWITH_CYCLES_OSL:BOOL=ON \ -%endif -%if %{with embree} - -DWITH_CYCLES_EMBREE:BOOL=ON \ -%endif - -DWITH_LLVM:BOOL=ON \ - -DLLVM_LIBRARY:FILE=%{_libdir}/libLLVM.so \ -%endif - -DWITH_DRACO:BOOL=ON \ - -DWITH_FFTW3:BOOL=ON \ - -DWITH_LIBMV:BOOL=ON \ - -DWITH_LIBMV_SCHUR_SPECIALIZATIONS:BOOL=ON \ - -DWITH_COMPOSITOR:BOOL=ON \ - -DWITH_FREESTYLE:BOOL=ON \ - -DWITH_GHOST_XDND:BOOL=ON \ - -DWITH_IK_SOLVER:BOOL=ON \ - -DWITH_IK_ITASC:BOOL=ON \ - -DWITH_IMAGE_CINEON:BOOL=ON \ - -DWITH_IMAGE_DDS:BOOL=ON \ - -DWITH_IMAGE_HDR:BOOL=ON \ - -DWITH_IMAGE_OPENEXR:BOOL=ON \ - -DWITH_IMAGE_OPENJPEG:BOOL=ON \ - -DOPENJPEG_LIBRARY:FILE=%{_libdir}/libopenjp2.so \ - -DWITH_IMAGE_TIFF:BOOL=ON \ - -DWITH_INPUT_NDOF:BOOL=ON \ - -DWITH_INTERNATIONAL:BOOL=ON \ - -DWITH_JACK:BOOL=ON \ - -DWITH_JACK_DYNLOAD:BOOL=ON \ - -DWITH_LZMA:BOOL=ON \ - -DWITH_LZO:BOOL=ON \ - -DWITH_SYSTEM_LZO:BOOL=ON \ - -DWITH_MOD_FLUID:BOOL=ON \ - -DWITH_MOD_REMESH:BOOL=ON \ - -DWITH_MOD_SMOKE:BOOL=ON \ -%ifnarch x86_64 - -DWITH_MOD_OCEANSIM:BOOL=OFF \ -%else - -DWITH_MOD_OCEANSIM:BOOL=ON \ -%endif - -DWITH_AUDASPACE:BOOL=ON \ -%if %{with system_audaspace} - -DWITH_SYSTEM_AUDASPACE:BOOL=ON \ -%endif - -DWITH_OPENAL:BOOL=ON \ -%if %{with collada} - -DWITH_OPENCOLLADA:BOOL=ON \ -%else - -DWITH_OPENCOLLADA:BOOL=OFF \ -%endif - -DWITH_OPENCOLORIO:BOOL=ON \ - -DWITH_OPENIMAGEIO:BOOL=ON \ - -DWITH_OPENMP:BOOL=ON \ -%if %{with opensubdiv} - -DWITH_OPENSUBDIV:BOOL=ON \ - -DOPENSUBDIV_OSDGPU_LIBRARY:FILE=%{_libdir}/libosdGPU.so \ -%endif -%if %{with openvdb} - -DWITH_OPENVDB:BOOL=ON \ - -DWITH_OPENVDB_BLOSC:BOOL=ON \ -%endif - -DWITH_PYTHON:BOOL=ON \ - -DWITH_PYTHON_INSTALL:BOOL=OFF \ - -DPYTHON_VERSION=$psver \ - -DPYTHON_LIBPATH=%{_libexecdir} \ - -DPYTHON_LIBRARY=python$pver \ - -DPYTHON_INCLUDE_DIRS=%{_includedir}/python$pver \ - -DWITH_PYTHON_INSTALL_NUMPY=OFF \ -%ifnarch x86_64 - -DWITH_RAYOPTIMIZATION:BOOL=OFF \ -%else - -DWITH_RAYOPTIMIZATION:BOOL=ON \ -%endif - -DWITH_SDL:BOOL=ON \ - -DWITH_SYSTEM_GLEW:BOOL=ON \ - -DWITH_X11_XINPUT:BOOL=ON \ - -DWITH_X11_XF86VMODE:BOOL=ON \ - -DWITH_DOC_MANPAGE:BOOL=ON \ - -DCYCLES_CUDA_BINARIES_ARCH="sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75" -make -fi +make $_smp_mflags %install echo "release version = %{_version}" ++++++ 0006-add_ppc64el-s390x_support.patch ++++++ From: Sergey Sharybin <ser...@blender.org> Date: Mon, 5 Aug 2019 20:30:45 +0200 Subject: add_ppc64el-s390x_support --- intern/numaapi/source/build_config.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h index 444adcc..488238c 100644 --- a/intern/numaapi/source/build_config.h +++ b/intern/numaapi/source/build_config.h @@ -307,6 +307,26 @@ # define ARCH_CPU_32_BITS 1 # define ARCH_CPU_BIG_ENDIAN 1 # endif +#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__) +# define ARCH_CPU_PPC64_FAMILY 1 +# define ARCH_CPU_PPC64 1 +# define ARCH_CPU_64_BITS 1 +# define ARCH_CPU_BIG_ENDIAN 1 +#elif defined(__PPC64__) +# define ARCH_CPU_PPC64_FAMILY 1 +# define ARCH_CPU_PPC64 1 +# define ARCH_CPU_64_BITS 1 +# define ARCH_CPU_LITTLE_ENDIAN 1 +#elif defined(__s390x__) +# define ARCH_CPU_S390_FAMILY 1 +# define ARCH_CPU_S390X 1 +# define ARCH_CPU_64_BITS 1 +# define ARCH_CPU_BIG_ENDIAN 1 +#elif defined(__s390__) +# define ARCH_CPU_S390_FAMILY 1 +# define ARCH_CPU_S390 1 +# define ARCH_CPU_31_BITS 1 +# define ARCH_CPU_BIG_ENDIAN 1 #else # error Please add support for your architecture in build_config.h #endif @@ -337,6 +357,12 @@ #if !defined(ARCH_CPU_MIPS64_FAMILY) # define ARCH_CPU_MIPS64_FAMILY 0 #endif +#if !defined(ARCH_CPU_PPC64_FAMILY) +# define ARCH_CPU_PPC64_FAMILY 0 +#endif +#if !defined(ARCH_CPU_S390_FAMILY) +# define ARCH_CPU_S390_FAMILY 0 +#endif //////////////////////////////////////////////////////////////////////////////// // Sizes of platform-dependent types.