haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

OpenCV: enable for secondary arch

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-06-08 12:37:11 +10:00
parent 618edc7010
commit bc940762b6
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media-libs/opencv/opencv-3.4.3.recipe
View File

@@ -9,7 +9,7 @@ COPYRIGHT="2000-2016, Intel Corporation
2015-2016, OpenCV Foundation 2015-2016, OpenCV Foundation
2015-2016, Itseez Inc." 2015-2016, Itseez Inc."
LICENSE="BSD (3-clause)" LICENSE="BSD (3-clause)"
REVISION="9" REVISION="10"
SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz" SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
SOURCE_FILENAME="opencv-$portVersion.tar.gz" SOURCE_FILENAME="opencv-$portVersion.tar.gz"
CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec" CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec"
@@ -18,7 +18,7 @@ SOURCE_FILENAME_2="opencv_contrib-$portVersion.tar.gz"
CHECKSUM_SHA256_2="6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636" CHECKSUM_SHA256_2="6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636"
ARCHITECTURES="?x86 x86_64" ARCHITECTURES="?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86" SECONDARY_ARCHITECTURES="x86"
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/. # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
commandSuffix=$secondaryArchSuffix commandSuffix=$secondaryArchSuffix
@@ -235,7 +235,7 @@ BUILD_PREREQUIRES="
# cmd:ant # cmd:ant
cmd:cmake cmd:cmake
cmd:doxygen cmd:doxygen
cmd:f2py2 # cmd:f2py2
cmd:f2py3 cmd:f2py3
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
# cmd:javac # cmd:javac
@@ -244,7 +244,7 @@ BUILD_PREREQUIRES="
cmd:make cmd:make
# cmd:matlab # maybe later # cmd:matlab # maybe later
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
cmd:python2 # cmd:python2
cmd:python3 cmd:python3
" "
@@ -303,14 +303,19 @@ INSTALL()
make install make install
mkdir -p $developDir $dataDir mkdir -p $developDir $dataDir $includeDir
mv $prefix/include $includeDir mv $prefix/include/* $includeDir
mv $prefix/share/* $dataDir mv $prefix/share/* $dataDir
rmdir $prefix/share rmdir $prefix/{share,include}
mkdir -p $libDir/cmake/OpenCV mkdir -p $libDir/cmake/OpenCV
mv $dataDir/OpenCV/*.cmake $libDir/cmake/OpenCV/ mv $dataDir/OpenCV/*.cmake $libDir/cmake/OpenCV/
if [ -n "$secondaryArchSuffix" ]; then
mv $prefix/lib/*.so* $libDir
mv $prefix/lib/{pkgconfig,python3.7} $libDir
fi
prepareInstalledDevelLibs libopencv_aruco \ prepareInstalledDevelLibs libopencv_aruco \
libopencv_bgsegm \ libopencv_bgsegm \
libopencv_bioinspired \ libopencv_bioinspired \
@@ -371,6 +376,8 @@ INSTALL()
# fixCmake # fixCmake
sed -i 's,\/include,/'${relativeIncludeDir}',g' \ sed -i 's,\/include,/'${relativeIncludeDir}',g' \
$libDir/cmake/OpenCV/OpenCVConfig.cmake $libDir/cmake/OpenCV/OpenCVConfig.cmake
sed -i 's|set(OpenCV_INCLUDE_DIRS.*|set(OpenCV_INCLUDE_DIRS "'${includeDir}'" "'${includeDir}'/opencv")|g' \
$libDir/cmake/OpenCV/OpenCVConfig.cmake
sed -i 's|/\.\./\.\./|&../|g' \ sed -i 's|/\.\./\.\./|&../|g' \
$libDir/cmake/OpenCV/OpenCVConfig.cmake $libDir/cmake/OpenCV/OpenCVConfig.cmake
sed -i 's,\/lib\/,\/,g' \ sed -i 's,\/lib\/,\/,g' \
@@ -383,7 +390,7 @@ INSTALL()
# tools package # tools package
packageEntries tools \ packageEntries tools \
$binDir $prefix/bin
} }
TEST() TEST()