tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 0611614fe18..a6dcb2f04b6 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -2567,7 +2567,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
6 )
7 if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
8 if(APPLE)
9- if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
10+ if(FALSE)
11 # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
12 # with Xcode-11 (the Clang of which doesn't support the flag).
13 message(
14diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
15index b2db64bbd2e..aac4b552655 100644
16--- a/build_files/cmake/platform/platform_apple.cmake
17+++ b/build_files/cmake/platform/platform_apple.cmake
18@@ -55,7 +55,6 @@ if(NOT DEFINED LIBDIR)
19 endif()
20 endif()
21 if(NOT EXISTS "${LIBDIR}/.git")
22- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
23 endif()
24 if(FIRST_RUN)
25 message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
26@@ -121,10 +120,6 @@ if(WITH_CODEC_SNDFILE)
27 find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
28 find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
29 list(APPEND LIBSNDFILE_LIBRARIES
30- ${_sndfile_FLAC_LIBRARY}
31- ${_sndfile_OGG_LIBRARY}
32- ${_sndfile_VORBIS_LIBRARY}
33- ${_sndfile_VORBISENC_LIBRARY}
34 )
35
36 print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
37@@ -168,9 +163,7 @@ if(WITH_CODEC_FFMPEG)
38 set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
39 set(FFMPEG_FIND_COMPONENTS
40 avcodec avdevice avformat avutil
41- mp3lame ogg opus swresample swscale
42- theora theoradec theoraenc vorbis vorbisenc
43- vorbisfile vpx x264)
44+ swresample swscale)
45 if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
46 list(APPEND FFMPEG_FIND_COMPONENTS aom)
47 endif()
48@@ -285,7 +278,6 @@ endif()
49 add_bundled_libraries(boost/lib)
50
51 if(WITH_CODEC_FFMPEG)
52- string(APPEND PLATFORM_LINKFLAGS " -liconv") # ffmpeg needs it !
53 endif()
54
55 if(WITH_PUGIXML)
56@@ -361,7 +353,7 @@ endif()
57 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
58 if(WITH_OPENMP)
59 if(CMAKE_C_COMPILER_ID MATCHES "Clang")
60- if(${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17.0)
61+ if(FALSE) # clang in nix was compatible with openmp
62 if(WITH_STRICT_BUILD_OPTIONS)
63 message(SEND_ERROR "OpenMP library is not compatible with the current Clang version")
64 else()
65@@ -446,7 +438,7 @@ string(APPEND PLATFORM_LINKFLAGS
66 " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
67 )
68
69-if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0)
70+if(FALSE)
71 if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
72 # Silence "no platform load command found in <static library>, assuming: macOS".
73 string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")
74diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt
75index 935b3f94ee1..f3d73637f71 100644
76--- a/source/blender/blendthumb/CMakeLists.txt
77+++ b/source/blender/blendthumb/CMakeLists.txt
78@@ -65,15 +65,6 @@ elseif(APPLE)
79 # Prevent Xcode from overwriting the signature.
80 XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
81 )
82- # CMake needs the target defined in the same file as add_custom_command.
83- # It needs to be code-signed (ad-hoc in this case)
84- # even on developer machine to generate thumbnails.
85- # Command taken from XCode build process.
86- add_custom_command(
87- TARGET blender-thumbnailer POST_BUILD
88- COMMAND codesign --deep --force --sign - --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist"
89- --timestamp=none $<TARGET_BUNDLE_DIR:blender-thumbnailer>
90- )
91 elseif(UNIX)
92 # -----------------------------------------------------------------------------
93 # Build `blender-thumbnailer` executable