diff --git a/106575.patch b/106575.patch new file mode 100644 index 0000000..9ebd651 --- /dev/null +++ b/106575.patch @@ -0,0 +1,40 @@ +From d31c524b46d1e52daf13ad60372df2307b89ee0b Mon Sep 17 00:00:00 2001 +From: aekoroglu +Date: Wed, 5 Apr 2023 00:00:57 +0300 +Subject: [PATCH] CUdeviceptr and hipDeviceptr_t unsigned int loses precision + fix for ppc64le + +--- + extern/cuew/include/cuew.h | 2 +- + extern/hipew/include/hipew.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extern/cuew/include/cuew.h b/extern/cuew/include/cuew.h +index 5979f48e43d..278fb1172ee 100644 +--- a/extern/cuew/include/cuew.h ++++ b/extern/cuew/include/cuew.h +@@ -127,7 +127,7 @@ typedef uint32_t cuuint32_t; + typedef uint64_t cuuint64_t; + #endif + +-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) ++#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__) + typedef unsigned long long CUdeviceptr; + #else + typedef unsigned int CUdeviceptr; +diff --git a/extern/hipew/include/hipew.h b/extern/hipew/include/hipew.h +index 50f6d6607ec..1333efba951 100644 +--- a/extern/hipew/include/hipew.h ++++ b/extern/hipew/include/hipew.h +@@ -84,7 +84,7 @@ typedef uint32_t hipuint32_t; + typedef uint64_t hipuint64_t; + #endif + +-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) ++#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__) || defined(__ppc64__) || defined(__PPC64__) + typedef unsigned long long hipDeviceptr_t; + #else + typedef unsigned int hipDeviceptr_t; +-- +2.30.2 + diff --git a/blender.spec b/blender.spec index a30cbe9..867f29e 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 3.4 +%global blender_api 3.5 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %bcond_with clang @@ -34,7 +34,7 @@ Name: blender Epoch: 1 -Version: 3.4.1 +Version: 3.5.0 Release: %autorelease @@ -45,20 +45,8 @@ URL: https://www.blender.org Source0: https://download.%{name}.org/source/%{name}-%{version}.tar.xz Source1: macros.%{name} -# Include missing pyconfig header for 3.10 -Patch: %{name}-usd-pythonlibs-fix.diff - -# Include missing system error from GCC 13+ -# https://developer.blender.org/D17151 -Patch: %{name}-include-system-error-library.diff - -# Fix building with boost >= 1.81 -# https://projects.blender.org/blender/blender/commit/79837c5ed4b57925bf6c6bb9e7c2248f6f52bbb0 -Patch: https://projects.blender.org/blender/blender/commit/79837c5ed4b57925bf6c6bb9e7c2248f6f52bbb0.patch - -# Fix building with ffmpeg >= 6.0 -# https://projects.blender.org/blender/blender/commit/0d080d1a07a26055796b0ea5b7095a01dec9fee0 -Patch: %{name}-3.4.1-ffmpeg6.patch +# https://projects.blender.org/blender/blender/pulls/106575 +Patch: 106575.patch # Development stuff BuildRequires: boost-devel @@ -254,8 +242,11 @@ sed -i "s/date_time/date_time python%{python3_version_nodots}/" \ -DCMAKE_CXX_FLAGS="%{optflags} -Wl,--as-needed" \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_SKIP_RPATH=ON \ +%if %{with clang} + -D_CLANG_LIBRARIES=%{_libdir}/libclang-cpp.so \ +%endif -DEMBREE_INCLUDE_DIR=%{_includedir}/embree3 \ - -DEMBREE_LIBRARY=%{_lidir}/embree3.so \ + -DEMBREE_LIBRARY=%{_libdir}/libembree3.so.3 \ -DPYTHON_VERSION=%{python3_version} \ -DWITH_COMPILER_CCACHE=ON \ -DWITH_CYCLES=%{cyclesflag} \ @@ -285,7 +276,8 @@ sed -i "s/date_time/date_time python%{python3_version_nodots}/" \ %else -DWITH_USD=OFF \ %endif - -DXR_OPENXR_SDK_LOADER_LIBRARY=%{_libdir}/libopenxr_loader.so.1 + -DXR_OPENXR_SDK_LOADER_LIBRARY=%{_libdir}/libopenxr_loader.so.1 \ + -DWITH_LIBS_PRECOMPILED=OFF %cmake_build diff --git a/sources b/sources index 307738a..2d84e92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blender-3.4.1.tar.xz) = d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab +SHA512 (blender-3.5.0.tar.xz) = 140820b893c0dc27fc203d0b52be83ffd715fb7d3e9f383d9b87483bb7705b85664908d58c1fef0ae1aee00b47507154a7c2c52d7587a01d6ff74524f9595683