Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-07-06 16:28:19 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-07-07 10:31:46 +0300
commitd212b3dc43eeda100a6b82ec083a68dffb9c02c9 (patch)
treede57bf8c67f9e542d7e1f0761c62931a6fc0f351 /build_files/build_environment/patches/ogg.diff
parentb28683b8b5f9a3c357af8fcd596000dc0e5f33ca (diff)
Make deps: Fixes for macOS platform
Set of fixes which had to be made in order to have dependencies built on own laptop: - Require bison as a dependent software. It is required by ISPC. On macOS it is required to be installed via Homebrew. This is because Bison from Xcode toolchain is too old. - Made sure Boost is compiled using clang. Without this gcc was used, and some unsupported command line argument was passed to it. - Modify OGG in a way which does in fact pull fixed sized types. They are defined in stdint.h. Without this fix FFmpeg will not detect presence of OGG because the test program fails to compile. - Force disable zstd compression and make wepb optional for the TIFF library. Without this TIFF might pick up development libraries from Homebrew. Differential Revision: https://developer.blender.org/D8221
Diffstat (limited to 'build_files/build_environment/patches/ogg.diff')
-rw-r--r--build_files/build_environment/patches/ogg.diff12
1 files changed, 12 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/ogg.diff b/build_files/build_environment/patches/ogg.diff
new file mode 100644
index 00000000000..fca426e1d35
--- /dev/null
+++ b/build_files/build_environment/patches/ogg.diff
@@ -0,0 +1,12 @@
+diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h
+index eb8a322..6f73b72 100644
+--- a/include/ogg/os_types.h
++++ b/include/ogg/os_types.h
+@@ -71,6 +71,7 @@
+ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+ # include <sys/types.h>
++# include <stdint.h>
+ typedef int16_t ogg_int16_t;
+ typedef uint16_t ogg_uint16_t;
+ typedef int32_t ogg_int32_t;