--- Begin Message ---
Package: blender
Version: 2.93.4+dfsg-1
Severity: wishlist
Tags: ftbfs upstream patch
User: debian-riscv@lists.debian.org
Usertags: riscv64
Dear maintainer,
kodi currently fails to build from source on riscv64 due to missing
support for this architecture [1]. There are two reasons for that:
- Missing upstream support for this architecture. This is something that
has been fixed recently [2], however it is only available on the
master branch.
- Unavailability of gold linker on riscv64 and broken upstream support
for bfd linker. I have proposed a patch to fix that [3].
I have included the corresponding patches in a debdiff patch attached,
and verified that the resulting package build successfully on riscv64.
If you are fine with this patch, could you please consider applying it
for the future uploads?
Regards,
Aurelien
[1] https://buildd.debian.org/status/fetch.php?pkg=blender&arch=riscv64&ver=2.93.4%2Bdfsg-1&stamp=1633013030&raw=0
[2] https://developer.blender.org/rB468d59e496eb3263c1b0284459c03b599fe84a2a
[3] https://developer.blender.org/D12911
--- blender-2.93.4+dfsg/debian/patches/0006-add-support-for-risc-v-architecture.patch
+++ blender-2.93.4+dfsg/debian/patches/0006-add-support-for-risc-v-architecture.patch
@@ -0,0 +1,67 @@
+From 468d59e496eb3263c1b0284459c03b599fe84a2a Mon Sep 17 00:00:00 2001
+From: Heinrich Schuchardt <xypron>
+Date: Thu, 15 Jul 2021 14:22:08 +0200
+Subject: [PATCH] Add support for RISC-V architecture
+
+* On RISC-V GCC 10.3 does not define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n.
+* Avoid a build error
+ "Please add support for your platform in build_config.h"
+ Cf: https://github.com/sergeyvfx/libNumaAPI/pull/3
+
+Differential Revision: https://developer.blender.org/D11910
+---
+ intern/atomic/intern/atomic_ops_unix.h | 6 +++---
+ intern/numaapi/source/build_config.h | 13 +++++++++++++
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/intern/atomic/intern/atomic_ops_unix.h b/intern/atomic/intern/atomic_ops_unix.h
+index dc1e71cda76..b08a0e9bc28 100644
+--- a/intern/atomic/intern/atomic_ops_unix.h
++++ b/intern/atomic/intern/atomic_ops_unix.h
+@@ -49,9 +49,9 @@
+
+ #include "atomic_ops_utils.h"
+
+-#if defined(__arm__)
+-/* Attempt to fix compilation error on Debian armel kernel.
+- * arm7 architecture does have both 32 and 64bit atomics, however
++#if defined(__arm__) || defined(__riscv)
++/* Attempt to fix compilation error on Debian armel and RISC-V kernels.
++ * Both architectures do have both 32 and 64bit atomics, however
+ * its gcc doesn't have __GCC_HAVE_SYNC_COMPARE_AND_SWAP_n defined.
+ */
+ # define JE_FORCE_SYNC_COMPARE_AND_SWAP_1
+diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h
+index fdd6ff704c3..49d82aa3e87 100644
+--- a/intern/numaapi/source/build_config.h
++++ b/intern/numaapi/source/build_config.h
+@@ -324,6 +324,16 @@
+ # define ARCH_CPU_ARM64 1
+ # define ARCH_CPU_64_BITS 1
+ # define ARCH_CPU_LITTLE_ENDIAN 1
++#elif defined(__riscv) && __riscv_xlen == 32
++# define ARCH_CPU_RISCV_FAMILY 1
++# define ARCH_CPU_RISCV32 1
++# define ARCH_CPU_64_BITS 0
++# define ARCH_CPU_LITTLE_ENDIAN 1
++#elif defined(__riscv) && __riscv_xlen == 64
++# define ARCH_CPU_RISCV_FAMILY 1
++# define ARCH_CPU_RISCV64 1
++# define ARCH_CPU_64_BITS 1
++# define ARCH_CPU_LITTLE_ENDIAN 1
+ #elif defined(__pnacl__) || defined(__asmjs__) || defined(__wasm__)
+ # define ARCH_CPU_32_BITS 1
+ # define ARCH_CPU_LITTLE_ENDIAN 1
+@@ -381,6 +391,9 @@
+ #if !defined(ARCH_CPU_PPC64_FAMILY)
+ # define ARCH_CPU_PPC64_FAMILY 0
+ #endif
++#if !defined(ARCH_CPU_RISCV_FAMILY)
++# define ARCH_CPU_RISCV_FAMILY 0
++#endif
+ #if !defined(ARCH_CPU_S390_FAMILY)
+ # define ARCH_CPU_S390_FAMILY 0
+ #endif
+--
+2.30.2
+
--- blender-2.93.4+dfsg/debian/patches/0007-cmake-fix-linking-with-with-x11-xf86vmode-and-bfd.patch
+++ blender-2.93.4+dfsg/debian/patches/0007-cmake-fix-linking-with-with-x11-xf86vmode-and-bfd.patch
@@ -0,0 +1,25 @@
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Mon Oct 18 23:02:51 2021 +0200
+Subject: fix linking with WITH_X11_XF86VMODE and bfd
+Forwarded: https://developer.blender.org/D12911
+
+Fix typos in the variables of the Xxf86vm libray to fix link failure
+with bfd. These variables are defined in platform_unix.cmake.
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 05423209c71..64faf464290 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -245,10 +245,10 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
+ if(WITH_X11_XF86VMODE)
+ add_definitions(-DWITH_X11_XF86VMODE)
+ list(APPEND INC_SYS
+- ${X11_xf86vmode_INCLUDE_PATH}
++ ${X11_Xxf86vmode_INCLUDE_PATH}
+ )
+ list(APPEND LIB
+- ${X11_Xf86vmode_LIB}
++ ${X11_Xxf86vmode_LIB}
+ )
+ endif()
+
--- blender-2.93.4+dfsg/debian/patches/series
+++ blender-2.93.4+dfsg/debian/patches/series
@@ -3,3 +3,5 @@
0003-do_not_use_version_number_in_system_path.patch
0004-locales_directory_install.patch
0005-fix_atomics.patch
+0006-add-support-for-risc-v-architecture.patch
+0007-cmake-fix-linking-with-with-x11-xf86vmode-and-bfd.patch
--- End Message ---
--- Begin Message ---
Source: blender
Source-Version: 2.93.4+dfsg-2
Done: Matteo F. Vescovi <mfv@debian.org>
We believe that the bug you reported is fixed in the latest version of
blender, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 996917@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Matteo F. Vescovi <mfv@debian.org> (supplier of updated blender package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 20 Oct 2021 23:23:55 +0200
Source: blender
Architecture: source
Version: 2.93.4+dfsg-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Matteo F. Vescovi <mfv@debian.org>
Closes: 996917
Changes:
blender (2.93.4+dfsg-2) unstable; urgency=medium
.
* debian/patches/: patchset updated (riscv64 support added)
Thanks to Aurelien Jarno <aurel32> for this amazing work.
(Closes: #996917)
Checksums-Sha1:
b6b1ed3f745db6c0b94cf78d7b8fd6d5344a084a 3114 blender_2.93.4+dfsg-2.dsc
9c93497451faf2c118128cef04c302342a869587 36724 blender_2.93.4+dfsg-2.debian.tar.xz
cb3f58ed4793ec2e2dd2271a307ac7b82113912e 7596 blender_2.93.4+dfsg-2_source.buildinfo
Checksums-Sha256:
59dfde9948e75dac872a509f14842b0a207e2e8cc9f81578dcca249e079d4269 3114 blender_2.93.4+dfsg-2.dsc
aef158aca299c8c42ff835a76abd9a988c47aa8df4e54ef6aae1d04dd854cbea 36724 blender_2.93.4+dfsg-2.debian.tar.xz
14905664c8556387605b312dbefdc6d1f60b7647bc8ad556eb25ed8c3896dfec 7596 blender_2.93.4+dfsg-2_source.buildinfo
Files:
8bcc6ec5a66d1540d3d9d6ee187d69f5 3114 graphics optional blender_2.93.4+dfsg-2.dsc
2394f251b3c06253993a0490367fb344 36724 graphics optional blender_2.93.4+dfsg-2.debian.tar.xz
c8cdacdf260fc34538a8caff341d355a 7596 graphics optional blender_2.93.4+dfsg-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
Comment: Debian powered!
iQKTBAEBCgB9FiEE890J+NqH0d9QRsmbBhL0lE7NzVoFAmFwic1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYz
REQwOUY4REE4N0QxREY1MDQ2Qzk5QjA2MTJGNDk0NEVDRENENUEACgkQBhL0lE7N
zVqPQw//clbMNm6xYLpvIwrdKn7RxZIAleVD81/5nM8RwMWPiQAqMUH/agVBPXGj
G5+s4a6cn1Obt7TcQM2ZoSrDesDJjcS4cLkg1ZEDs6ntRqfaIu5anAKTJW1yjSYw
aAbpxiWMdn/HJMx8rlOMH8cMFtVb6VNb+d49HSFS5wVoE4dRpB5VnRLlHDUzB/VW
uUtivZE4Qpdx7zORZy8CMmZZHc0qJH95SNblZ5xXFHMnQiiFL3F4azqOkH5tTYlV
AL8K/47z7rhrVn+dTB1tp9K2oeCP9RGYqtDISc8e5yRUe3TiAGQU9VqbJNRb0OMr
mdUHWNDazXDz5wxsqTrk/9dT4bGWtO62mRbPTb2xo2jLdoDrPcn6q5YEz9kmYrtp
ZunfHcbZAbPqOwvKBW9bOyQFbDneiTk3bRtCJJKnUF43JoLLyUiosvxE50G09xky
cyOiiDBAJX5WS/pErBulLG8B6Xz4hGh9XGlH9BjE9EI0XpHgkBo7h2cd3DHrQgPJ
SH/ik0nLBmOVTZLnoAYLnChyui/aZoLameRsLMYJiLWxbp3yNcJxhaFi1ZtYR8EE
8T1oXRDcs04MZPylymnGDVcAFWCceLVx6QGqtOfkWOPfomk0uIhKLvLxvSIVRqrg
1GyGLDtO/H9rwIJ3iT6wmuQtMlPcDoaYWq6vcmr1rIn+o695S2Y=
=+6Kt
-----END PGP SIGNATURE-----
--- End Message ---