Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7941 from Rmys/master

Browse Source 
blender ver. bump
This commit is contained in:
Rmys
2020-02-12 20:50:48 +03:00
committed by GitHub
parent d32eea8cc7 968302af62
commit f8d0c10302
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/editor/blender/actions.py
+5 -4
View File
@@ -16,7 +16,7 @@ def setup():
shelltools.cd("..") shelltools.cd("..")
shelltools.makedirs("cmake-make") shelltools.makedirs("cmake-make")
shelltools.cd("cmake-make") shelltools.cd("cmake-make")
shelltools.system("cmake ../blender-2.79b \ shelltools.system("cmake ../blender-2.81a \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \ -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
@@ -33,10 +33,11 @@ def setup():
-DWITH_GAMEENGINE=ON \ -DWITH_GAMEENGINE=ON \
-DWITH_PYTHON_INSTALL=OFF \ -DWITH_PYTHON_INSTALL=OFF \
-DWITH_MOD_OCEANSIM=ON \ -DWITH_MOD_OCEANSIM=ON \
-DPYTHON_VERSION=3.6 \ -DPYTHON_VERSION=3.8 \
-DPYTHON_LIBPATH=/usr/lib \ -DPYTHON_LIBPATH=/usr/lib \
-DPYTHON_LIBRARY=python3.6m \ -DPYTHON_LIBRARY=python3.8 \
-DPYTHON_INCLUDE_DIRS=/usr/include/python3.6m \ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.8 \
-DPYTHON_NUMPY_INCLUDE_DIRS=/usr/lib/python2.8/site-packages/numpy/core/include \
-DWITH_CODEC_SNDFILE=ON ") -DWITH_CODEC_SNDFILE=ON ")
def build(): def build():
multimedia/editor/blender/pspec.xml
+16 -2
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>3D modeling, animation, rendering and post-production application</Summary> <Summary>3D modeling, animation, rendering and post-production application</Summary>
<Description>blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback.</Description> <Description>blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback.</Description>
<Archive sha1sum="4fd307ccfd1d6df5cc1898009712d4b1ae35430f" type="targz">http://download.blender.org/source/blender-2.79b.tar.gz</Archive> <Archive sha1sum="20acacd88b91feb35fd91408f8bababa89c88a12" type="tarxz">http://download.blender.org/source/blender-2.81a.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>boost-devel</Dependency> <Dependency>boost-devel</Dependency>
<Dependency>cmake</Dependency> --> <Dependency>cmake</Dependency> -->
@@ -45,11 +45,13 @@
<Dependency>webp-devel</Dependency> <Dependency>webp-devel</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>python3-requests</Dependency> <Dependency>python3-requests</Dependency>
<Dependency>python3-numpy</Dependency>
<Dependency>intel-tbb-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--<Patch level="1">blender-2.67b-rna.patch</Patch>--> <!--<Patch level="1">blender-2.67b-rna.patch</Patch>-->
<!--<Patch level="1">06-blender-2.68-fix-install-rules.patch</Patch>--> <!--<Patch level="1">06-blender-2.68-fix-install-rules.patch</Patch>-->
<Patch level="1">ffmpeg4.patch</Patch> <!-- <Patch level="1">ffmpeg4.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -60,6 +62,11 @@
<Dependency>ffmpeg</Dependency> <Dependency>ffmpeg</Dependency>
<Dependency>fftw3</Dependency> <Dependency>fftw3</Dependency>
<Dependency>freetype</Dependency> <Dependency>freetype</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>intel-tbb</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>openjpeg2</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="2.0.0">glew</Dependency> <Dependency versionFrom="2.0.0">glew</Dependency>
<Dependency>ilmbase</Dependency> <Dependency>ilmbase</Dependency>
<Dependency>jack-audio-connection-kit</Dependency> <Dependency>jack-audio-connection-kit</Dependency>
@@ -104,6 +111,13 @@
</Package> </Package>
<History> <History>
<Update release="11">
<Date>2020-02-11</Date>
<Version>2.81</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="10"> <Update release="10">
<Date>2018-09-01</Date> <Date>2018-09-01</Date>
<Version>2.79</Version> <Version>2.79</Version>