From 0606004e36d8717ae478f532e2e00b53ae6d066e Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Tue, 6 Feb 2024 12:47:07 +0100 Subject: [PATCH] rebuilt by autoport with build requirements: libopencolorio-devel>=2.3.2-1mamba [release 4.0.2-2mamba;Mon Feb 05 2024] --- blender-2.46-xvidcore_configure.patch | 30 ---- blender-2.48a-ffmpeg-includes.patch | 100 ------------ blender-2.48a-ffmpeg.patch | 21 --- blender-2.68a-freestyle-build.patch | 16 -- blender-2.79a-freetype-link.patch | 9 -- ....patch => blender-3.6.2-force-draco1.patch | 0 ....patch => blender-3.6.2-force-draco2.patch | 2 +- blender-4.0.2-cmake-3.28.2.patch | 29 ++++ blender-wrapper | 3 - blender.desktop | 86 ---------- blender.png | Bin 4466 -> 0 bytes blender.spec | 149 ++++++++---------- 12 files changed, 94 insertions(+), 351 deletions(-) delete mode 100644 blender-2.46-xvidcore_configure.patch delete mode 100644 blender-2.48a-ffmpeg-includes.patch delete mode 100644 blender-2.48a-ffmpeg.patch delete mode 100644 blender-2.68a-freestyle-build.patch delete mode 100644 blender-2.79a-freetype-link.patch rename blender-3.1.2-force-draco1.patch => blender-3.6.2-force-draco1.patch (100%) rename blender-3.1.2-force-draco2.patch => blender-3.6.2-force-draco2.patch (92%) create mode 100644 blender-4.0.2-cmake-3.28.2.patch delete mode 100644 blender-wrapper delete mode 100644 blender.desktop delete mode 100644 blender.png diff --git a/blender-2.46-xvidcore_configure.patch b/blender-2.46-xvidcore_configure.patch deleted file mode 100644 index af9381e..0000000 --- a/blender-2.46-xvidcore_configure.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nru blender-2.46.orig/extern/xvidcore/build/generic/configure blender-2.46/extern/xvidcore/build/generic/configure ---- blender-2.46.orig/extern/xvidcore/build/generic/configure 2008-05-19 16:38:45.000000000 +0200 -+++ blender-2.46/extern/xvidcore/build/generic/configure 2008-05-22 13:18:35.000000000 +0200 -@@ -4016,9 +4016,9 @@ - if test "$ac_nasm" = "yes" ; then - echo "$as_me:$LINENO: checking for nasm patch version" >&5 - echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6 -- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1` -+ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1` - if test -z $nasm_patch ; then -- nasm_patch=-1 -+ nasm_patch=45 - fi - echo "$as_me:$LINENO: result: $nasm_patch" >&5 - echo "${ECHO_T}$nasm_patch" >&6 -diff -Nru blender-2.46.orig/extern/xvidcore/build/generic/configure.in blender-2.46/extern/xvidcore/build/generic/configure.in ---- blender-2.46.orig/extern/xvidcore/build/generic/configure.in 2008-05-19 16:38:45.000000000 +0200 -+++ blender-2.46/extern/xvidcore/build/generic/configure.in 2008-05-22 13:18:28.000000000 +0200 -@@ -363,9 +363,9 @@ - dnl Checking nasm patch version - dnl - AC_MSG_CHECKING([for nasm patch version]) -- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1` -+ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1` - if test -z $nasm_patch ; then -- nasm_patch=-1 -+ nasm_patch=45 - fi - AC_MSG_RESULT([$nasm_patch]) - diff --git a/blender-2.48a-ffmpeg-includes.patch b/blender-2.48a-ffmpeg-includes.patch deleted file mode 100644 index 49c7617..0000000 --- a/blender-2.48a-ffmpeg-includes.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naur blender-2.46-orig/source/blender/blenkernel/intern/writeffmpeg.c blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c ---- blender-2.46-orig/source/blender/blenkernel/intern/writeffmpeg.c 2008-07-28 15:33:17.000000000 +0300 -+++ blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c 2008-07-28 15:35:25.000000000 +0300 -@@ -29,11 +29,11 @@ - - #include - --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 -diff -Naur blender-2.46-orig/source/blender/imbuf/intern/anim.c blender-2.46/source/blender/imbuf/intern/anim.c ---- blender-2.46-orig/source/blender/imbuf/intern/anim.c 2008-05-19 17:38:41.000000000 +0300 -+++ blender-2.46/source/blender/imbuf/intern/anim.c 2008-07-28 16:06:04.000000000 +0300 -@@ -83,10 +83,10 @@ - #include "IMB_anim5.h" - - #ifdef WITH_FFMPEG --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 -diff -Naur blender-2.46-orig/source/blender/imbuf/intern/IMB_anim.h blender-2.46/source/blender/imbuf/intern/IMB_anim.h ---- blender-2.46-orig/source/blender/imbuf/intern/IMB_anim.h 2008-05-19 17:38:41.000000000 +0300 -+++ blender-2.46/source/blender/imbuf/intern/IMB_anim.h 2008-07-28 16:06:04.000000000 +0300 -@@ -76,9 +76,9 @@ - #endif /* WITH_QUICKTIME */ - - #ifdef WITH_FFMPEG --#include --#include --#include -+#include -+#include -+#include - #endif - - #include "IMB_imbuf_types.h" -diff -Naur blender-2.46-orig/source/blender/imbuf/intern/util.c blender-2.46/source/blender/imbuf/intern/util.c ---- blender-2.46-orig/source/blender/imbuf/intern/util.c 2008-05-19 17:38:41.000000000 +0300 -+++ blender-2.46/source/blender/imbuf/intern/util.c 2008-07-28 16:06:04.000000000 +0300 -@@ -62,8 +62,8 @@ - #endif - - #ifdef WITH_FFMPEG --#include --#include -+#include -+#include - - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 -diff -Naur blender-2.46-orig/source/blender/src/buttons_scene.c blender-2.46/source/blender/src/buttons_scene.c ---- blender-2.46-orig/source/blender/src/buttons_scene.c 2008-07-28 16:13:29.000000000 +0300 -+++ blender-2.46/source/blender/src/buttons_scene.c 2008-07-28 16:20:45.000000000 +0300 -@@ -108,9 +108,9 @@ - - #ifdef WITH_FFMPEG - --#include /* for PIX_FMT_* and CODEC_ID_* */ --#include --#include -+#include /* for PIX_FMT_* and CODEC_ID_* */ -+#include -+#include - - static int ffmpeg_preset_sel = 0; - -diff -Naur blender-2.46-orig/source/blender/src/hddaudio.c blender-2.46/source/blender/src/hddaudio.c ---- blender-2.46-orig/source/blender/src/hddaudio.c 2008-07-28 16:13:29.000000000 +0300 -+++ blender-2.46/source/blender/src/hddaudio.c 2008-07-28 16:20:45.000000000 +0300 -@@ -33,9 +33,9 @@ - #endif - - #ifdef WITH_FFMPEG --#include --#include --#include -+#include -+#include -+#include - #if LIBAVFORMAT_VERSION_INT < (49 << 16) - #define FFMPEG_OLD_FRAME_RATE 1 - #else diff --git a/blender-2.48a-ffmpeg.patch b/blender-2.48a-ffmpeg.patch deleted file mode 100644 index 635faac..0000000 --- a/blender-2.48a-ffmpeg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru blender-2.48a.orig/source/blender/src/hddaudio.c blender-2.48a/source/blender/src/hddaudio.c ---- blender-2.48a.orig/source/blender/src/hddaudio.c 2008-10-22 18:36:41.000000000 +0200 -+++ blender-2.48a/source/blender/src/hddaudio.c 2008-11-17 15:13:24.000000000 +0100 -@@ -311,7 +311,7 @@ - audio_pkt_size = packet.size; - - while (audio_pkt_size > 0) { -- len = avcodec_decode_audio( -+ len = avcodec_decode_audio2( - hdaudio->pCodecCtx, - hdaudio->decode_cache - + decode_pos, -@@ -478,7 +478,7 @@ - } - - while (audio_pkt_size > 0) { -- len = avcodec_decode_audio( -+ len = avcodec_decode_audio2( - hdaudio->pCodecCtx, - hdaudio->decode_cache - + decode_pos, diff --git a/blender-2.68a-freestyle-build.patch b/blender-2.68a-freestyle-build.patch deleted file mode 100644 index 89cb926..0000000 --- a/blender-2.68a-freestyle-build.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- blender-2.68a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp 2013-07-26 22:37:28.836673925 +0200 -+++ blender-2.68a.orig/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp 2013-04-09 02:46:49.000000000 +0200 -@@ -53,13 +53,11 @@ - loadIdentity(projection_matrix_); - } - --#if 0 /* UNUSED, gives warning in gcc */ - NodeCamera::NodeCamera(const NodeCamera& iBrother) : camera_type_(iBrother.camera_type_) - { - memcpy(modelview_matrix_, iBrother.modelview_matrix_, 16 * sizeof(double)); - memcpy(projection_matrix_, iBrother.projection_matrix_, 16 * sizeof(double)); - } --#endif - - void NodeCamera::accept(SceneVisitor& v) - { diff --git a/blender-2.79a-freetype-link.patch b/blender-2.79a-freetype-link.patch deleted file mode 100644 index c9987c8..0000000 --- a/blender-2.79a-freetype-link.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- blender-2.79a/source/blender/blentranslation/msgfmt/CMakeLists.txt.orig 2018-03-11 21:41:59.164492990 +0100 -+++ blender-2.79a/source/blender/blentranslation/msgfmt/CMakeLists.txt 2018-03-11 21:39:01.994550654 +0100 -@@ -48,3 +48,6 @@ - - target_link_libraries(msgfmt ${ZLIB_LIBRARIES}) - target_link_libraries(msgfmt ${PLATFORM_LINKLIBS}) -+target_link_libraries(msgfmt extern_wcwidth) -+target_link_libraries(msgfmt bf_intern_eigen) -+target_link_libraries(msgfmt "-lfreetype") diff --git a/blender-3.1.2-force-draco1.patch b/blender-3.6.2-force-draco1.patch similarity index 100% rename from blender-3.1.2-force-draco1.patch rename to blender-3.6.2-force-draco1.patch diff --git a/blender-3.1.2-force-draco2.patch b/blender-3.6.2-force-draco2.patch similarity index 92% rename from blender-3.1.2-force-draco2.patch rename to blender-3.6.2-force-draco2.patch index 379e447..2c6c5e7 100644 --- a/blender-3.1.2-force-draco2.patch +++ b/blender-3.6.2-force-draco2.patch @@ -15,7 +15,7 @@ index e7518ac4..c0d78564 100644 python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info) - path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH') -+ path = site.getsitepackages()[0] ++ path = f"{site.getsitepackages()[0]}/libextern_draco.so" if path is None: path = { 'win32': blender_root / python_lib / 'site-packages', diff --git a/blender-4.0.2-cmake-3.28.2.patch b/blender-4.0.2-cmake-3.28.2.patch new file mode 100644 index 0000000..acde937 --- /dev/null +++ b/blender-4.0.2-cmake-3.28.2.patch @@ -0,0 +1,29 @@ +From cf4365e555a759d5b3225bce77858374cb07faad Mon Sep 17 00:00:00 2001 +From: Ray Molenkamp +Date: Thu, 1 Feb 2024 09:09:20 -0700 +Subject: [PATCH] CMake: Disable unity builds on cmake 2.28.2 + +CMake 2.28.2 has a regression that breaks the combination of +precompiled headers and unity builds [1]. Disable unity builds +for this specific cmake version to sidestep the issue. + +[1] https://gitlab.kitware.com/cmake/cmake/-/issues/25650 +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c12dc749ce3..7460f0282ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -245,7 +245,9 @@ mark_as_advanced(CPACK_OVERRIDE_PACKAGENAME) + mark_as_advanced(BUILDINFO_OVERRIDE_DATE) + mark_as_advanced(BUILDINFO_OVERRIDE_TIME) + +-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16") ++# CMAKE 3.28.2 has issues with the combination of PCH and unity builds, disable for now. ++# upstream ticket https://gitlab.kitware.com/cmake/cmake/-/issues/25650 ++if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16" AND NOT ${CMAKE_VERSION} VERSION_EQUAL "3.28.2") + option(WITH_UNITY_BUILD "\ + Enable unity build for modules that support it to improve compile times.\n\ + WARNING: this option allows files to be built without all necessary headers!\n diff --git a/blender-wrapper b/blender-wrapper deleted file mode 100644 index 8d3cb0e..0000000 --- a/blender-wrapper +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cd /usr/share/blender && ./blender -w diff --git a/blender.desktop b/blender.desktop deleted file mode 100644 index 20b0c05..0000000 --- a/blender.desktop +++ /dev/null @@ -1,86 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Blender -Name[ar]=بليندر -Name[bn]=ব্লেণ্ডার -Name[es]=Indice -Name[fa]=بلِندر -Name[hi]=ब्लैण्डर -Name[is]=Hrærivél -Name[km]=កម្មវិធី​លាយ -Name[ko]=블렌더 -Name[pa]=ਬਲੈਡਰ -Name[rw]=Kuvanga -Name[ta]=ப்ளன்டர் -Name[tg]=Блендер -Name[th]=เบลนเดอร์ -Name[xx]=xxBlenderxx -MimeType= -GenericName=3D Modeler/Renderer -GenericName[af]=3D Beeld Moduleerder/Renderer -GenericName[ar]=أداة نمذجة ثلاثية الأبعاد -GenericName[az]=3D Modelləyici/Render Vasitəsi -GenericName[bg]=Редактор за триизмерни изображения -GenericName[bn]=ত্রিমাত্রিক মডেলার/প্রদর্শক -GenericName[ca]=Modelador i renderitzador 3D -GenericName[cs]=Modelář 3D scén -GenericName[cy]=Modelydd/Trosydd 3D -GenericName[da]=3D Modelerer/Fremviser -GenericName[de]=3D-Modeler/Renderer -GenericName[el]=3D Μοντελοποιητής/Renderer -GenericName[en_GB]=3D Modeller/Renderer -GenericName[eo]=Desegnilo/bildigilo por tridimensiaj scenoj -GenericName[es]=Modelador de escenas 3D -GenericName[et]=3D modelleerija/teisendaja -GenericName[eu]=3D Modelatzailea/Renderizatzailea -GenericName[fa]=پردازش‌کننده/مدلگر سه بعدی -GenericName[fi]=3D-mallintaja/renderöijä -GenericName[fr]=Logiciel d'animation et de modélisation 3D -GenericName[fy]=3D modelearprogramma -GenericName[ga]=Insamhlóir/Rindreálaí 3T -GenericName[gl]=Modelador/Renderizador 3D -GenericName[he]=ממדל ומרנדר תלת־מימד -GenericName[hi]=3डी मॉडलर/रेंडरर -GenericName[hr]=Program za modeliranje/renderiranje 3d scena -GenericName[hu]=3D-s modellező -GenericName[is]=Tól til vinnslu með 3D hluti -GenericName[it]=Modellatore e render 3D -GenericName[ja]=3Dモデラ/レンダラ -GenericName[ko]=3차원 모델링/렌더링 도구 -GenericName[lv]=3D Scēnu Modelētājs -GenericName[mk]=3D Моделирач/Исцртувач -GenericName[mn]=3 хэмжээст дүр зураг загварчилагч -GenericName[ms]=Pemodel/Pelukis 3D -GenericName[nb]=3D-modellering/visning -GenericName[nds]=3D-Modellmaak- un -tekenprogramm -GenericName[nl]=3D modeleerprogramma -GenericName[nn]=3d-modellering/-vising -GenericName[pa]=3ਡੀ ਮੋਡੀਲੀਰ/ਪੇਸ਼ਕਾਰ -GenericName[pl]=Program do modelowania trójwymiarowego -GenericName[pt]=Modelador/Rasterizador 3D -GenericName[pt_BR]=Modelador/Renderizador 3D -GenericName[ro]=Modelator de scene 3D -GenericName[ru]=3D рендерер/моделер -GenericName[rw]=Mutunganya/Mutanga Nyamubyimba -GenericName[se]=3d-modelleren/-čájeheapmi -GenericName[sk]=3D modelovanie/rendrovanie scén -GenericName[sl]=3D Modelirnik scen/upodabljalnik -GenericName[sr]=3D моделар/рендерер -GenericName[sr@Latn]=3D modelar/renderer -GenericName[sv]=3D-modellering/uppritning -GenericName[ta]=முப்பரிமாண மாதிரி -GenericName[tg]=3D Модулгар/Пардозишкунанда -GenericName[th]=วาดภาพ/ออกแบบโมเดล 3 มิติ -GenericName[tr]=3B Modelleme Programı -GenericName[uk]=Модельєр 3D -GenericName[vi]=Trình tạo mẫu và hỗ trợ 3D -GenericName[xx]=xx3D Modeler/Rendererxx -GenericName[zh_CN]=3D 建模/渲染器 -GenericName[zh_TW]=3D 場景繪製程式 -Exec=blender -w -Icon=blender -Path= -Type=Application -Categories=Graphics;3DGraphics;KDE -Terminal=false -X-KDE-StartupNotify=false diff --git a/blender.png b/blender.png deleted file mode 100644 index f0278ddd1f759fecc86bdaaa4faccc318e55562e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4466 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 diff --git a/blender.spec b/blender.spec index ba69465..b70aa00 100644 --- a/blender.spec +++ b/blender.spec @@ -1,26 +1,21 @@ %define majver %(echo %version | sed "s|[a-z]*$||") Name: blender -Version: 3.2.2 -Release: 1mamba +Version: 4.0.2 +Release: 2mamba Summary: 3D modeling, animation, rendering and post-production Group: Applications/Multimedia Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://www.blender.org/ -Source0: https://download.blender.org/source/blender-%{version}.tar.xz -Source1: blender.png -Source2: blender.desktop -Source3: blender-wrapper -Patch0: %{name}-2.46-xvidcore_configure.patch -Patch1: %{name}-2.48a-ffmpeg.patch -Patch2: %{name}-2.48a-ffmpeg-includes.patch -Patch3: blender-2.68a-freestyle-build.patch -Patch4: blender-2.79a-freetype-link.patch -Patch5: blender-3.1.2-force-draco1.patch -Patch6: blender-3.1.2-force-draco2.patch +URL: https://www.blender.org +Source0: https+git://projects.blender.org/blender/blender.git/v%{version}/blender-%{version}.tar.bz2 +Source1: https://developer.download.nvidia.com/redist/optix/v7.7/OptiX-7.7-Include.zip +Patch5: blender-3.6.2-force-draco1.patch +Patch6: blender-3.6.2-force-draco2.patch +Patch9: blender-4.0.2-cmake-3.28.2.patch License: GPL ## AUTOBUILDREQ-BEGIN +#libOpenColorIO.so.2.1()(64bit): library not reported by ldconfig and not provided in any installed package BuildRequires: glibc-devel BuildRequires: libSDL2-devel BuildRequires: libX11-devel @@ -28,17 +23,19 @@ BuildRequires: libXfixes-devel BuildRequires: libXi-devel BuildRequires: libXrender-devel BuildRequires: libXxf86vm-devel +BuildRequires: libatomic-devel BuildRequires: libavcodec-ffmpeg-devel BuildRequires: libavdevice-ffmpeg-devel BuildRequires: libavfilter-ffmpeg-devel BuildRequires: libavformat-ffmpeg-devel BuildRequires: libavutil-ffmpeg-devel BuildRequires: libboost-devel +BuildRequires: libembree-devel +BuildRequires: libepoxy-devel BuildRequires: libexpat-devel BuildRequires: libfftw-devel BuildRequires: libfreetype-devel BuildRequires: libgcc -BuildRequires: libglvnd-devel BuildRequires: libgmp-cxx-devel BuildRequires: libgmp-devel BuildRequires: libgomp-devel @@ -46,46 +43,49 @@ BuildRequires: libimath-devel BuildRequires: libjack-devel BuildRequires: libjemalloc-devel BuildRequires: libjpeg-devel +BuildRequires: libminizip1-devel BuildRequires: libopenal-devel -BuildRequires: libopencolorio-devel BuildRequires: libopenexr-devel BuildRequires: libopenimageio-devel BuildRequires: libopenjpeg-devel BuildRequires: libpng-devel BuildRequires: libpotrace-devel BuildRequires: libpulseaudio-devel -BuildRequires: libpython310-devel +BuildRequires: libpystring-devel +BuildRequires: libpython3-devel +BuildRequires: libpython311-devel BuildRequires: libsndfile-devel BuildRequires: libspnav-devel BuildRequires: libstdc++6-devel BuildRequires: libswresample-ffmpeg-devel BuildRequires: libswscale-ffmpeg-devel BuildRequires: libtbb-devel -BuildRequires: libtiff-devel BuildRequires: libwebp-devel +BuildRequires: libxkbcommon-devel BuildRequires: libyaml-cpp-devel BuildRequires: libz-devel BuildRequires: libzstd-devel BuildRequires: pugixml-devel ## AUTOBUILDREQ-END +BuildRequires: libopencolorio-devel >= 2.3.2-1mamba BuildRequires: bash +BuildRequires: gcc-c++ BuildRequires: ldconfig -#BuildRequires: yafray +BuildRequires: libtool BuildRequires: nasm BuildRequires: scons -BuildRequires: libtool -BuildRequires: gcc-c++ -BuildRequires: libglut-devel -BuildRequires: libopenssl-devel +BuildRequires: gettext-devel +BuildRequires: libdecor-devel +BuildRequires: libembree-devel BuildRequires: libesound-devel +BuildRequires: libglut-devel +BuildRequires: libode-devel +BuildRequires: libopenssl-devel +BuildRequires: libopenimageio-devel >= 2.5.6.0 BuildRequires: libnspr-devel BuildRequires: libsmpeg-devel -BuildRequires: libode-devel -BuildRequires: gettext-devel BuildRequires: libspnav-devel BuildRequires: python-numpy-py310 -BuildRequires: libembree-devel -#Requires: yafray %description Blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback. @@ -94,37 +94,36 @@ Professionals and novices can easily and inexpensively publish stand-alone, secu %debug_package %prep -%setup -q -n %{name}-%{version} -#-D -T +%setup -q -a1 +#% setup -q -D -T #:<< _EOF -#%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -b .force-draco1 -cd release/scripts/addons -%patch6 -p1 -b .force-draco2 -cd ../../.. +make update + +%define _default_patch_fuzz 2 +%patch 5 -p1 -b .force-draco1 +cd scripts/addons +%patch 6 -p1 -b .force-draco2 +cd ../.. +%patch 9 -p1 -b .cmake-3.28.2 %build #:<< _EOF %cmake -d build \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_SKIP_RPATH=ON \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DBOOST_ROOT=1 \ - -DWITH_CYCLES=OFF \ - -DWITH_CYCLES_PTEX=OFF \ - -DFTGL_LIBPATH=%{_libdir} \ - -DWITH_FREESTYLE=ON \ - -DWITH_SYSTEM_OPENJPEG=ON \ - -DWITH_PYTHON_INSTALL=OFF \ - -DPYTHON_VERSION=%{python310_version} \ - -DPYTHON_LIBPATH=%{_libdir} \ - -DPYTHON_LIBRARY=python%{python310_version} \ - -DPYTHON_INCLUDE_DIRS=%{python310_inc} \ - -DWITH_BULLET=OFF + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DCUDA_HOST_COMPILER=/usr/bin/gcc \ + -DLLVM_VERSION=16 \ + -DPYTHON_VERSION=%{python3_version} \ + -DHIP_ROOT_DIR=/opt/rocm \ + -DOPTIX_ROOT_DIR="${PWD}" \ + -DWITH_CYCLES_OSL=NO \ + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_PYTHON_INSTALL=OFF \ + -DOCLOC_INSTALL_DIR=/usr \ + -DSYCL_CPP_FLAGS=--verbose \ + -DSYCL_OFFLINE_COMPILER_PARALLEL_JOBS=8 - -export LD_LIBRARY_PATH=`pwd`/lib +#export LD_LIBRARY_PATH=`pwd`/lib %make %install @@ -142,37 +141,11 @@ cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/blender.conf << _EOF _EOF # Manually install draco bindings -mv %{buildroot}%{_datadir}/blender/3*/python/lib/python%{python310_version} %{buildroot}%{_libdir}/ -rm -rf %{buildroot}%{_datadir}/blender/3*/python +mv %{buildroot}%{_datadir}/blender/4*/python/lib/python%{python3_version} %{buildroot}%{_libdir}/ +rm -rf %{buildroot}%{_datadir}/blender/4*/python -install -D -m644 release/freedesktop/org.blender.Blender.appdata.xml \ - %{buildroot}%{_datadir}/metainfo/org.blender.Blender.appdata.xml - -## Manually install additional scripts -#cp -r release/scripts/addons_contrib/* \ -# %{buildroot}%{_datadir}/blender/3*/scripts/addons_contrib/ - -# BF_PYTHON=%{python3_inc} \ -#scons install \ -# BF_BUILDDIR=./rpmbuildir \ -# BF_PYTHON_INC=%{python3_inc} \ -# BF_PYTHON_BINARY=%{_bindir}/python3 \ -# BF_PYTHON_LIB=python%{python3_version} \ -# WITH_BF_FFMPEG='true' \ -# BF_FFMPEG='%{_prefix}' \ -# BF_FFMPEG_INC='%{_includedir}' \ -# BF_FFMPEG_LIB='avformat avcodec avdevice avutil swscale xvidcore ogg dc1394 raw1394 faac faad x264 mp3lame vorbis theora vorbisenc dts' \ -# BF_FFMPEG_EXTRA='-D__STDC_CONSTANT_MACROS' \ -# WITH_BF_GAMEENGINE='true' \ -# BF_INSTALLDIR=%{buildroot}%{_datadir}/blender/ \ -# BF_OPENEXR_INC=%{_includedir}/OpenEXR/ -# -#install -D -m0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/blender.png -#install -D -m0644 %{S:2} %{buildroot}%{_datadir}/applications/blender.desktop -#install -D -m0755 %{S:3} %{buildroot}%{_bindir}/blender -# -##rmdir %{buildroot}%{_datadir}/blender/%{majver}/python/lib -##rmdir %{buildroot}%{_datadir}/blender/%{majver}/python +install -D -m644 release/freedesktop/org.blender.Blender.metainfo.xml \ + %{buildroot}%{_datadir}/metainfo/org.blender.Blender.metainfo.xml %clean [ "%{buildroot}" != "/" ] && rm -rf "%{buildroot}" @@ -188,10 +161,10 @@ install -D -m644 release/freedesktop/org.blender.Blender.appdata.xml \ %{_bindir}/blender-thumbnailer %dir %{_libdir}/blender %{_libdir}/blender/*.so -%{_libdir}/blender/libaudaspace*.a -%{python310_sitearch}/libextern_draco.so +%{_libdir}/blender/lib*.a +%{python3_sitearch}/libextern_draco.so %{_datadir}/applications/blender.desktop -%{_datadir}/metainfo/org.blender.Blender.appdata.xml +%{_datadir}/metainfo/org.blender.Blender.metainfo.xml %dir %{_datadir}/blender %{_datadir}/blender/* %{_datadir}/icons/hicolor/symbolic/apps/*.svg @@ -201,6 +174,12 @@ install -D -m644 release/freedesktop/org.blender.Blender.appdata.xml \ #%{_mandir}/man1/blender.1.gz %changelog +* Mon Feb 05 2024 Automatic Build System 4.0.2-2mamba +- rebuilt by autoport with build requirements: libopencolorio-devel>=2.3.2-1mamba + +* Sun Feb 04 2024 Automatic Build System 4.0.2-1mamba +- automatic version update by autodist + * Sat Aug 20 2022 Automatic Build System 3.2.2-1mamba - automatic version update by autodist