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

opencv fix

Browse Source
This commit is contained in:
Idris Kalp
2021-03-13 00:33:21 +03:00
parent 97376f8bce
commit c4f1c46b9c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
science/robotics/opencv/actions.py
+7 -4
View File
@@ -18,7 +18,8 @@ def setup():
shelltools.makedirs("build") shelltools.makedirs("build")
shelltools.cd("build") shelltools.cd("build")
cmaketools.configure("-D CMAKE_BUILD_TYPE=Release \ cmaketools.configure("-G 'Ninja' \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_INSTALL_LIBDIR=lib \
-D CMAKE_SKIP_RPATH=ON \ -D CMAKE_SKIP_RPATH=ON \
@@ -58,7 +59,7 @@ def setup():
-DBUILD_IPP_IW=OFF \ -DBUILD_IPP_IW=OFF \
-DBUILD_ITT=OFF \ -DBUILD_ITT=OFF \
-DBUILD_JAVA=OFF \ -DBUILD_JAVA=OFF \
-DBUILD_PROTOBUF=OFF \ -DBUILD_PROTOBUF=ON \
-DBUILD_opencv_java_bindings_generator=OFF \ -DBUILD_opencv_java_bindings_generator=OFF \
-DPYTHON3_EXECUTABLE=/usr/bin/python3 \ -DPYTHON3_EXECUTABLE=/usr/bin/python3 \
-DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_PKGCONFIG=ON \
@@ -70,11 +71,13 @@ def setup():
def build(): def build():
shelltools.cd("build") shelltools.cd("build")
cmaketools.make() #cmaketools.make()
shelltools.system("ninja")
def install(): def install():
shelltools.cd("build") shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) #cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
# Move other docs and samples under standart doc dir # Move other docs and samples under standart doc dir
#doc_dir = "usr/share/doc/" + get.srcNAME() #doc_dir = "usr/share/doc/" + get.srcNAME()
science/robotics/opencv/pspec.xml
+5
View File
@@ -45,6 +45,9 @@
<Dependency>freetype-devel</Dependency> <Dependency>freetype-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency> <Dependency>harfbuzz-devel</Dependency>
<Dependency>libpng-devel</Dependency> <Dependency>libpng-devel</Dependency>
<Dependency>protobuf-devel</Dependency>
<Dependency>opencl-icd-devel</Dependency>
<Dependency>ninja</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
</Patches> </Patches>
@@ -77,6 +80,8 @@
<Dependency>webp</Dependency> <Dependency>webp</Dependency>
<Dependency>freetype</Dependency> <Dependency>freetype</Dependency>
<Dependency>harfbuzz</Dependency> <Dependency>harfbuzz</Dependency>
<Dependency>protobuf</Dependency>
<Dependency>opencl-icd</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>