diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-11-22 02:54:03 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-11-22 03:14:39 -0600 |
| commit | 20ba999a3cbc7b0063490fb853a3df08bd158ef1 (patch) | |
| tree | 07d990a3fdfecefeedde4dca5edf3b40ea792992 | |
| parent | cd50a82701f113f26b14850cca88291e77f0a44b (diff) | |
| download | packages-20ba999a3cbc7b0063490fb853a3df08bd158ef1.tar.gz packages-20ba999a3cbc7b0063490fb853a3df08bd158ef1.tar.bz2 packages-20ba999a3cbc7b0063490fb853a3df08bd158ef1.tar.xz packages-20ba999a3cbc7b0063490fb853a3df08bd158ef1.zip | |
user/opencv: Update to 4.6.0
Disable built-in protobuf. Ours is new enough now to work.
Disable OpenJPEG as we have Jasper and OpenJPEG doesn't build properly.
Closes: #867
| -rw-r--r-- | user/opencv/APKBUILD | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD index b8739c3be..759f20e0b 100644 --- a/user/opencv/APKBUILD +++ b/user/opencv/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=opencv -pkgver=4.2.0 +pkgver=4.6.0 pkgrel=0 pkgdesc="Computer vision and machine learning software library" url="https://opencv.org" @@ -11,9 +11,11 @@ license="BSD-3-Clause" depends="" makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev gtk+3.0-dev jasper-dev libdc1394-dev libgomp libgphoto2-dev - libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev v4l-utils-dev" + libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev v4l-utils-dev + mawk protobuf-dev" subpackages="$pkgname-dev $pkgname-libs" source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz + ade-0.1.1f.zip::https://github.com/opencv/ade/archive/v0.1.1f.zip cmake-license.patch " @@ -27,13 +29,15 @@ prepare() { for i in 3rdparty/*; do case $i in */carotene*) continue;; - */protobuf*) continue;; */ittnotify) continue;; # Else FTBFS on x86_64 */quirc) continue;; esac rm -rf "$i" done mkdir -p build + mkdir -p .cache/ade + cp "$srcdir"/ade-0.1.1f.zip \ + "$builddir"/.cache/ade/$(md5sum "$srcdir"/ade-0.1.1f.zip | awk '{print $1;}')-0.1.1f.zip } build() { @@ -51,10 +55,13 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DBUILD_PROTOBUF=OFF \ + -DPROTOBUF_UPDATE_FILES=ON \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DWITH_OPENMP=ON \ -DWITH_OPENCL=ON \ -DWITH_OPENEXR=OFF \ + -DWITH_OPENJPEG=OFF \ -DWITH_IPP=OFF \ $_sse \ -Bbuild @@ -65,5 +72,6 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="2629d548384c81a786ab2620e089539b4b2f4ae5e1d837e5fe7f75ddadb909b65b65d0319226ae4726675f105ceb5adb88616ca6399c7660d3021ca4b9a06531 opencv-4.2.0.tar.gz +sha512sums="93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 opencv-4.6.0.tar.gz +f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836 ade-0.1.1f.zip ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch" |