pkgs/applications/misc/blender/darwin.patch

   1 --- a/CMakeLists.txt    2024-03-01 08:08:05
   2 +++ b/CMakeLists.txt    2024-04-24 15:45:30
   3 @@ -2134,7 +2134,7 @@
   4    )
   5    if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
   6      if(APPLE)
   7 -      if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
   8 +      if(FALSE)
   9        # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
  10        # with Xcode-11 (the Clang of which doesn't support the flag).
  11          message(
  12 --- a/build_files/cmake/platform/platform_apple.cmake   2024-02-22 15:31:36
  13 +++ b/build_files/cmake/platform/platform_apple.cmake   2024-04-24 16:06:13
  14 @@ -55,7 +55,6 @@
  15    endif()
  16  endif()
  17  if(NOT EXISTS "${LIBDIR}/.git")
  18 -  message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
  19  endif()
  20  if(FIRST_RUN)
  21    message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
  22 @@ -115,10 +114,6 @@
  23    find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
  24    find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
  25    list(APPEND LIBSNDFILE_LIBRARIES
  26 -    ${_sndfile_FLAC_LIBRARY}
  27 -    ${_sndfile_OGG_LIBRARY}
  28 -    ${_sndfile_VORBIS_LIBRARY}
  29 -    ${_sndfile_VORBISENC_LIBRARY}
  30    )
  31
  32    print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
  33 @@ -162,9 +157,7 @@
  34    set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
  35    set(FFMPEG_FIND_COMPONENTS
  36      avcodec avdevice avformat avutil
  37 -    mp3lame ogg opus swresample swscale
  38 -    theora theoradec theoraenc vorbis vorbisenc
  39 -    vorbisfile vpx x264)
  40 +   swresample swscale)
  41    if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
  42      list(APPEND FFMPEG_FIND_COMPONENTS aom)
  43    endif()
  44 @@ -275,7 +268,6 @@
  45  add_bundled_libraries(boost/lib)
  46
  47  if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
  48 -  string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it !
  49  endif()
  50
  51  if(WITH_PUGIXML)
  52 @@ -350,7 +342,7 @@
  53
  54  # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
  55  if(WITH_OPENMP)
  56 -  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
  57 +  if(FALSE)
  58      # Use OpenMP from our precompiled libraries.
  59      message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
  60      set(OPENMP_CUSTOM ON)
  61 @@ -427,7 +419,7 @@
  62    " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
  63  )
  64
  65 -if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0)
  66 +if(FALSE)
  67    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
  68      # Silence "no platform load command found in <static library>, assuming: macOS".
  69      string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")