From 07397e8827568855e59c6d8edf5b9718848097ab Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sep 05 2020 06:16:03 +0000
Subject: Update to 2.90.0 (#1855165)

Disable embree for cycle rendering
Add initial Wayland support and set disabled by default
Remove unused brp-python-bytecompile script declaration
Remove python 3.9 patch

---

diff --git a/.gitignore b/.gitignore
index 63b9247..532eff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@
 /blender-2.83.4.tar.xz
 /blender-2.83.5.tar.xz
 /blender-2.90.0.tar.xz
+/blender-2.90-droid.patch
+/blender-embree-library.diff
diff --git a/blender-2.83-droid.patch b/blender-2.83-droid.patch
deleted file mode 100644
index 98a8337..0000000
--- a/blender-2.83-droid.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru blender-2.83.0.old/source/blender/blenfont/intern/blf_font_default.c blender-2.83.0/source/blender/blenfont/intern/blf_font_default.c
---- blender-2.83.0.old/source/blender/blenfont/intern/blf_font_default.c	2020-06-03 07:18:19.000000000 -0700
-+++ blender-2.83.0/source/blender/blenfont/intern/blf_font_default.c	2020-06-08 18:51:22.642003171 -0700
-@@ -33,7 +33,7 @@
- 
- static int blf_load_font_default(const char *filename, const bool unique)
- {
--  const char *dir = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
-+  const char *dir = "/usr/share/fonts/blender";
-   if (dir == NULL) {
-     fprintf(stderr,
-             "%s: 'fonts' data path not found for '%s', will not be able to display text\n",
-diff -ru blender-2.83.0.old/source/creator/CMakeLists.txt blender-2.83.0/source/creator/CMakeLists.txt
---- blender-2.83.0.old/source/creator/CMakeLists.txt	2020-06-03 07:18:27.000000000 -0700
-+++ blender-2.83.0/source/creator/CMakeLists.txt	2020-06-08 18:53:45.975733489 -0700
-@@ -387,9 +387,8 @@
- 
- # fonts
- install(
--  DIRECTORY
--    ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
--  DESTINATION ${TARGETDIR_VER}/datafiles
-+  DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/
-+  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender
- )
- 
- # localization
diff --git a/blender-support-python-3.9.diff b/blender-support-python-3.9.diff
deleted file mode 100644
index 9f23e3c..0000000
--- a/blender-support-python-3.9.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur blender-2.83.5.old/source/blender/python/mathutils/mathutils_Matrix.c blender-2.83.5/source/blender/python/mathutils/mathutils_Matrix.c
---- blender-2.83.5.old/source/blender/python/mathutils/mathutils_Matrix.c	2020-08-20 16:59:43.253094831 +0200
-+++ blender-2.83.5/source/blender/python/mathutils/mathutils_Matrix.c	2020-08-20 20:46:01.903876602 +0200
-@@ -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)
-@@ -395,14 +396,15 @@
-   return NULL;
- }
- 
--static PyObject *matrix__apply_to_copy(PyNoArgsFunction matrix_func, MatrixObject *self)
-+static PyObject *matrix__apply_to_copy(PyObject *(*matrix_func)(MatrixObject *),
-+                                       MatrixObject *self)
- {
-   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 +1739,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 +1947,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 +1993,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 -Naur blender-2.83.5.old/source/blender/python/mathutils/mathutils_Quaternion.c blender-2.83.5/source/blender/python/mathutils/mathutils_Quaternion.c
---- blender-2.83.5.old/source/blender/python/mathutils/mathutils_Quaternion.c	2020-08-20 16:59:43.253094831 +0200
-+++ blender-2.83.5/source/blender/python/mathutils/mathutils_Quaternion.c	2020-08-20 20:47:51.201624646 +0200
-@@ -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,11 @@
-   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 -Naur blender-2.83.5.old/source/blender/python/mathutils/mathutils_Vector.c blender-2.83.5/source/blender/python/mathutils/mathutils_Vector.c
---- blender-2.83.5.old/source/blender/python/mathutils/mathutils_Vector.c	2020-08-20 16:59:43.253094831 +0200
-+++ blender-2.83.5/source/blender/python/mathutils/mathutils_Vector.c	2020-08-20 20:48:51.530589513 +0200
-@@ -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/sources b/sources
index 0c25efa..b7bcbb9 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (blender-2.90.0.tar.xz) = 9fc3e423bb13f3b983deba130febf8cc870a65c7d87fff8d9536a54ab606d097cccf46cdd518b15ab483fdf85551fde607b28801c3dbe681c841d7594fcbc57e
+SHA512 (blender-2.90-droid.patch) = ffc5b168d7fd2bc7e63c8ad9d9a1f58e31d847ca309ac421d53c4c60da2d3f814cded16ce9c7804678b2ccb8ea6d57e66333cc2999e9ea700e5bbe8146f671e0
+SHA512 (blender-embree-library.diff) = d3318bb9b712e9b1dea8342896972270f1f743420449638d391076bdfe33a1387828eb8cc10ce0bdf70a66ddc739ecbd53682af6cd65e19614f9491978f00b14