nixpkgs/pkgs/blender/darwin.patch

   1 diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
   2 --- a/build_files/cmake/platform/platform_apple.cmake
   3 +++ b/build_files/cmake/platform/platform_apple.cmake
   4 @@ -80,7 +80,6 @@ else()
   5    message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
   6  endif()
   7  if(NOT EXISTS "${LIBDIR}/")
   8 -  message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
   9  endif()
  10
  11  # -------------------------------------------------------------------------
  12 @@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE)
  13    find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
  14    find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
  15    list(APPEND LIBSNDFILE_LIBRARIES
  16 -    ${_sndfile_FLAC_LIBRARY}
  17 -    ${_sndfile_OGG_LIBRARY}
  18 -    ${_sndfile_VORBIS_LIBRARY}
  19 -    ${_sndfile_VORBISENC_LIBRARY}
  20    )
  21
  22    print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
  23 @@ -132,7 +127,7 @@ if(WITH_PYTHON)
  24      # normally cached but not since we include them with blender
  25      set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
  26      set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
  27 -    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.a)
  28 +    set(PYTHON_LIBRARY "${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.dylib")
  29      set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
  30      # set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
  31    else()
  32 @@ -173,9 +168,7 @@ endif()
  33  if(WITH_CODEC_FFMPEG)
  34    set(FFMPEG_FIND_COMPONENTS
  35      avcodec avdevice avformat avutil
  36 -    mp3lame ogg opus swresample swscale
  37 -    theora theoradec theoraenc vorbis vorbisenc
  38 -    vorbisfile vpx x264 xvidcore)
  39 +    swresample swscale)
  40    find_package(FFmpeg)
  41  endif()
  42
  43 @@ -266,7 +259,6 @@ if(WITH_BOOST)
  44  endif()
  45
  46  if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
  47 -  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
  48  endif()
  49
  50  if(WITH_OPENIMAGEIO)
  51 @@ -439,7 +431,7 @@ else()
  52    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
  53  endif()
  54
  55 -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
  56 +if(FALSE)
  57    # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
  58    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
  59  endif()