Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
@@ -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.75a \
|
shelltools.system("cmake ../blender-2.78a \
|
||||||
-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 \
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
<Dependency>libxml2-devel</Dependency>
|
<Dependency>libxml2-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch>config.patch</Patch>
|
<!--<Patch>config.patch</Patch>-->
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
<Dependency>libX11-devel</Dependency>
|
<Dependency>libX11-devel</Dependency>
|
||||||
<Dependency>opencv-devel</Dependency>
|
<Dependency>opencv-devel</Dependency>
|
||||||
<Dependency>libXrandr-devel</Dependency>
|
<Dependency>libXrandr-devel</Dependency>
|
||||||
|
<Dependency>icu4c-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<!--<Patch level="1">qtlocalpeer.patch</Patch>-->
|
<!--<Patch level="1">qtlocalpeer.patch</Patch>-->
|
||||||
|
|||||||
Reference in New Issue
Block a user