blender: 2.82a -> 2.83.0
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
This commit is contained in:
parent
b56c66e7e8
commit
e49189078f
|
@ -9,7 +9,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_OPENAL)
|
if(WITH_OPENAL)
|
||||||
@@ -79,7 +78,7 @@ endif()
|
@@ -86,7 +85,7 @@ endif()
|
||||||
if(WITH_CODEC_SNDFILE)
|
if(WITH_CODEC_SNDFILE)
|
||||||
set(LIBSNDFILE ${LIBDIR}/sndfile)
|
set(LIBSNDFILE ${LIBDIR}/sndfile)
|
||||||
set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
|
set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
|
||||||
|
@ -18,7 +18,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate
|
set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -90,7 +89,7 @@ if(WITH_PYTHON)
|
@@ -97,7 +96,7 @@ if(WITH_PYTHON)
|
||||||
# normally cached but not since we include them with blender
|
# normally cached but not since we include them with blender
|
||||||
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
|
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
|
||||||
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
|
set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
|
||||||
|
@ -27,7 +27,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
|
set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
|
||||||
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
|
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
|
||||||
else()
|
else()
|
||||||
@@ -155,10 +154,7 @@ if(WITH_CODEC_FFMPEG)
|
@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG)
|
||||||
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
|
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
|
||||||
set(FFMPEG_LIBRARIES
|
set(FFMPEG_LIBRARIES
|
||||||
avcodec avdevice avformat avutil
|
avcodec avdevice avformat avutil
|
||||||
|
@ -39,7 +39,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -199,14 +195,14 @@ if(WITH_OPENCOLLADA)
|
@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA)
|
||||||
set(OPENCOLLADA ${LIBDIR}/opencollada)
|
set(OPENCOLLADA ${LIBDIR}/opencollada)
|
||||||
|
|
||||||
set(OPENCOLLADA_INCLUDE_DIRS
|
set(OPENCOLLADA_INCLUDE_DIRS
|
||||||
|
@ -60,16 +60,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
set(OPENCOLLADA_LIBRARIES
|
set(OPENCOLLADA_LIBRARIES
|
||||||
OpenCOLLADASaxFrameworkLoader
|
OpenCOLLADASaxFrameworkLoader
|
||||||
-lOpenCOLLADAFramework
|
-lOpenCOLLADAFramework
|
||||||
@@ -215,7 +211,7 @@ if(WITH_OPENCOLLADA)
|
@@ -277,14 +273,13 @@ if(WITH_BOOST)
|
||||||
-lMathMLSolver
|
|
||||||
-lGeneratedSaxParser
|
|
||||||
-lbuffer -lftoa -lUTF
|
|
||||||
- ${OPENCOLLADA_LIBPATH}/libxml2.a
|
|
||||||
+ xml2
|
|
||||||
)
|
|
||||||
# PCRE is bundled with openCollada
|
|
||||||
# set(PCRE ${LIBDIR}/pcre)
|
|
||||||
@@ -276,14 +272,13 @@ if(WITH_BOOST)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
|
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
|
||||||
|
@ -85,7 +76,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
${JPEG_LIBRARIES}
|
${JPEG_LIBRARIES}
|
||||||
${TIFF_LIBRARY}
|
${TIFF_LIBRARY}
|
||||||
@@ -306,7 +301,7 @@ endif()
|
@@ -307,7 +302,7 @@ endif()
|
||||||
if(WITH_OPENCOLORIO)
|
if(WITH_OPENCOLORIO)
|
||||||
set(OPENCOLORIO ${LIBDIR}/opencolorio)
|
set(OPENCOLORIO ${LIBDIR}/opencolorio)
|
||||||
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
|
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
|
||||||
|
|
|
@ -17,11 +17,11 @@ let python = python3Packages.python; in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "blender";
|
pname = "blender";
|
||||||
version = "2.82a";
|
version = "2.83.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
|
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
|
||||||
sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d";
|
sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||||
|
|
Loading…
Reference in a new issue