[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Saturday, August 27, 2022 @ 06:50:04
Author: arojas
Revision: 454584
upgpkg: opencv 4.6.0-4: cudnn 8.5 rebuild
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-08-27 06:42:45 UTC (rev 454583)
+++ PKGBUILD2022-08-27 06:50:04 UTC (rev 454584)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.6.0
-pkgrel=3
+pkgrel=4
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -21,13 +21,16 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
+https://github.com/opencv/opencv/commit/496eed95.patch
vtk9.patch)
sha256sums=('1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277'
'1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7'
+'fc3e235c95874c1faa6c37e61a70623b92c4c307b2e258341a654ac3cfd44537'
'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
prepare() {
patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
+ patch -d $pkgname-$pkgver -p1 < 496eed95.patch # Fix build with ffmpeg 5.1
}
build() {
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Saturday, June 11, 2022 @ 14:36:29 Author: felixonmars Revision: 448174 upgpkg: opencv 4.6.0-3: protobuf 3.21 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-06-11 13:54:55 UTC (rev 448173) +++ PKGBUILD2022-06-11 14:36:29 UTC (rev 448174) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.6.0 -pkgrel=2 +pkgrel=3 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Tuesday, June 7, 2022 @ 13:12:11 Author: svenstaro Revision: 447720 upgpkg: opencv 4.6.0-2: cuda 11.7 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-06-07 12:47:19 UTC (rev 447719) +++ PKGBUILD2022-06-07 13:12:11 UTC (rev 447720) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.6.0 -pkgrel=1 +pkgrel=2 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Sunday, June 5, 2022 @ 21:27:13
Author: arojas
Revision: 447590
Update to 4.6.0
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-06-05 18:49:20 UTC (rev 447589)
+++ PKGBUILD2022-06-05 21:27:13 UTC (rev 447590)
@@ -4,13 +4,13 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
-pkgver=4.5.5
-pkgrel=7
+pkgver=4.6.0
+pkgrel=1
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
url='https://opencv.org/'
-depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg4.4 protobuf)
+depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg protobuf)
makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi cudnn fmt)
optdepends=('opencv-samples: samples'
'vtk: for the viz module'
@@ -22,8 +22,8 @@
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
vtk9.patch)
-sha256sums=('a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad'
-'a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11'
+sha256sums=('1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277'
+'1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7'
'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
prepare() {
@@ -31,7 +31,7 @@
}
build() {
- export JAVA_HOME="/usr/lib/jvm/default"
PKG_CONFIG_PATH=/usr/lib/ffmpeg4.4/pkgconfig
+ export JAVA_HOME="/usr/lib/jvm/default"
# cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to
specify them manually
_opts="-DWITH_OPENCL=ON \
-DWITH_OPENGL=ON \
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, May 16, 2022 @ 00:44:08 Author: svenstaro Revision: 445854 upgpkg: opencv 4.5.5-7: cuda 11.7 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-05-15 22:06:54 UTC (rev 445853) +++ PKGBUILD2022-05-16 00:44:08 UTC (rev 445854) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.5 -pkgrel=6 +pkgrel=7 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Sunday, May 15, 2022 @ 22:06:41 Author: arojas Revision: 445852 hdf5 1.12.2 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-05-15 20:51:32 UTC (rev 445851) +++ PKGBUILD2022-05-15 22:06:41 UTC (rev 445852) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.5 -pkgrel=5 +pkgrel=6 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Saturday, April 23, 2022 @ 19:23:48 Author: foutrelis Revision: 443832 upgpkg: opencv 4.5.5-5: protobuf 3.20 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-04-23 19:17:02 UTC (rev 443831) +++ PKGBUILD2022-04-23 19:23:48 UTC (rev 443832) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.5 -pkgrel=4 +pkgrel=5 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, March 28, 2022 @ 11:17:23 Author: arojas Revision: 440759 cudnn 8.3.3 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-03-28 11:07:28 UTC (rev 440758) +++ PKGBUILD2022-03-28 11:17:23 UTC (rev 440759) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.5 -pkgrel=3 +pkgrel=4 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD ffmpeg5.patch)
Date: Saturday, February 19, 2022 @ 21:31:34
Author: arojas
Revision: 437781
Build with FFmpeg 4.4 (FS#73887)
Modified:
opencv/trunk/PKGBUILD
Deleted:
opencv/trunk/ffmpeg5.patch
---+
PKGBUILD | 13 -
ffmpeg5.patch | 466
2 files changed, 5 insertions(+), 474 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-02-19 21:26:45 UTC (rev 437780)
+++ PKGBUILD2022-02-19 21:31:34 UTC (rev 437781)
@@ -5,12 +5,12 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.5
-pkgrel=2
+pkgrel=3
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
url='https://opencv.org/'
-depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg protobuf)
+depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg4.4 protobuf)
makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi cudnn fmt)
optdepends=('opencv-samples: samples'
'vtk: for the viz module'
@@ -21,20 +21,17 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-vtk9.patch
-ffmpeg5.patch)
+vtk9.patch)
sha256sums=('a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad'
'a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11'
-'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e'
-'b6459e0456da49d4b9e83b6ed859b144db64b1e1b150718fcee433fa19babdbe')
+'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
prepare() {
patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
- patch -d $pkgname-$pkgver -p1 < ffmpeg5.patch # FFmpeg 5, patch from
berolinux https://github.com/opencv/opencv/issues/21455
}
build() {
- export JAVA_HOME="/usr/lib/jvm/default"
+ export JAVA_HOME="/usr/lib/jvm/default"
PKG_CONFIG_PATH=/usr/lib/ffmpeg4.4/pkgconfig
# cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to
specify them manually
_opts="-DWITH_OPENCL=ON \
-DWITH_OPENGL=ON \
Deleted: ffmpeg5.patch
===
--- ffmpeg5.patch 2022-02-19 21:26:45 UTC (rev 437780)
+++ ffmpeg5.patch 2022-02-19 21:31:34 UTC (rev 437781)
@@ -1,466 +0,0 @@
-diff -up opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp.omv~
opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp
opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp.omv~ 2022-01-16
01:57:43.568982322 +0100
-+++ opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp 2022-01-17
18:00:14.876283994 +0100
-@@ -88,6 +88,10 @@ extern "C" {
- #include
- #include
-
-+#if LIBAVCODEC_VERSION_MAJOR >= 59
-+#include
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
-@@ -504,6 +508,7 @@ struct CvCapture_FFMPEG
- AVCodec * avcodec;
- int video_stream;
- AVStream* video_st;
-+AVCodecContext * video_ccx;
- AVFrame * picture;
- AVFrame rgb_picture;
- int64_t picture_pts;
-@@ -554,6 +559,7 @@ void CvCapture_FFMPEG::init()
- ic = 0;
- video_stream = -1;
- video_st = 0;
-+video_ccx = 0;
- picture = 0;
- picture_pts = AV_NOPTS_VALUE_;
- first_frame_number = -1;
-@@ -617,8 +623,13 @@ void CvCapture_FFMPEG::close()
-
- if( video_st )
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 59
- avcodec_close( video_st->codec );
-+#else
-+ avcodec_close( video_ccx );
-+#endif
- video_st = NULL;
-+ video_ccx = NULL;
- }
-
- if( ic )
-@@ -800,6 +811,7 @@ private:
-
- static ImplMutex _mutex;
-
-+#if LIBAVCODEC_VERSION_MAJOR < 59
- static int LockCallBack(void **mutex, AVLockOp op)
- {
- ImplMutex* localMutex = reinterpret_cast(*mutex);
-@@ -830,6 +842,7 @@ static int LockCallBack(void **mutex, AV
- }
- return 0;
- }
-+#endif
-
-
- static void ffmpeg_log_callback(void *ptr, int level, const char *fmt,
va_list vargs)
-@@ -881,15 +894,19 @@ public:
- {
- avformat_network_init();
-
-+#if LIBAVCODEC_VERSION_MAJOR < 59
- /* register all codecs, demux and protocols */
- av_register_all();
-
- /* register a callback function for synchronization */
- av_lockmgr_register();
-+#endif
- }
- ~InternalFFMpegRegister()
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 59
- av_lockmgr_register(NULL);
-+#endif
- av_log_set_callback(NULL);
- }
- };
-@@ -993,6 +1010,9 @@ bool CvCapture_FFMPEG::open(const char*
- #else
- av_dict_set(, "rtsp_transport", "tcp", 0);
- #endif
[arch-commits] Commit in opencv/trunk (PKGBUILD ffmpeg5.patch)
Date: Tuesday, January 25, 2022 @ 21:00:29
Author: arojas
Revision: 435138
ffmpeg 5 rebuild
Added:
opencv/trunk/ffmpeg5.patch
Modified:
opencv/trunk/PKGBUILD
---+
PKGBUILD |9 -
ffmpeg5.patch | 466
2 files changed, 472 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2022-01-25 20:28:51 UTC (rev 435137)
+++ PKGBUILD2022-01-25 21:00:29 UTC (rev 435138)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.5
-pkgrel=1
+pkgrel=2
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -21,13 +21,16 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-vtk9.patch)
+vtk9.patch
+ffmpeg5.patch)
sha256sums=('a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad'
'a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11'
-'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
+'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e'
+'b6459e0456da49d4b9e83b6ed859b144db64b1e1b150718fcee433fa19babdbe')
prepare() {
patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
+ patch -d $pkgname-$pkgver -p1 < ffmpeg5.patch # FFmpeg 5, patch from
berolinux https://github.com/opencv/opencv/issues/21455
}
build() {
Added: ffmpeg5.patch
===
--- ffmpeg5.patch (rev 0)
+++ ffmpeg5.patch 2022-01-25 21:00:29 UTC (rev 435138)
@@ -0,0 +1,466 @@
+diff -up opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp.omv~
opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp
+--- opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp.omv~ 2022-01-16
01:57:43.568982322 +0100
opencv-4.5.5/modules/videoio/src/cap_ffmpeg_impl.hpp 2022-01-17
18:00:14.876283994 +0100
+@@ -88,6 +88,10 @@ extern "C" {
+ #include
+ #include
+
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++#include
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
+@@ -504,6 +508,7 @@ struct CvCapture_FFMPEG
+ AVCodec * avcodec;
+ int video_stream;
+ AVStream* video_st;
++AVCodecContext * video_ccx;
+ AVFrame * picture;
+ AVFrame rgb_picture;
+ int64_t picture_pts;
+@@ -554,6 +559,7 @@ void CvCapture_FFMPEG::init()
+ ic = 0;
+ video_stream = -1;
+ video_st = 0;
++video_ccx = 0;
+ picture = 0;
+ picture_pts = AV_NOPTS_VALUE_;
+ first_frame_number = -1;
+@@ -617,8 +623,13 @@ void CvCapture_FFMPEG::close()
+
+ if( video_st )
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ avcodec_close( video_st->codec );
++#else
++ avcodec_close( video_ccx );
++#endif
+ video_st = NULL;
++ video_ccx = NULL;
+ }
+
+ if( ic )
+@@ -800,6 +811,7 @@ private:
+
+ static ImplMutex _mutex;
+
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ static int LockCallBack(void **mutex, AVLockOp op)
+ {
+ ImplMutex* localMutex = reinterpret_cast(*mutex);
+@@ -830,6 +842,7 @@ static int LockCallBack(void **mutex, AV
+ }
+ return 0;
+ }
++#endif
+
+
+ static void ffmpeg_log_callback(void *ptr, int level, const char *fmt,
va_list vargs)
+@@ -881,15 +894,19 @@ public:
+ {
+ avformat_network_init();
+
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ /* register all codecs, demux and protocols */
+ av_register_all();
+
+ /* register a callback function for synchronization */
+ av_lockmgr_register();
++#endif
+ }
+ ~InternalFFMpegRegister()
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 59
+ av_lockmgr_register(NULL);
++#endif
+ av_log_set_callback(NULL);
+ }
+ };
+@@ -993,6 +1010,9 @@ bool CvCapture_FFMPEG::open(const char*
+ #else
+ av_dict_set(, "rtsp_transport", "tcp", 0);
+ #endif
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++const
++#endif
+ AVInputFormat* input_format = NULL;
+ AVDictionaryEntry* entry = av_dict_get(dict, "input_format", NULL, 0);
+ if (entry != 0)
+@@ -1016,7 +1036,13 @@ bool CvCapture_FFMPEG::open(const char*
+ }
+ for(i = 0; i < ic->nb_streams; i++)
+ {
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++ const AVCodec *streamcodec =
avcodec_find_decoder(ic->streams[i]->codecpar->codec_id);
++ AVCodecContext *enc = avcodec_alloc_context3(streamcodec);
++ avcodec_parameters_to_context(enc, ic->streams[i]->codecpar);
++#else
+ AVCodecContext* enc = ic->streams[i]->codec;
++#endif
+
+ //#ifdef FF_API_THREAD_INIT
+ //avcodec_thread_init(enc, get_number_of_cpus());
+@@ -1064,7
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Saturday, December 25, 2021 @ 17:23:55
Author: arojas
Revision: 433081
Update to 4.5.5
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-12-25 13:38:55 UTC (rev 433080)
+++ PKGBUILD2021-12-25 17:23:55 UTC (rev 433081)
@@ -4,8 +4,8 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
-pkgver=4.5.4
-pkgrel=11
+pkgver=4.5.5
+pkgrel=1
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -21,19 +21,13 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-
opencv-lapack-3.10.patch::https://github.com/opencv/opencv/commit/54c18009.patch
-
fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
vtk9.patch)
-sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
-'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
-'fec670f7d1f7f6a92db9f871d73d736775c6e5875a7d9cd9894b9753d073f9a1'
-'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
+sha256sums=('a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad'
+'a97c2eaecf7a23c6dbd119a609c6d7fae903e5f9ff5f1fe678933e01c67a6c11'
'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
prepare() {
- patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with
LAPACK 3.10
patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
- patch -d opencv_contrib-$pkgver -p1 < fix-cvv-build.patch # Fix build of cvv
module
}
build() {
[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-lapack-3.10.patch)
Date: Wednesday, December 22, 2021 @ 20:34:55
Author: arojas
Revision: 432927
protobuf 3.19 rebuild, disable lto for cuda, use upstream lapack patch
Modified:
opencv/trunk/PKGBUILD
Deleted:
opencv/trunk/opencv-lapack-3.10.patch
--+
PKGBUILD |7 +-
opencv-lapack-3.10.patch | 108 -
2 files changed, 4 insertions(+), 111 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-12-22 19:58:12 UTC (rev 432926)
+++ PKGBUILD2021-12-22 20:34:55 UTC (rev 432927)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=10
+pkgrel=11
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -21,12 +21,12 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-opencv-lapack-3.10.patch
+
opencv-lapack-3.10.patch::https://github.com/opencv/opencv/commit/54c18009.patch
fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
vtk9.patch)
sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
-'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
+'fec670f7d1f7f6a92db9f871d73d736775c6e5875a7d9cd9894b9753d073f9a1'
'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
@@ -69,6 +69,7 @@
cmake -B build -S $pkgname-$pkgver $_opts
cmake --build build
+ CFLAGS="${CFLAGS} -fno-lto" CXXFLAGS="${CXXFLAGS} -fno-lto"
LDFLAGS="${LDFLAGS} -fno-lto" \
cmake -B build-cuda -S $pkgname-$pkgver $_opts \
-DWITH_CUDA=ON \
-DWITH_CUDNN=ON
Deleted: opencv-lapack-3.10.patch
===
--- opencv-lapack-3.10.patch2021-12-22 19:58:12 UTC (rev 432926)
+++ opencv-lapack-3.10.patch2021-12-22 20:34:55 UTC (rev 432927)
@@ -1,108 +0,0 @@
-diff --git a/modules/core/src/hal_internal.cpp
b/modules/core/src/hal_internal.cpp
-index 483281d1f7..05239e98f4 100644
a/modules/core/src/hal_internal.cpp
-+++ b/modules/core/src/hal_internal.cpp
-@@ -163,9 +163,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype*
b, size_t b_step, int n
- if(n == 1 && b_step == sizeof(fptype))
- {
- if(typeid(fptype) == typeid(float))
--sposv_(L, , , (float*)a, , (float*)b, ,
);
-+LAPACK_sposv(L, , , (float*)a, , (float*)b, ,
);
- else if(typeid(fptype) == typeid(double))
--dposv_(L, , , (double*)a, , (double*)b, ,
);
-+LAPACK_dposv(L, , , (double*)a, , (double*)b, ,
);
- }
- else
- {
-@@ -174,9 +174,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype*
b, size_t b_step, int n
- transpose(b, ldb, tmpB, m, m, n);
-
- if(typeid(fptype) == typeid(float))
--sposv_(L, , , (float*)a, , (float*)tmpB, ,
);
-+LAPACK_sposv(L, , , (float*)a, , (float*)tmpB, ,
);
- else if(typeid(fptype) == typeid(double))
--dposv_(L, , , (double*)a, , (double*)tmpB, ,
);
-+LAPACK_dposv(L, , , (double*)a, , (double*)tmpB, ,
);
-
- transpose(tmpB, m, b, ldb, n, m);
- delete[] tmpB;
-@@ -185,9 +185,9 @@ lapack_Cholesky(fptype* a, size_t a_step, int m, fptype*
b, size_t b_step, int n
- else
- {
- if(typeid(fptype) == typeid(float))
--spotrf_(L, , (float*)a, , );
-+LAPACK_spotrf(L, , (float*)a, , );
- else if(typeid(fptype) == typeid(double))
--dpotrf_(L, , (double*)a, , );
-+LAPACK_dpotrf(L, , (double*)a, , );
- }
-
- if(lapackStatus == 0) *info = true;
-@@ -227,17 +227,17 @@ lapack_SVD(fptype* a, size_t a_step, fptype *w, fptype*
u, size_t u_step, fptype
- }
-
- if(typeid(fptype) == typeid(float))
--sgesdd_(mode, , , (float*)a, , (float*)w, (float*)u, ,
(float*)vt, , (float*), , iworkBuf, info);
-+LAPACK_sgesdd(mode, , , (float*)a, , (float*)w, (float*)u,
, (float*)vt, , (float*), , iworkBuf, info);
- else if(typeid(fptype) == typeid(double))
--dgesdd_(mode, , , (double*)a, , (double*)w, (double*)u, ,
(double*)vt, , (double*), , iworkBuf, info);
-+LAPACK_dgesdd(mode, , , (double*)a, , (double*)w, (double*)u,
, (double*)vt, , (double*), , iworkBuf, info);
-
- lwork = (int)round(work1); //optimal buffer size
- fptype* buffer = new fptype[lwork + 1];
-
- if(typeid(fptype) ==
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, December 13, 2021 @ 18:53:57
Author: arojas
Revision: 432415
Add fmt dependency to python-opencv (FS#72739)
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-12-13 18:37:25 UTC (rev 432414)
+++ PKGBUILD2021-12-13 18:53:57 UTC (rev 432415)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=9
+pkgrel=10
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -106,7 +106,7 @@
package_python-opencv() {
pkgdesc='Python bindings for OpenCV'
- depends=(python-numpy opencv vtk glew qt5-base hdf5 jsoncpp openmpi pugixml)
+ depends=(python-numpy opencv vtk glew qt5-base hdf5 jsoncpp openmpi pugixml
fmt)
unset optdepends
DESTDIR="$pkgdir" cmake --install build/modules/python3
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Friday, December 3, 2021 @ 00:50:18 Author: felixonmars Revision: 430562 upgpkg: opencv 4.5.4-9: Python 3.10 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-12-03 00:45:31 UTC (rev 430561) +++ PKGBUILD2021-12-03 00:50:18 UTC (rev 430562) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.4 -pkgrel=8 +pkgrel=9 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Wednesday, December 1, 2021 @ 14:41:18 Author: foutrelis Revision: 430007 upgpkg: opencv 4.5.4-8: Python 3.10 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-12-01 14:12:00 UTC (rev 430006) +++ PKGBUILD2021-12-01 14:41:18 UTC (rev 430007) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.4 -pkgrel=7 +pkgrel=8 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Thursday, November 25, 2021 @ 18:41:27 Author: arojas Revision: 429112 tbb 2021.4 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-11-25 17:50:14 UTC (rev 429111) +++ PKGBUILD2021-11-25 18:41:27 UTC (rev 429112) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv opencv-cuda) pkgver=4.5.4 -pkgrel=6 +pkgrel=7 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Tuesday, November 9, 2021 @ 20:59:50
Author: arojas
Revision: 427787
vtk 9.1 rebuild (FS#72677), use system protobuf
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-11-09 20:54:25 UTC (rev 427786)
+++ PKGBUILD2021-11-09 20:59:50 UTC (rev 427787)
@@ -5,13 +5,13 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=5
+pkgrel=6
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
url='https://opencv.org/'
-depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg)
-makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi cudnn)
+depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg protobuf)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi cudnn fmt)
optdepends=('opencv-samples: samples'
'vtk: for the viz module'
'glew: for the viz module'
@@ -48,6 +48,8 @@
-DBUILD_TESTS=OFF \
-DBUILD_PERF_TESTS=OFF \
-DBUILD_EXAMPLES=ON \
+ -DBUILD_PROTOBUF=OFF \
+ -DPROTOBUF_UPDATE_FILES=ON \
-DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Friday, October 29, 2021 @ 20:38:38
Author: arojas
Revision: 426801
Add new vtk dependencies to python-opencv (FS#72573)
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-29 17:50:26 UTC (rev 426800)
+++ PKGBUILD2021-10-29 20:38:38 UTC (rev 426801)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=4
+pkgrel=5
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -104,7 +104,7 @@
package_python-opencv() {
pkgdesc='Python bindings for OpenCV'
- depends=(python-numpy opencv vtk glew qt5-base hdf5)
+ depends=(python-numpy opencv vtk glew qt5-base hdf5 jsoncpp openmpi pugixml)
unset optdepends
DESTDIR="$pkgdir" cmake --install build/modules/python3
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Thursday, October 28, 2021 @ 14:59:28
Author: arojas
Revision: 426775
Fix versioned dependencies (FS#72569)
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-28 14:04:22 UTC (rev 426774)
+++ PKGBUILD2021-10-28 14:59:28 UTC (rev 426775)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=3
+pkgrel=4
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -91,8 +91,8 @@
}
package_opencv-samples() {
- pkgdesc+=" (samples)"
- depends=("opencv=$pkgver")
+ pkgdesc+=' (samples)'
+ depends=(opencv)
unset optdepends
mkdir -p "$pkgdir"/usr/share/opencv4
@@ -103,7 +103,7 @@
}
package_python-opencv() {
- pkgdesc="Python bindings for OpenCV"
+ pkgdesc='Python bindings for OpenCV'
depends=(python-numpy opencv vtk glew qt5-base hdf5)
unset optdepends
@@ -114,10 +114,10 @@
}
package_opencv-cuda() {
- pkgdesc+=" (with CUDA support)"
+ pkgdesc+=' (with CUDA support)'
depends+=(cudnn)
conflicts=(opencv)
- provides=(opencv)
+ provides=(opencv=$pkgver)
DESTDIR="$pkgdir" cmake --install build-cuda
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Friday, October 22, 2021 @ 16:59:50
Author: arojas
Revision: 426435
Add CUDA support (FS#72512)
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD | 86 +++--
1 file changed, 56 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-22 13:25:50 UTC (rev 426434)
+++ PKGBUILD2021-10-22 16:59:50 UTC (rev 426435)
@@ -3,15 +3,15 @@
# Contributor: Tobias Powalowski
pkgbase=opencv
-pkgname=(opencv opencv-samples python-opencv)
+pkgname=(opencv opencv-samples python-opencv opencv-cuda)
pkgver=4.5.4
-pkgrel=2
+pkgrel=3
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
url='https://opencv.org/'
depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg)
-makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi cudnn)
optdepends=('opencv-samples: samples'
'vtk: for the viz module'
'glew: for the viz module'
@@ -39,34 +39,38 @@
build() {
export JAVA_HOME="/usr/lib/jvm/default"
# cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to
specify them manually
- _pythonpath=`python -c "from sysconfig import get_path;
print(get_path('platlib'))"`
- cmake -B build -S $pkgname-$pkgver \
--DWITH_OPENCL=ON \
--DWITH_OPENGL=ON \
--DWITH_TBB=ON \
--DWITH_VULKAN=ON \
--DWITH_QT=ON \
--DBUILD_WITH_DEBUG_INFO=OFF \
--DBUILD_TESTS=OFF \
--DBUILD_PERF_TESTS=OFF \
--DBUILD_EXAMPLES=ON \
--DINSTALL_C_EXAMPLES=ON \
--DINSTALL_PYTHON_EXAMPLES=ON \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCPU_BASELINE_DISABLE=SSE3 \
--DCPU_BASELINE_REQUIRE=SSE2 \
--DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
--DOPENCV_SKIP_PYTHON_LOADER=ON \
--DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
-
-DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so"
\
--DLAPACK_CBLAS_H="/usr/include/cblas.h" \
--DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
--DOPENCV_GENERATE_PKGCONFIG=ON \
--DOPENCV_ENABLE_NONFREE=ON \
--DOPENCV_JNI_INSTALL_PATH=lib \
--DOPENCV_GENERATE_SETUPVARS=OFF \
--DEIGEN_INCLUDE_PATH=/usr/include/eigen3
+ _opts="-DWITH_OPENCL=ON \
+ -DWITH_OPENGL=ON \
+ -DWITH_TBB=ON \
+ -DWITH_VULKAN=ON \
+ -DWITH_QT=ON \
+ -DBUILD_WITH_DEBUG_INFO=OFF \
+ -DBUILD_TESTS=OFF \
+ -DBUILD_PERF_TESTS=OFF \
+ -DBUILD_EXAMPLES=ON \
+ -DINSTALL_C_EXAMPLES=ON \
+ -DINSTALL_PYTHON_EXAMPLES=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCPU_BASELINE_DISABLE=SSE3 \
+ -DCPU_BASELINE_REQUIRE=SSE2 \
+ -DOPENCV_EXTRA_MODULES_PATH=$srcdir/opencv_contrib-$pkgver/modules \
+ -DOPENCV_SKIP_PYTHON_LOADER=ON \
+
-DLAPACK_LIBRARIES=/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so
\
+ -DLAPACK_CBLAS_H=/usr/include/cblas.h \
+ -DLAPACK_LAPACKE_H=/usr/include/lapacke.h \
+ -DOPENCV_GENERATE_PKGCONFIG=ON \
+ -DOPENCV_ENABLE_NONFREE=ON \
+ -DOPENCV_JNI_INSTALL_PATH=lib \
+ -DOPENCV_GENERATE_SETUPVARS=OFF \
+ -DEIGEN_INCLUDE_PATH=/usr/include/eigen3"
+
+ cmake -B build -S $pkgname-$pkgver $_opts
cmake --build build
+
+ cmake -B build-cuda -S $pkgname-$pkgver $_opts \
+-DWITH_CUDA=ON \
+-DWITH_CUDNN=ON
+ cmake --build build-cuda
}
package_opencv() {
@@ -108,3 +112,25 @@
# install license file
install -Dm644 $pkgbase-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
}
+
+package_opencv-cuda() {
+ pkgdesc+=" (with CUDA support)"
+ depends+=(cudnn)
+ conflicts=(opencv)
+ provides=(opencv)
+
+ DESTDIR="$pkgdir" cmake --install build-cuda
+
+ # install license file
+ install -Dm644 $pkgbase-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
+
+ # Split samples
+ rm -r "$pkgdir"/usr/share/opencv4/samples
+
+ # Add java symlinks expected by some binary blobs
+ ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
+ ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
+
+ # Split Python bindings
+ rm -r "$pkgdir"/usr/lib/python3*
+}
[arch-commits] Commit in opencv/trunk (PKGBUILD vtk9.patch)
Date: Tuesday, October 19, 2021 @ 22:00:50
Author: arojas
Revision: 426298
vtk 9 rebuild
Added:
opencv/trunk/vtk9.patch
Modified:
opencv/trunk/PKGBUILD
+
PKGBUILD | 11 +++
vtk9.patch | 36
2 files changed, 43 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-19 18:57:27 UTC (rev 426297)
+++ PKGBUILD2021-10-19 22:00:50 UTC (rev 426298)
@@ -5,13 +5,13 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv)
pkgver=4.5.4
-pkgrel=1
+pkgrel=2
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
url='https://opencv.org/'
depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg)
-makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment pugixml openmpi)
optdepends=('opencv-samples: samples'
'vtk: for the viz module'
'glew: for the viz module'
@@ -22,14 +22,17 @@
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
opencv-lapack-3.10.patch
-
fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch)
+
fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
+vtk9.patch)
sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
-'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369')
+'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
+'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e')
prepare() {
patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with
LAPACK 3.10
+ patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
patch -d opencv_contrib-$pkgver -p1 < fix-cvv-build.patch # Fix build of cvv
module
}
Added: vtk9.patch
===
--- vtk9.patch (rev 0)
+++ vtk9.patch 2021-10-19 22:00:50 UTC (rev 426298)
@@ -0,0 +1,36 @@
+diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
+index 312fd41fe4..aeda80d47c 100644
+--- a/cmake/OpenCVDetectVTK.cmake
b/cmake/OpenCVDetectVTK.cmake
+@@ -1,8 +1,5 @@
+ if(NOT VTK_FOUND)
+- find_package(VTK QUIET NAMES vtk VTK)
+- if(VTK_FOUND)
+-if(NOT (VTK_VERSION VERSION_LESS "9.0.0") AND (VTK_VERSION VERSION_LESS
"10.0.0")) # VTK 9.x
+- find_package(VTK 9 QUIET NAMES vtk COMPONENTS
++ find_package(VTK 9 QUIET NAMES vtk COMPONENTS
+ FiltersExtraction
+ FiltersSources
+ FiltersTexture
+@@ -14,21 +11,6 @@ if(NOT VTK_FOUND)
+ RenderingLOD
+ RenderingOpenGL2
+ NO_MODULE)
+-elseif(VTK_VERSION VERSION_GREATER "5") # VTK 6.x components
+- find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD
vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
+- IF(VTK_FOUND)
+-IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is
exported as a var.
+- find_package(VTK QUIET COMPONENTS
vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD
vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry
NO_MODULE)
+-ELSE(VTK_RENDERING_BACKEND)
+- find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL
vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture
vtkRenderingFreeType vtkIOExport NO_MODULE)
+-ENDIF(VTK_RENDERING_BACKEND)
+- ENDIF(VTK_FOUND)
+-elseif(VTK_VERSION VERSION_EQUAL "5") # VTK 5.x components
+- find_package(VTK QUIET COMPONENTS vtkCommon NO_MODULE)
+-else()
+- set(VTK_FOUND FALSE)
+-endif()
+- endif()
+ endif()
+
+ if(NOT VTK_FOUND)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, October 18, 2021 @ 13:55:55
Author: arojas
Revision: 426201
sed to patch
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-18 12:15:49 UTC (rev 426200)
+++ PKGBUILD2021-10-18 13:55:55 UTC (rev 426201)
@@ -21,14 +21,16 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-opencv-lapack-3.10.patch)
+opencv-lapack-3.10.patch
+
fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch)
sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
-'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199')
+'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
+'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369')
prepare() {
patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with
LAPACK 3.10
- sed -e 's|HAVE_QT5|HAVE_QT|' -i
opencv_contrib-$pkgver/modules/cvv/CMakeLists.txt # Fix build of cvv module
+ patch -d opencv_contrib-$pkgver -p1 < fix-cvv-build.patch # Fix build of cvv
module
}
build() {
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Sunday, October 10, 2021 @ 09:40:55
Author: arojas
Revision: 425644
Update to 4.5.4
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-10-10 09:26:38 UTC (rev 425643)
+++ PKGBUILD2021-10-10 09:40:55 UTC (rev 425644)
@@ -4,8 +4,8 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv)
-pkgver=4.5.3
-pkgrel=5
+pkgver=4.5.4
+pkgrel=1
pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
@@ -22,12 +22,13 @@
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
opencv-lapack-3.10.patch)
-sha256sums=('77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab'
-'73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc'
+sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
+'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199')
prepare() {
patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with
LAPACK 3.10
+ sed -e 's|HAVE_QT5|HAVE_QT|' -i
opencv_contrib-$pkgver/modules/cvv/CMakeLists.txt # Fix build of cvv module
}
build() {
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, August 2, 2021 @ 21:27:33 Author: arojas Revision: 421080 hdf5 1.12.1 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-08-02 21:18:41 UTC (rev 421079) +++ PKGBUILD2021-08-02 21:27:33 UTC (rev 421080) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv) pkgver=4.5.3 -pkgrel=4 +pkgrel=5 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, August 2, 2021 @ 21:17:48 Author: arojas Revision: 421078 openexr 3.1.0 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-08-02 20:14:31 UTC (rev 421077) +++ PKGBUILD2021-08-02 21:17:48 UTC (rev 421078) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv) pkgver=4.5.3 -pkgrel=3 +pkgrel=4 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Monday, July 19, 2021 @ 06:28:03 Author: arojas Revision: 420117 hdf5 1.12.1 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-07-19 06:19:46 UTC (rev 420116) +++ PKGBUILD2021-07-19 06:28:03 UTC (rev 420117) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv) pkgver=4.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Wednesday, July 14, 2021 @ 14:35:52 Author: arojas Revision: 419727 imath 3.1 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-07-14 12:33:47 UTC (rev 419726) +++ PKGBUILD2021-07-14 14:35:52 UTC (rev 419727) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv) pkgver=4.5.3 -pkgrel=1 +pkgrel=2 pkgdesc='Open Source Computer Vision Library' arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-openexr3.patch)
Date: Tuesday, July 6, 2021 @ 06:31:40
Author: arojas
Revision: 418958
Update to 4.5.3
Modified:
opencv/trunk/PKGBUILD
Deleted:
opencv/trunk/opencv-openexr3.patch
---+
PKGBUILD | 19 ---
opencv-openexr3.patch | 31 ---
2 files changed, 8 insertions(+), 42 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-07-05 20:40:29 UTC (rev 418957)
+++ PKGBUILD2021-07-06 06:31:40 UTC (rev 418958)
@@ -4,12 +4,12 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv)
-pkgver=4.5.2
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
+pkgver=4.5.3
+pkgrel=1
+pkgdesc='Open Source Computer Vision Library'
arch=(x86_64)
license=(BSD)
-url="https://opencv.org/;
+url='https://opencv.org/'
depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2
openjpeg2 ffmpeg)
makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment)
optdepends=('opencv-samples: samples'
@@ -21,16 +21,13 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-opencv-lapack-3.10.patch
-opencv-openexr3.patch)
-sha256sums=('ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8'
-'9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a'
-'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
-'dcddc1dd30139ac3ace668e0d530798c5691dfd2ad1e5e717db6010d659229ba')
+opencv-lapack-3.10.patch)
+sha256sums=('77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab'
+'73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc'
+'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199')
prepare() {
patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with
LAPACK 3.10
- patch -d $pkgname-$pkgver -p1 < opencv-openexr3.patch # Fix build with
OpenEXR 3
}
build() {
Deleted: opencv-openexr3.patch
===
--- opencv-openexr3.patch 2021-07-05 20:40:29 UTC (rev 418957)
+++ opencv-openexr3.patch 2021-07-06 06:31:40 UTC (rev 418958)
@@ -1,31 +0,0 @@
-diff --git a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake
-index ef633e853a..133468243a 100644
a/cmake/OpenCVFindOpenEXR.cmake
-+++ b/cmake/OpenCVFindOpenEXR.cmake
-@@ -9,6 +9,14 @@
- # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
- #
-
-+find_package(OpenEXR 3.0 CONFIG QUIET)
-+if(TARGET OpenEXR::OpenEXR)
-+SET(OPENEXR_FOUND TRUE)
-+SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+SET(OPENEXR_VERSION ${OpenEXR_VERSION})
-+return()
-+endif()
-+
- SET(OPENEXR_LIBRARIES "")
- SET(OPENEXR_LIBSEARCH_SUFFIXES "")
- file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
-diff --git a/modules/imgcodecs/src/grfmt_exr.cpp
b/modules/imgcodecs/src/grfmt_exr.cpp
-index 9242871f8d..aaf28eead6 100644
a/modules/imgcodecs/src/grfmt_exr.cpp
-+++ b/modules/imgcodecs/src/grfmt_exr.cpp
-@@ -56,6 +56,7 @@
- #include
- #include
-
-+#include
- #include
- #include
- #include
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Tuesday, May 18, 2021 @ 07:49:00 Author: felixonmars Revision: 415653 upgpkg: opencv 4.5.2-4: imath/openexr 3.0.2 rebuild Modified: opencv/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-05-18 07:40:41 UTC (rev 415652) +++ PKGBUILD2021-05-18 07:49:00 UTC (rev 415653) @@ -5,7 +5,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv) pkgver=4.5.2 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Computer Vision Library" arch=(x86_64) license=(BSD)
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Friday, April 30, 2021 @ 07:16:47
Author: arojas
Revision: 414074
Update checksum (tarball content is identical) FS#70653
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-04-30 07:16:39 UTC (rev 414073)
+++ PKGBUILD2021-04-30 07:16:47 UTC (rev 414074)
@@ -23,7 +23,7 @@
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
opencv-lapack-3.9.1.patch
opencv-openexr3.patch)
-sha256sums=('be976b9ef14f1deaa282fb6e30d75aa8016a2d5c1f08e85795c235148940d753'
+sha256sums=('ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8'
'9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a'
'5233d9b4b8e3f4600e3f4ebef2b0ad5621faf25efbdfee96ee720a83cc81d0cc'
'dcddc1dd30139ac3ace668e0d530798c5691dfd2ad1e5e717db6010d659229ba')
[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-openexr3.patch)
Date: Saturday, April 24, 2021 @ 10:10:48
Author: arojas
Revision: 413822
openexr 3.0 rebuild
Added:
opencv/trunk/opencv-openexr3.patch
Modified:
opencv/trunk/PKGBUILD
---+
PKGBUILD |9 ++---
opencv-openexr3.patch | 31 +++
2 files changed, 37 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-04-24 09:56:22 UTC (rev 413821)
+++ PKGBUILD2021-04-24 10:10:48 UTC (rev 413822)
@@ -5,7 +5,7 @@
pkgbase=opencv
pkgname=(opencv opencv-samples python-opencv)
pkgver=4.5.2
-pkgrel=2
+pkgrel=3
pkgdesc="Open Source Computer Vision Library"
arch=(x86_64)
license=(BSD)
@@ -21,13 +21,16 @@
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
-opencv-lapack-3.9.1.patch)
+opencv-lapack-3.9.1.patch
+opencv-openexr3.patch)
sha256sums=('be976b9ef14f1deaa282fb6e30d75aa8016a2d5c1f08e85795c235148940d753'
'9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a'
-'5233d9b4b8e3f4600e3f4ebef2b0ad5621faf25efbdfee96ee720a83cc81d0cc')
+'5233d9b4b8e3f4600e3f4ebef2b0ad5621faf25efbdfee96ee720a83cc81d0cc'
+'dcddc1dd30139ac3ace668e0d530798c5691dfd2ad1e5e717db6010d659229ba')
prepare() {
patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.9.1.patch # Fix build with
LAPACK 3.9.1
+ patch -d $pkgname-$pkgver -p1 < opencv-openexr3.patch # Fix build with
OpenEXR 3
}
build() {
Added: opencv-openexr3.patch
===
--- opencv-openexr3.patch (rev 0)
+++ opencv-openexr3.patch 2021-04-24 10:10:48 UTC (rev 413822)
@@ -0,0 +1,31 @@
+diff --git a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake
+index ef633e853a..133468243a 100644
+--- a/cmake/OpenCVFindOpenEXR.cmake
b/cmake/OpenCVFindOpenEXR.cmake
+@@ -9,6 +9,14 @@
+ # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+ #
+
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++SET(OPENEXR_FOUND TRUE)
++SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++SET(OPENEXR_VERSION ${OpenEXR_VERSION})
++return()
++endif()
++
+ SET(OPENEXR_LIBRARIES "")
+ SET(OPENEXR_LIBSEARCH_SUFFIXES "")
+ file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
+diff --git a/modules/imgcodecs/src/grfmt_exr.cpp
b/modules/imgcodecs/src/grfmt_exr.cpp
+index 9242871f8d..aaf28eead6 100644
+--- a/modules/imgcodecs/src/grfmt_exr.cpp
b/modules/imgcodecs/src/grfmt_exr.cpp
+@@ -56,6 +56,7 @@
+ #include
+ #include
+
++#include
+ #include
+ #include
+ #include
[arch-commits] Commit in opencv/trunk (PKGBUILD)
Date: Sunday, April 4, 2021 @ 18:14:19
Author: arojas
Revision: 411495
Split python bindings, since they require many additional dependencies
Modified:
opencv/trunk/PKGBUILD
--+
PKGBUILD | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-04-04 17:18:03 UTC (rev 411494)
+++ PKGBUILD2021-04-04 18:14:19 UTC (rev 411495)
@@ -3,9 +3,9 @@
# Contributor: Tobias Powalowski
pkgbase=opencv
-pkgname=(opencv opencv-samples)
+pkgname=(opencv opencv-samples python-opencv)
pkgver=4.5.2
-pkgrel=1
+pkgrel=2
pkgdesc="Open Source Computer Vision Library"
arch=(x86_64)
license=(BSD)
@@ -14,10 +14,10 @@
makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke
qt5-base vtk glew ant java-environment)
optdepends=('opencv-samples: samples'
'vtk: for the viz module'
-'qt5-base: for the HighGUI module and the Python bindings'
-'hdf5: for the HDF5 module and the Python bindings'
+'glew: for the viz module'
+'qt5-base: for the HighGUI module'
+'hdf5: for the HDF5 module'
'opencl-icd-loader: For coding with OpenCL'
-'python-numpy: Python bindings'
'java-runtime: Java interface')
source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
@@ -67,7 +67,7 @@
DESTDIR="$pkgdir" cmake --install build
# install license file
- install -Dm644 $pkgname-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
+ install -Dm644 $pkgbase-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
# separate samples package
mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
@@ -75,6 +75,9 @@
# Add java symlinks expected by some binary blobs
ln -sr "$pkgdir"/usr/share/java/{opencv4/opencv-${pkgver//./},opencv}.jar
ln -sr "$pkgdir"/usr/lib/{libopencv_java${pkgver//./},libopencv_java}.so
+
+ # Split Python bindings
+ rm -r "$pkgdir"/usr/lib/python3*
}
package_opencv-samples() {
@@ -86,5 +89,16 @@
mv samples "$pkgdir"/usr/share/opencv4
# install license file
- install -Dm644 opencv-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
+ install -Dm644 $pkgbase-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
}
+
+package_python-opencv() {
+ pkgdesc="Python bindings for OpenCV"
+ depends=(python-numpy opencv vtk glew qt5-base hdf5)
+ unset optdepends
+
+ DESTDIR="$pkgdir" cmake --install build/modules/python3
+
+ # install license file
+ install -Dm644 $pkgbase-$pkgver/LICENSE -t
"$pkgdir"/usr/share/licenses/$pkgname
+}
[arch-commits] Commit in opencv/trunk (PKGBUILD opencv-lapack-3.9.1.patch)
Date: Saturday, April 3, 2021 @ 19:29:33
Author: arojas
Revision: 411472
Update to 4.5.2
Added:
opencv/trunk/opencv-lapack-3.9.1.patch
Modified:
opencv/trunk/PKGBUILD
---+
PKGBUILD | 19 +--
opencv-lapack-3.9.1.patch | 40
2 files changed, 53 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2021-04-03 18:26:16 UTC (rev 411471)
+++ PKGBUILD2021-04-03 19:29:33 UTC (rev 411472)
@@ -1,9 +1,10 @@
-# Maintainer: Ray Rashif
+# Maintainer: Antonio Rojas
+# Contributor: Ray Rashif
# Contributor: Tobias Powalowski
pkgbase=opencv
pkgname=(opencv opencv-samples)
-pkgver=4.5.1
+pkgver=4.5.2
pkgrel=1
pkgdesc="Open Source Computer Vision Library"
arch=(x86_64)
@@ -18,11 +19,17 @@
'opencl-icd-loader: For coding with OpenCL'
'python-numpy: Python bindings'
'java-runtime: Java interface')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip;
-
"opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz;)
-sha256sums=('5fbc26ee09e148a4d494b225d04217f7c913ca1a4d46115b70cca3565d7bbe05'
-'12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5')
+source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
+
https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
+opencv-lapack-3.9.1.patch)
+sha256sums=('be976b9ef14f1deaa282fb6e30d75aa8016a2d5c1f08e85795c235148940d753'
+'9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a'
+'5233d9b4b8e3f4600e3f4ebef2b0ad5621faf25efbdfee96ee720a83cc81d0cc')
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.9.1.patch # Fix build with
LAPACK 3.9.1
+}
+
build() {
export JAVA_HOME="/usr/lib/jvm/default"
# cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to
specify them manually
Added: opencv-lapack-3.9.1.patch
===
--- opencv-lapack-3.9.1.patch (rev 0)
+++ opencv-lapack-3.9.1.patch 2021-04-03 19:29:33 UTC (rev 411472)
@@ -0,0 +1,40 @@
+diff --git a/modules/core/src/hal_internal.cpp
b/modules/core/src/hal_internal.cpp
+index 483281d1f7..6db47f22d8 100644
+--- a/modules/core/src/hal_internal.cpp
b/modules/core/src/hal_internal.cpp
+@@ -290,7 +290,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k,
fptype* b, size_t b_ste
+ if (typeid(fptype) == typeid(float))
+ sgels_(mode, , , , (float*)tmpA, , (float*)b,
, (float*), , info);
+ else if (typeid(fptype) == typeid(double))
+-dgels_(mode, , , , (double*)tmpA, , (double*)b,
, (double*), , info);
++LAPACK_dgels(mode, , , , (double*)tmpA, ,
(double*)b, , (double*), , info);
+
+ lwork = cvRound(work1); //optimal buffer size
+ std::vector workBufMemHolder(lwork + 1);
+@@ -299,7 +299,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k,
fptype* b, size_t b_ste
+ if (typeid(fptype) == typeid(float))
+ sgels_(mode, , , , (float*)tmpA, , (float*)b,
, (float*)buffer, , info);
+ else if (typeid(fptype) == typeid(double))
+-dgels_(mode, , , , (double*)tmpA, , (double*)b,
, (double*)buffer, , info);
++LAPACK_dgels(mode, , , , (double*)tmpA, ,
(double*)b, , (double*)buffer, , info);
+ }
+ else
+ {
+@@ -311,7 +311,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k,
fptype* b, size_t b_ste
+ if (typeid(fptype) == typeid(float))
+ sgels_(mode, , , , (float*)tmpA, , (float*)tmpB,
, (float*), , info);
+ else if (typeid(fptype) == typeid(double))
+-dgels_(mode, , , , (double*)tmpA, ,
(double*)tmpB, , (double*), , info);
++LAPACK_dgels(mode, , , , (double*)tmpA, ,
(double*)tmpB, , (double*), , info);
+
+ lwork = cvRound(work1); //optimal buffer size
+ std::vector workBufMemHolder(lwork + 1);
+@@ -320,7 +320,7 @@ lapack_QR(fptype* a, size_t a_step, int m, int n, int k,
fptype* b, size_t b_ste
+ if (typeid(fptype) == typeid(float))
+ sgels_(mode, , , , (float*)tmpA, , (float*)tmpB,
, (float*)buffer, , info);
+ else if (typeid(fptype) == typeid(double))
+-dgels_(mode, , , , (double*)tmpA, ,
(double*)tmpB, , (double*)buffer, , info);
++LAPACK_dgels(mode, , , , (double*)tmpA, ,
(double*)tmpB, , (double*)buffer, , info);
+
+ transpose(tmpB, m, b, ldb, k, m);
+ }
