Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(4.x) Merge 3.4 #21317

Merged
merged 11 commits into from
Dec 22, 2021
Merged

(4.x) Merge 3.4 #21317

merged 11 commits into from
Dec 22, 2021

Conversation

alalek
Copy link
Member

@alalek alalek commented Dec 22, 2021 •
edited
Loading

#21114 from dwardor:patch-1
#21295 from alalek:update_ffmpeg_3.4
#21297 from rogday:div_fix
#21302 from alalek:issue_21299_3.4
#21313 from alalek:fix_links_3.4

Previous "Merge 3.4": #21288

buildworker:Win64 OpenCL=windows-2
Xbuildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=powerpc64le
Xbuild_image:Custom=ubuntu-openvino-2019r3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.4.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2021.1.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.2.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.3.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.1:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.2:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=ubuntu-vulkan:16.04
Xbuildworker:Custom=linux-4
Xbuild_image:Custom=fedora:28
Xbuild_image:Custom=ubuntu-cuda:16.04
Xbuild_image:Custom=ubuntu-clang:18.04
Xbuild_image:Custom=ubuntu:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=mips64el

Xbuild_image:Custom Mac=openvino-2019r3.0
Xbuild_image:Custom Mac=openvino-2020.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
Xbuild_image:Custom Mac=openvino-2021.2.0
Xbuild_image:Custom Mac=openvino-2021.3.0
Xbuild_image:Custom Mac=openvino-2021.4.0
Xbuild_image:Custom Mac=openvino-2021.4.1
build_image:Custom Mac=openvino-2021.4.2
test_modules:Custom Mac=dnn,gapi,python2,python3,java

Xbuild_image:Custom Win=openvino-2019r3.0
Xbuild_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
Xbuild_image:Custom Win=openvino-2021.2.0
Xbuild_image:Custom Win=openvino-2021.3.0
Xbuild_image:Custom Win=openvino-2021.4.0
Xbuild_image:Custom Win=openvino-2021.4.1
build_image:Custom Win=openvino-2021.4.2
buildworker:Custom Win=windows-3
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules:Custom Win=dnn,gapi,python2,python3,java
test_opencl:Custom Win=ON
build_contrib:Custom Win=OFF
Xbuild_image:Custom Win=msvs2017
Xbuild_image:Custom Win=msvs2019

alalek and others added 11 commits December 20, 2021 15:03
@alalek
videoio: fix ffmpeg standalone build
a22dd28
@alalek
ffmpeg/3.4: update FFmpeg wrapper 2021.12
8fa86d4 
- FFmpeg 3.4.9
@rogday
fix const/x in Div
0a178a6
@alalek
Merge pull request opencv#21295 from alalek:update_ffmpeg_3.4
b9d9730
@alalek
highgui: fix Win32 with OPENGL=ON
3e01a38
@alalek
Merge pull request opencv#21297 from rogday:div_fix
947d610
@alalek
Merge pull request opencv#21302 from alalek:issue_21299_3.4
6e733b6
@dwardor
Merge pull request opencv#21114 from dwardor:patch-1
54c1800 
* Fix compile against lapack-3.10.0

Fix compilation against lapack >= 3.9.1 and 3.10.0 while not breaking older versions

OpenCVFindLAPACK.cmake & CMakeLists.txt: determine OPENCV_USE_LAPACK_PREFIX from LAPACK_VERSION

hal_internal.cpp : Only apply LAPACK_FUNC to functions whose number of inputs depends on LAPACK_FORTRAN_STR_LEN in lapack >= 3.9.1

lapack_check.cpp : remove LAPACK_FUNC which is not OK as function are not used with input parameters (so lapack.h preprocessing of "LAPACK_xxxx(...)" is not applicable with lapack >= 3.9.1
If not removed lapack_check fails so LAPACK is deactivated in build (not want we want)

use OCV_ prefix and don't use Global, instead generate OCV_LAPACK_FUNC depending on CMake Conditions

Remove CONFIG from find_package(LAPACK) and use LAPACK_GLOBAL and LAPACK_NAME to figure out if using netlib's reference LAPACK implementation and how to #define OCV_LAPACK_FUNC(f)

* Fix typos and grammar in comments
@alalek
fix 3.4 links
b1a57c4
@alalek
Merge pull request opencv#21313 from alalek:fix_links_3.4
19ac542
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
9777fba
This was referenced Dec 22, 2021
Merged
Merged
@alalek
Copy link
Member Author

alalek commented Dec 22, 2021

👍

@alalek alalek merged commit 9777fba into opencv:4.x Dec 22, 2021
@alalek alalek mentioned this pull request Dec 24, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alalek alalek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alalek @rogday @dwardor