From 8073b16edda20f2b7dc12613d0bc265e6026b1ff Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sep 24 2020 06:45:17 +0000 Subject: Add missing patches --- diff --git a/blender-2.90-droid.patch b/blender-2.90-droid.patch new file mode 100644 index 0000000..7bd38ff --- /dev/null +++ b/blender-2.90-droid.patch @@ -0,0 +1,26 @@ +diff -ru blender-2.90.0.orig/source/blender/blenfont/intern/blf_font_default.c blender-2.90.0/source/blender/blenfont/intern/blf_font_default.c +--- blender-2.90.0.orig/source/blender/blenfont/intern/blf_font_default.c 2020-08-31 04:59:45.000000000 -0700 ++++ blender-2.90.0/source/blender/blenfont/intern/blf_font_default.c 2020-09-04 21:01:00.797111420 -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.90.0.orig/source/creator/CMakeLists.txt blender-2.90.0/source/creator/CMakeLists.txt +--- blender-2.90.0.orig/source/creator/CMakeLists.txt 2020-08-31 05:03:18.000000000 -0700 ++++ blender-2.90.0/source/creator/CMakeLists.txt 2020-09-04 21:02:46.191496948 -0700 +@@ -388,8 +388,8 @@ + # fonts + install( + DIRECTORY +- ${CMAKE_SOURCE_DIR}/release/datafiles/fonts +- DESTINATION ${TARGETDIR_VER}/datafiles ++ ${CMAKE_SOURCE_DIR}/release/datafiles/fonts/ ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts/blender + ) + + # localization diff --git a/blender-embree-library.diff b/blender-embree-library.diff new file mode 100644 index 0000000..967f64c --- /dev/null +++ b/blender-embree-library.diff @@ -0,0 +1,32 @@ +diff -ru blender-2.90.0.orig/build_files/cmake/Modules/FindEmbree.cmake blender-2.90.0/build_files/cmake/Modules/FindEmbree.cmake +--- blender-2.90.0.orig/build_files/cmake/Modules/FindEmbree.cmake 2020-08-31 05:03:18.000000000 -0700 ++++ blender-2.90.0/build_files/cmake/Modules/FindEmbree.cmake 2020-09-04 20:51:57.064441379 -0700 +@@ -79,10 +79,10 @@ + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Embree DEFAULT_MSG +- _embree_LIBRARIES EMBREE_INCLUDE_DIR) ++ EMBREE_LIBRARY EMBREE_INCLUDE_DIR) + + IF(EMBREE_FOUND) +- SET(EMBREE_LIBRARIES ${_embree_LIBRARIES}) ++ SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY}) + SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR}) + ENDIF(EMBREE_FOUND) + +diff -ru blender-2.90.0.orig/intern/cycles/blender/CMakeLists.txt blender-2.90.0/intern/cycles/blender/CMakeLists.txt +--- blender-2.90.0.orig/intern/cycles/blender/CMakeLists.txt 2020-08-31 04:59:44.000000000 -0700 ++++ blender-2.90.0/intern/cycles/blender/CMakeLists.txt 2020-09-04 20:40:25.631042062 -0700 +@@ -67,6 +67,12 @@ + ) + endif() + ++if(WITH_CYCLES_EMBREE) ++ list(APPEND LIB ++ ${EMBREE_LIBRARIES} ++ ) ++endif() ++ + set(ADDON_FILES + addon/__init__.py + addon/engine.py