The package rpms/blender.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=f1f03dd9d0223... https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=ff3fa48d7e333... https://src.fedoraproject.org/cgit/rpms/blender.git/commit/?id=341fdbbe3465a....
Change: +%ifnarch %{ix86} armv7hl +%ifnarch %{ix86} armv7hl -ExcludeArch: armv7hl
Thanks.
Full change: ============
commit 738e282326a965a0ccc38cbb5709db8ff6e84809 Merge: d6162aa f1f03dd Author: Luya Tshimbalanga luya@fedoraproject.org Date: Thu Jul 23 22:49:06 2020 -0700
Update to 2.83.3 (#1855165) Enable embree and osl for cycles rendering
diff --cc blender.spec index 7e0ea32,63bbed2..707a8ca --- a/blender.spec +++ b/blender.spec @@@ -16,10 -16,9 +16,10 @@@
Name: blender Epoch: 1 - Version: %{blender_api}.1 + Version: %{blender_api}.3 Release: 1%{?dist}
+ Summary: 3D modeling, animation, rendering and post-production License: GPLv2 URL: http://www.blender.org @@@ -211,11 -212,8 +213,10 @@@ pathfix.py -pni "%{__python3} %{py3_shb -DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ -DWITH_PYTHON_SAFETY=ON \ + -DWITH_SDL=ON \ - -DWITH_SYSTEM_LZO=ON - - %make_build - popd ++ -DWITH_SYSTEM_LZO=ON \ + . + %cmake_build
%install
commit f1f03dd9d0223c67694bde95bd370ed70926cbc2 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Thu Jul 23 22:46:35 2020 -0700
Update to 2.83.3 (#1855165) Enable embree and osl for cycles rendering
diff --git a/blender.spec b/blender.spec index d3f7788..63bbed2 100644 --- a/blender.spec +++ b/blender.spec @@ -96,7 +96,7 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(ode) #Exclude architectures where build fails %ifnarch %{ix86} armv7hl -BuildRequires: pkgconfig(oslquery) +#BuildRequires: pkgconfig(oslcomp) %endif BuildRequires: opensubdiv-devel BuildRequires: pkgconfig(sdl2) @@ -203,6 +203,10 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . -DOpenGL_GL_PREFERENCE=GLVND \ %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \ -DWITH_CYCLES=%{cyclesflag} \ + -DWITH_CYCLES_EMBREE=%{cyclesflag} \ +%ifnarch %{ix86} armv7hl + -DWITH_CYCLES_OSL=%{cyclesflag} \ +%endif -DWITH_DOC_MANPAGE=ON \ -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ @@ -275,6 +279,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %changelog * Wed Jul 22 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.3-1 - Update to 2.83.3 (#1855165) +- Enable embree and osl for cycles rendering
* Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-2 - Add openshadinglanguage dependency
commit 944550adea19bc71e0b61430f7c06ef7bffb9fe8 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Thu Jul 23 21:20:26 2020 -0700
Update to 2.83.3 (#1855165)
diff --git a/blender.spec b/blender.spec index 1181a57..d3f7788 100644 --- a/blender.spec +++ b/blender.spec @@ -40,7 +40,7 @@ Patch0: %{name}-%{blender_api}-droid.patch
# Development stuff BuildRequires: boost-devel -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext @@ -237,7 +237,7 @@ install -p -m 644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}-fonts.metain # Localization %find_lang %{name}
-# Avoid having locales listed twice +# Avoid having locales listed twice rm -fr %{buildroot}%{_datadir}/%{blender_api}/locale/languages
# rpmlint fixes
commit ff3fa48d7e3335280f89ee6a07ab6eb9366ca775 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Thu Jul 23 08:53:54 2020 -0700
Update to 2.83.3 (#1855165)
diff --git a/blender.spec b/blender.spec index 4f6a4c8..1181a57 100644 --- a/blender.spec +++ b/blender.spec @@ -94,7 +94,10 @@ BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(ode) +#Exclude architectures where build fails +%ifnarch %{ix86} armv7hl BuildRequires: pkgconfig(oslquery) +%endif BuildRequires: opensubdiv-devel BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(xproto)
commit 2e40a6a3dcbd307f9db9441b8b25513b218cfb26 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Wed Jul 22 07:44:45 2020 -0700
Update to 2.83.3 (#1855165)
diff --git a/.gitignore b/.gitignore index d6ad613..0cc9b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /blender-2.83.0.tar.xz /blender-2.83.1.tar.xz /blender-2.83.2.tar.xz +/blender-2.83.3.tar.xz diff --git a/blender.spec b/blender.spec index 00d538c..4f6a4c8 100644 --- a/blender.spec +++ b/blender.spec @@ -16,8 +16,8 @@
Name: blender Epoch: 1 -Version: %{blender_api}.2 -Release: 2%{?dist} +Version: %{blender_api}.3 +Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -34,9 +34,9 @@ Patch0: %{name}-%{blender_api}-droid.patch
# Upstream fix to support Python 3.9 # https://developer.blender.org/rB56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f -%if 0%{?fedora} > 32 -Patch1: %{name}-support-python-3.9.diff -%endif +#%%if 0%%{?fedora} > 32 +#Patch1: %%{name}-support-python-3.9.diff +#%%endif
# Development stuff BuildRequires: boost-devel @@ -270,6 +270,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog +* Wed Jul 22 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.3-1 +- Update to 2.83.3 (#1855165) + * Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-2 - Add openshadinglanguage dependency - Use cmake macros for build and install diff --git a/sources b/sources index 7cbeb3b..3617d37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blender-2.83.2.tar.xz) = 1280445a83c2296e7213f482328042423579ba24379c62f6b1e3a5f5f9fe97130e8ac0b0d3e045bdc0f9cc73ba77549c285960ad076cb17a0351d897679774e1 +SHA512 (blender-2.83.3.tar.xz) = 20d284dc83bbd16ae126915a62c64a3f0860d61f66387c5fee1c549cb9002834c934b509ca3ea8475c1e7b6c683feb61862ab0e0a246808d10a632488748772f
commit 604de491c87ff2319866b54edb3143bbea58bf6c Author: Luya Tshimbalanga luya@fedoraproject.org Date: Tue Jul 21 08:34:57 2020 -0700
Add openshadinglanguage dependency Use cmake macros for build and install Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender.spec b/blender.spec index 1dd5e62..00d538c 100644 --- a/blender.spec +++ b/blender.spec @@ -187,20 +187,16 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake # Fix all Python shebangs recursively in . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-mkdir cmake-make - - %build -pushd cmake-make - -%cmake .. \ + +%cmake \ + -B build %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ %endif -DBOOST_ROOT=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_SKIP_RPATH=ON \ - -DPYTHON_VERSION=%{python3_version} \ -DOpenGL_GL_PREFERENCE=GLVND \ %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \ -DWITH_CYCLES=%{cyclesflag} \ @@ -208,15 +204,13 @@ pushd cmake-make -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ - -DWITH_PYTHON_SAFETY=ON + -DWITH_PYTHON_SAFETY=ON \ + . %cmake_build -popd - - + + %install -pushd cmake-make %cmake_install -popd
# Thumbnailer
commit a2234d85fc35c215d3dbffa6c007fdb6e169d8ce Author: Luya Tshimbalanga luya@fedoraproject.org Date: Tue Jul 21 08:27:29 2020 -0700
Add openshadinglanguage dependency Use cmake macros for build and install Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender.spec b/blender.spec index 00d538c..1dd5e62 100644 --- a/blender.spec +++ b/blender.spec @@ -187,16 +187,20 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake # Fix all Python shebangs recursively in . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
+mkdir cmake-make + + %build - -%cmake \ - -B build +pushd cmake-make + +%cmake .. \ %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ %endif -DBOOST_ROOT=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_SKIP_RPATH=ON \ + -DPYTHON_VERSION=%{python3_version} \ -DOpenGL_GL_PREFERENCE=GLVND \ %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \ -DWITH_CYCLES=%{cyclesflag} \ @@ -204,13 +208,15 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ - -DWITH_PYTHON_SAFETY=ON \ - . + -DWITH_PYTHON_SAFETY=ON %cmake_build - - +popd + + %install +pushd cmake-make %cmake_install +popd
# Thumbnailer
commit 4b4de400fd05ec75b151780106b639df442d857e Author: Luya Tshimbalanga luya@fedoraproject.org Date: Mon Jul 20 22:57:46 2020 -0700
Add openshadinglanguage dependency Use cmake macros for build and install Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender.spec b/blender.spec index 58621c7..00d538c 100644 --- a/blender.spec +++ b/blender.spec @@ -80,7 +80,6 @@ BuildRequires: embree-devel BuildRequires: oidn-devel %endif BuildRequires: openCOLLADA-devel >= svn825 -BuildRequires: openshadinglanguage BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(ftgl) BuildRequires: pkgconfig(glew) @@ -191,14 +190,13 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . %build
%cmake \ - -B cmake-make + -B build %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ %endif -DBOOST_ROOT=%{_prefix} \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_SKIP_RPATH=ON \ - -DPYTHON_VERSION=%{python3_version} \ -DOpenGL_GL_PREFERENCE=GLVND \ %{?_without_ffmpeg:-DWITH_CODEC_FFMPEG=OFF} \ -DWITH_CYCLES=%{cyclesflag} \
commit 341fdbbe3465a5af7defa9e68c8123daf6d1cc04 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Mon Jul 20 22:28:03 2020 -0700
Add openshadinglanguage dependency Use cmake macros for build and install Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender.spec b/blender.spec index f2505c9..58621c7 100644 --- a/blender.spec +++ b/blender.spec @@ -149,7 +149,7 @@ Provides: blenderplayer = 1:2.80-1 # Temporarily exclude ARM32 architecture due to build failure # https://koji.fedoraproject.org/koji/taskinfo?taskID=45594704 # https://bugzilla.redhat.com/show_bug.cgi?id=1843100 -ExcludeArch: armv7hl +# ExcludeArch: armv7hl
%description Blender is the essential software solution you need for 3D, from modeling, @@ -190,7 +190,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
%build
-%cmake . \ +%cmake \ -B cmake-make %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ @@ -206,7 +206,8 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . -DWITH_INSTALL_PORTABLE=OFF \ -DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ - -DWITH_PYTHON_SAFETY=ON + -DWITH_PYTHON_SAFETY=ON \ + . %cmake_build
commit f67b35abffc895608da81042127df4f7391e262f Author: Luya Tshimbalanga luya@fedoraproject.org Date: Mon Jul 20 19:23:41 2020 -0700
Add openshadinglanguage dependency Use cmake macros for build and install Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender.spec b/blender.spec index 8c41492..f2505c9 100644 --- a/blender.spec +++ b/blender.spec @@ -188,12 +188,10 @@ rm -f build_files/cmake/Modules/FindOpenJPEG.cmake # Fix all Python shebangs recursively in . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-mkdir cmake-make - %build -pushd cmake-make
-%cmake .. \ +%cmake . \ + -B cmake-make %ifnarch %{ix86} x86_64 -DWITH_RAYOPTIMIZATION=OFF \ %endif @@ -209,14 +207,11 @@ pushd cmake-make -DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL_REQUESTS=OFF \ -DWITH_PYTHON_SAFETY=ON -%make_build -popd +%cmake_build
%install -pushd cmake-make -%make_install -popd +%cmake_install
# Thumbnailer @@ -278,6 +273,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %changelog * Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-2 - Add openshadinglanguage dependency +- Use cmake macros for build and install - Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
* Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-1
commit 7c7b70d5fa099b1c353a627dc182b5c3b5cd571f Author: Luya Tshimbalanga luya@fedoraproject.org Date: Mon Jul 20 08:22:03 2020 -0700
Add openshadinglanguage dependency Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender.spec b/blender.spec index d090062..8c41492 100644 --- a/blender.spec +++ b/blender.spec @@ -80,6 +80,7 @@ BuildRequires: embree-devel BuildRequires: oidn-devel %endif BuildRequires: openCOLLADA-devel >= svn825 +BuildRequires: openshadinglanguage BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(ftgl) BuildRequires: pkgconfig(glew) @@ -94,6 +95,7 @@ BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(ode) +BuildRequires: pkgconfig(oslquery) BuildRequires: opensubdiv-devel BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(xproto) @@ -275,6 +277,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts.
%changelog * Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-2 +- Add openshadinglanguage dependency - Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
* Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-1
commit 9541bd20371191c96e7ba1c3330d930329f44f54 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Fri Jul 10 23:36:04 2020 -0700
Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100)
diff --git a/blender-support-building-against-python-3.9.diff b/blender-support-building-against-python-3.9.diff index 09e0d72..1568ec0 100644 --- a/blender-support-building-against-python-3.9.diff +++ b/blender-support-building-against-python-3.9.diff @@ -8569,3 +8569,4 @@ index ace7480ee81..15ae811fd91 100644
return (PyObject *)self; } + diff --git a/blender-support-python-3.9.diff b/blender-support-python-3.9.diff new file mode 100644 index 0000000..a2a34ca --- /dev/null +++ b/blender-support-python-3.9.diff @@ -0,0 +1,133 @@ +diff -ru blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c blender-2.83.2/source/blender/python/mathutils/mathutils_Matrix.c +--- blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Matrix.c 2020-07-08 22:46:25.000000000 -0700 ++++ blender-2.83.2/source/blender/python/mathutils/mathutils_Matrix.c 2020-07-10 23:06:20.171478183 -0700 +@@ -42,7 +42,8 @@ + static PyObject *Matrix_copy(MatrixObject *self); + static PyObject *Matrix_deepcopy(MatrixObject *self, PyObject *args); + static int Matrix_ass_slice(MatrixObject *self, int begin, int end, PyObject *value); +-static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject *self); ++static PyObject *matrix__apply_to_copy(PyObject *(*matrix_func)(MatrixObject *), ++ MatrixObject *self); + static PyObject *MatrixAccess_CreatePyObject(MatrixObject *matrix, const eMatrixAccess_t type); + + static int matrix_row_vector_check(MatrixObject *mat, VectorObject *vec, int row) +@@ -399,10 +400,10 @@ + { + PyObject *ret = Matrix_copy(self); + if (ret) { +- PyObject *ret_dummy = matrix_func(ret); ++ PyObject *ret_dummy = matrix_func((MatrixObject *)ret); + if (ret_dummy) { + Py_DECREF(ret_dummy); +- return (PyObject *)ret; ++ return ret; + } + else { /* error */ + Py_DECREF(ret); +@@ -1737,7 +1738,7 @@ + " .. note:: When the matrix cant be adjugated a :exc:`ValueError` exception is raised.\n"); + static PyObject *Matrix_adjugated(MatrixObject *self) + { +- return matrix__apply_to_copy((PyNoArgsFunction)Matrix_adjugate, self); ++ return matrix__apply_to_copy(Matrix_adjugate, self); + } + + PyDoc_STRVAR( +@@ -1945,7 +1946,7 @@ + " :rtype: :class:`Matrix`\n"); + static PyObject *Matrix_transposed(MatrixObject *self) + { +- return matrix__apply_to_copy((PyNoArgsFunction)Matrix_transpose, self); ++ return matrix__apply_to_copy(Matrix_transpose, self); + } + + /*---------------------------matrix.normalize() ------------------*/ +@@ -1991,7 +1992,7 @@ + " :rtype: :class:`Matrix`\n"); + static PyObject *Matrix_normalized(MatrixObject *self) + { +- return matrix__apply_to_copy((PyNoArgsFunction)Matrix_normalize, self); ++ return matrix__apply_to_copy(Matrix_normalize, self); + } + + /*---------------------------matrix.zero() -----------------------*/ +diff -ru blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Quaternion.c blender-2.83.2/source/blender/python/mathutils/mathutils_Quaternion.c +--- blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Quaternion.c 2020-07-08 22:46:25.000000000 -0700 ++++ blender-2.83.2/source/blender/python/mathutils/mathutils_Quaternion.c 2020-07-10 23:11:47.121258500 -0700 +@@ -34,7 +34,8 @@ + + #define QUAT_SIZE 4 + +-static PyObject *quat__apply_to_copy(PyNoArgsFunction quat_func, QuaternionObject *self); ++static PyObject *quat__apply_to_copy(PyObject *(*quat_func)(QuaternionObject *), ++ QuaternionObject *self); + static void quat__axis_angle_sanitize(float axis[3], float *angle); + static PyObject *Quaternion_copy(QuaternionObject *self); + static PyObject *Quaternion_deepcopy(QuaternionObject *self, PyObject *args); +@@ -463,7 +464,7 @@ + " :rtype: :class:`Quaternion`\n"); + static PyObject *Quaternion_normalized(QuaternionObject *self) + { +- return quat__apply_to_copy((PyNoArgsFunction)Quaternion_normalize, self); ++ return quat__apply_to_copy(Quaternion_normalize, self); + } + + PyDoc_STRVAR(Quaternion_invert_doc, +@@ -490,7 +491,7 @@ + " :rtype: :class:`Quaternion`\n"); + static PyObject *Quaternion_inverted(QuaternionObject *self) + { +- return quat__apply_to_copy((PyNoArgsFunction)Quaternion_invert, self); ++ return quat__apply_to_copy(Quaternion_invert, self); + } + + PyDoc_STRVAR(Quaternion_identity_doc, +@@ -553,7 +554,7 @@ + " :rtype: :class:`Quaternion`\n"); + static PyObject *Quaternion_conjugated(QuaternionObject *self) + { +- return quat__apply_to_copy((PyNoArgsFunction)Quaternion_conjugate, self); ++ return quat__apply_to_copy(Quaternion_conjugate, self); + } + + PyDoc_STRVAR(Quaternion_copy_doc, +@@ -1385,10 +1386,12 @@ + return Quaternion_CreatePyObject(quat, type); + } + +-static PyObject *quat__apply_to_copy(PyNoArgsFunction quat_func, QuaternionObject *self) ++ ++static PyObject *quat__apply_to_copy(PyObject *(*quat_func)(QuaternionObject *), ++ QuaternionObject *self) + { + PyObject *ret = Quaternion_copy(self); +- PyObject *ret_dummy = quat_func(ret); ++ PyObject *ret_dummy = quat_func((QuaternionObject *)ret); + if (ret_dummy) { + Py_DECREF(ret_dummy); + return ret; +diff -ru blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Vector.c blender-2.83.2/source/blender/python/mathutils/mathutils_Vector.c +--- blender-2.83.2.orig/source/blender/python/mathutils/mathutils_Vector.c 2020-07-08 22:46:25.000000000 -0700 ++++ blender-2.83.2/source/blender/python/mathutils/mathutils_Vector.c 2020-07-10 23:13:22.243694056 -0700 +@@ -96,10 +96,10 @@ + return Vector_CreatePyObject_alloc(vec, size, type); + } + +-static PyObject *vec__apply_to_copy(PyNoArgsFunction vec_func, VectorObject *self) ++static PyObject *vec__apply_to_copy(PyObject *(*vec_func)(VectorObject *), VectorObject *self) + { + PyObject *ret = Vector_copy(self); +- PyObject *ret_dummy = vec_func(ret); ++ PyObject *ret_dummy = vec_func((VectorObject *)ret); + if (ret_dummy) { + Py_DECREF(ret_dummy); + return (PyObject *)ret; +@@ -376,7 +376,7 @@ + " :rtype: :class:`Vector`\n"); + static PyObject *Vector_normalized(VectorObject *self) + { +- return vec__apply_to_copy((PyNoArgsFunction)Vector_normalize, self); ++ return vec__apply_to_copy(Vector_normalize, self); + } + + PyDoc_STRVAR(Vector_resize_doc, diff --git a/blender.spec b/blender.spec index 3828b05..d090062 100644 --- a/blender.spec +++ b/blender.spec @@ -17,7 +17,7 @@ Name: blender Epoch: 1 Version: %{blender_api}.2 -Release: 1%{?dist} +Release: 2%{?dist}
Summary: 3D modeling, animation, rendering and post-production License: GPLv2 @@ -34,9 +34,9 @@ Patch0: %{name}-%{blender_api}-droid.patch
# Upstream fix to support Python 3.9 # https://developer.blender.org/rB56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f -#%%if 0%%{?fedora} > 32 -#Patch1: %%{name}-support-building-against-python-3.9.diff -#%%endif +%if 0%{?fedora} > 32 +Patch1: %{name}-support-python-3.9.diff +%endif
# Development stuff BuildRequires: boost-devel @@ -74,9 +74,6 @@ BuildRequires: lzo-devel BuildRequires: pkgconfig(zlib)
- - - # 3D modeling stuff %ifarch x86_64 BuildRequires: embree-devel @@ -277,6 +274,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog +* Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-2 +- Reenable upstream patch to build on Python 3.9 for Fedora 33+ (#1843100) + * Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-1 - Update to 2.83.2 (#1855165)
commit 0c156eb24db54702000849f3de4c18d7f538062a Author: Luya Tshimbalanga luya@fedoraproject.org Date: Thu Jul 9 00:44:37 2020 -0700
Update to 2.83.2 (#1855165)
diff --git a/.gitignore b/.gitignore index ee80518..d6ad613 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /blender-2.82a.tar.xz /blender-2.83.0.tar.xz /blender-2.83.1.tar.xz +/blender-2.83.2.tar.xz diff --git a/blender.spec b/blender.spec index 7b43e8c..3828b05 100644 --- a/blender.spec +++ b/blender.spec @@ -16,7 +16,7 @@
Name: blender Epoch: 1 -Version: %{blender_api}.1 +Version: %{blender_api}.2 Release: 1%{?dist}
Summary: 3D modeling, animation, rendering and post-production @@ -277,6 +277,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}-fonts. %{_metainfodir}/%{name}-fonts.metainfo.xml
%changelog +* Thu Jul 09 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.2-1 +- Update to 2.83.2 (#1855165) + * Thu Jun 25 2020 Luya Tshimbalanga luya@fedoraproject.org - 1:2.83.1-1 - Update to 2.83.1 (#1843623)
diff --git a/sources b/sources index cb96184..7cbeb3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blender-2.83.1.tar.xz) = 92e59a5fbbb87d8aa1ee9dfb880ae0a574e775bc46722533c4e8bdb0ea2621e29590a5f30b220effbbc5954bc407625289325c1b59122e15d0ee24969f0c289b +SHA512 (blender-2.83.2.tar.xz) = 1280445a83c2296e7213f482328042423579ba24379c62f6b1e3a5f5f9fe97130e8ac0b0d3e045bdc0f9cc73ba77549c285960ad076cb17a0351d897679774e1
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org