Skip to content

5.x merge 4.x #1231

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

Open
asmorkalov wants to merge 71 commits into
base: 5.x
Choose a base branch
from
Open

5.x merge 4.x #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
f957779
fix
ArtificialZeng Aug 11, 2024
d23e796
Update pyproject.toml
SaikWolf Dec 12, 2024
6b45caa
Merge pull request #1017 from ArtificialZeng:patch-1
asmorkalov Dec 24, 2024
ae90ee7
Submodules update to 4.11.0-pre
asmorkalov Dec 24, 2024
43c1105
Merge pull request #1065 from asmorkalov:pre_4.11
asmorkalov Dec 31, 2024
ef9443d
fix: add CMake as a build requirement only if required
mayeut Sep 21, 2024
02648ce
Fix Python Source RelPath for PY_LIMITED_API=OFF
zhanwenchen Jun 14, 2024
5da0b6e
Add NASM assembler to Windows build for jpeg-turbo.
asmorkalov Jan 13, 2025
4a0d4ce
Merge pull request #1073 from asmorkalov:as/nasm_windows
asmorkalov Jan 13, 2025
9def6a5
Merge pull request #1000 from zhanwenchen:patch-1
asmorkalov Jan 13, 2025
cee4e80
Merge pull request #1061 from SaikWolf:4.x
asmorkalov Jan 15, 2025
e4618a3
Merge pull request #1031 from mayeut:system-cmake
asmorkalov Jan 15, 2025
58257dc
Switched to tag 4.11.0
asmorkalov Jan 9, 2025
764c325
Merge pull request #1071 from asmorkalov:as/opencv_4.11_tags
asmorkalov Jan 15, 2025
ca68df5
Python 3.13 support.
asmorkalov Jan 15, 2025
26c8b4e
Merge pull request #1074 from asmorkalov:as/python3.13
asmorkalov Jan 15, 2025
2817208
Reverted back to Github actions checkout as self-made command does no…
asmorkalov Jan 16, 2025
255564a
Merge pull request #1076 from asmorkalov:as/github_checkout_again
asmorkalov Jan 16, 2025
fc127ae
Update README.md
AS1100K Apr 20, 2025
2606a60
Merge pull request #1100 from avdivan:4.x
avdivan May 19, 2025
6140e85
setup.py: support patched sources, allow custom package name
alalek Jun 13, 2025
dccecfa
Linux and Mac builds update (#1106)
asmorkalov Jun 13, 2025
b4e126b
Added libavif to the build environment (#1098)
asmorkalov Jun 16, 2025
d432bd4
Install libavif and deps on MacOS.
asmorkalov Jun 16, 2025
a9a35c8
Merge pull request #1109 from asmorkalov:as/macos_avif
asmorkalov Jun 16, 2025
e576ad4
Merge pull request #1108 from opencv-pushbot:gitee/alalek/support_cus…
asmorkalov Jun 16, 2025
416ec8b
OpenCV submodules update.
asmorkalov Jun 18, 2025
dc91b59
Merge pull request #1111 from asmorkalov/as/opencv_update
asmorkalov Jun 20, 2025
d2b8df1
Merge pull request #1095 from as1100k-forks/fix-missing-python-suppor…
asmorkalov Jun 22, 2025
fa50138
BLAS search fix on Linux after chanages in main OpenCV.
asmorkalov Jun 30, 2025
ef4ca3f
Merge pull request #1113 from asmorkalov:as/linux_blas_fix
asmorkalov Jul 1, 2025
b5f684c
Updated OpenCV to release 4.12.0.
asmorkalov Jul 3, 2025
957adcf
Updated Windows build environment to 2025. 2019 - retired.
asmorkalov Jul 3, 2025
8d6746c
Merge pull request #1115 from asmorkalov:as/opencv_4.12.0
asmorkalov Jul 3, 2025
9cd2513
Merge pull request #1117 from asmorkalov:as/windows_env_update
asmorkalov Jul 4, 2025
7a9ed05
Updated numpy dependencies.
asmorkalov Jul 4, 2025
fa742a4
Merge pull request #1119 from asmorkalov:as/numpy_dependency
asmorkalov Jul 4, 2025
609ff9b
Disabled Orbbec backend on Windows in headless configuration as it us…
asmorkalov Jul 8, 2025
e42c4e9
Merge pull request #1123 from asmorkalov:as/no_msmf_win_headless
asmorkalov Jul 8, 2025
dd81860
Update build_wheels_linux.yml
avdivan Jul 10, 2025
a88d65f
Merge pull request #1127 from avdivan:4.x
asmorkalov Jul 16, 2025
031af3c
Update build_wheels_linux.yml
avdivan Jul 28, 2025
4924e6b
Merge pull request #1131 from avdivan:4.x
asmorkalov Jul 30, 2025
3ec7ac6
Create Dockerfile_x86_64
avdivan Jul 31, 2025
7bd1825
allow numpy>2
braingram Sep 11, 2025
18249e5
New manylinux_2_28 based invironment (#1148)
asmorkalov Dec 8, 2025
0795a08
manylinux_2_28 pipelines
avdivan Dec 10, 2025
55f1129
Update OpenCV to current 4.x branch. (#1161)
asmorkalov Dec 10, 2025
47c1307
Merge pull request #1133 from avdivan/4.x
asmorkalov Dec 11, 2025
2ff0bf8
Added Musllinux environment for ARM.
asmorkalov Dec 11, 2025
cb22e27
Removed duplicated ARM builds.
asmorkalov Dec 11, 2025
5e9cb9b
Merge pull request #1162 from asmorkalov/as/cleanup_linux_ci
asmorkalov Dec 11, 2025
81b4c07
Merge pull request #1142 from braingram/unpin_numpy
asmorkalov Dec 11, 2025
5dd66a1
Update submodules to release 4.13.0
asmorkalov Jan 1, 2026
a31042f
Merge pull request #1171 from asmorkalov:as/submodules_4.13.0
asmorkalov Jan 2, 2026
c6101c4
Cherry-pick Numpy 2.4.x types fix.
asmorkalov Jan 6, 2026
d098302
Dependencies update for 4.13.0 release.
asmorkalov Jan 2, 2026
1a2d0f6
Merge pull request #1175 from asmorkalov:as/numpy24_types
asmorkalov Jan 6, 2026
a7ca41e
Merge pull request #1173 from asmorkalov:as/dependencies_update_4.13.0
asmorkalov Jan 7, 2026
66e3128
Switched MacOS Intel builds to own host.
asmorkalov Jan 7, 2026
bfb85dc
Merge pull request #1177 from asmorkalov:as/own_mac_intel
asmorkalov Jan 14, 2026
8e765e8
Added Python 3.14 support to CI.
asmorkalov Jan 14, 2026
6cb94ce
Merge pull request #1179 from asmorkalov:as/python_3.14
asmorkalov Jan 15, 2026
7f792fe
Add KAZE and AKAZE license
Kumataro Jan 21, 2026
9faa612
Merge pull request #1187 from Kumataro:develop/append_KAZE_and_AKAZE
asmorkalov Jan 22, 2026
e42eb55
Disable libavdevice for headless builds on Linux to get rid of X libs…
asmorkalov Jan 23, 2026
0dd09ec
Merge pull request #1189 from asmorkalov:as/disable_libavdevice_headless
asmorkalov Jan 27, 2026
5611d66
Fixed upload path in twine release.
asmorkalov Feb 2, 2026
4ddfc01
Merge pull request #1200 from asmorkalov:as/twine_upload_fix
asmorkalov Feb 3, 2026
1ddb20b
Merge pull request #1230 from avdivan:update
avdivan Jun 9, 2026
57d69e5
Merge branch '4.x' into 5.x-merge-4.x
asmorkalov Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 0 additions & 196 deletions .github/workflows/build_wheels_linux_arm.yml
View file
Open in desktop

This file was deleted.

Loading
Loading