mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,228 Commits 6 Branches 126 Tags 3 GiB
f75152a597
Commit Graph

106 Commits

Author SHA1 Message Date
Alexander Alekhin
f473b61585 android: build package with API 21 
enables Video I/O backend via Media NDK
 2019-03-20 19:21:43 +03:00
Alexander Alekhin
6501cb93a4 Merge pull request #14104 from alalek:android_build_sdk_reduce_mem_usage 2019-03-20 15:35:05 +00:00
Giles Payne
0d1a0b126b Merge pull request #14005 from komakai:android-video-cap 
* Add Android Media NDK video i/o file capture back-end

* Fix failing test

* Improve error handling/prevent resource leaks

* Add license text

* Modify default for WITH_ANDROID_MEDIANDK option

* Fix spelling of deleter_AMediaExtractor
 2019-03-19 21:28:45 +03:00
Alexander Alekhin
e8a0bc5794 android: reduce memory consumption by gradle builds 2019-03-19 16:50:08 +03:00
Giles Payne
55f02d8c66 Merge pull request #14011 from komakai:debug-build 
* Add Android SDK debug build flag

* Change LOG_TAG define for consistency with other modules
 2019-03-11 17:16:42 +03:00
Alexander Alekhin
332c37f332 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-06 11:43:16 +03:00
Alexander Alekhin
480c6dae6d android: backport build_sdk.py 2019-03-04 15:29:09 +03:00
Giles Payne
7444f0c651 Merge pull request #13939 from komakai:android-build-improvements 
* Android build improvements
* look for NDK in "ndk-bundle" directory under the SDK directory if location not specified
* look for cmake and ninja in "cmake" directory under the SDK directory if not found in the path
* disable use of ccache if not found in the path

* Redo build tool existence checks
 2019-03-04 15:19:29 +03:00
Alexander Alekhin
1dee705074 Merge branch '3.4' into merge-3.4 2018-12-22 05:40:15 +00:00
Alexander Alekhin
8f1356c3c5 OpenCV version++ (3.4.5) 
OpenCV 3.4.5
 2018-12-21 17:31:20 +03:00
Alexander Alekhin
2b35c1708b android: gradle-based package and samples 
- drop hello-android sample
 2018-12-19 14:59:48 +03:00
Alexander Alekhin
d5f430cc11 android: gradle wrapper 
https://github.com/gradle/gradle/tree/v4.6.0

License: Apache 2.0
 2018-12-18 15:45:45 +03:00
Alexander Alekhin
22dbcf98c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-17 14:17:35 +00:00
Alexander Alekhin
a1fe8f754f OpenCV version++ (3.4.4) 
OpenCV 3.4.4
 2018-11-17 10:22:17 +00:00
Alexander Alekhin
c1db75e0c7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-29 16:24:56 +03:00
Alexander Alekhin
b38c50b3d0 OpenCV 3.4.3 2018-08-28 15:58:21 +03:00
Alexander Alekhin
bb45bf9695 android: NDK17 support 
tested with NDK 17b (17.1.4828580)
 2018-08-27 21:07:34 +00:00
Alexander Alekhin
c1df9ad456 OpenCV version++ 
OpenCV 3.4.3
 2018-08-14 14:10:37 +03:00
Alexander Alekhin
2da96be217 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-07-09 19:44:51 +03:00
Alexander Alekhin
d69a327d6d OpenCV version++ 
OpenCV 3.4.2
 2018-06-10 10:20:38 +03:00
Alexander Alekhin
45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489.
 2018-06-04 19:26:10 +03:00
Vlad Kraevskiy
90ba69a403 Fixed a typo in android toolchain documentation. 2018-06-01 12:39:34 +03:00
Alexander Alekhin
68c92908d5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-14 15:17:35 +03:00
Alexander Alekhin
78f205ffa5 python: better Python 3 support 2018-05-11 17:32:04 +03:00
Alexander Alekhin
000a13b6a3 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-03 14:30:38 +00:00
cclauss
d4a966c7c4 Fix Python string formatting 2018-05-03 07:47:34 +02:00
Alexander Alekhin
0bd33c8d1c android: don't use relative paths to contrib modules 2018-04-25 14:31:35 +03:00
Alexander Alekhin
b07f772f36 android: enable C++11 in test sample 2018-04-10 18:09:54 +03:00
Alexander Alekhin
4990506948 cuda: WITH_CUDA=OFF by default (need to enable it explicitly) 2018-04-05 19:23:58 +00:00
Alexander Alekhin
6ffc48769a OpenCV version++ 
OpenCV 3.4.1
 2018-02-23 11:38:33 +03:00
luz.paz
d47b1f3b70 Misc. ./apps ./doc ./platoforms typos 
Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`
 2018-02-08 13:04:34 -05:00
Alexander Alekhin
edcbbee979 android: update build_sdk.py 
- configuration files for ABIs configuration
- use builtin Android NDK's toolchain by default (force flag to use OpenCV's toolchain)
- default values for 'work_dir' and 'opencv_dir'
 2018-01-14 16:05:48 +00:00
Alexander Alekhin
08086178bd android: fix SDK build 
- fix Javadoc:
  - generate Javadoc after gather step to process all Java files (including Android 21)
  - generate into 'OpenCV-android-sdk' directly without additional copy step
- use smart copy/move utility functions ('shutil' doesn't well with existed destination)
- by default move files to reduce pressure on storage I/O (> 800Mb)
 2018-01-13 02:12:39 +00:00
Alexander Alekhin
d01a2038ae cmake(android): update CMAKE_FIND_ROOT_PATH_MODE_* handling 
Avoids this error message with CMake 3.10:
CMake Error: CMake was unable to find a build program corresponding to "Ninja".
CMAKE_MAKE_PROGRAM is not set. You probably need to select a different build tool.

Related changes is that pkg-config tool is found (/usr/bin/pkg-config).
 2018-01-05 05:59:08 +00:00
Alexander Alekhin
bc6a355370 android(toolchain): fix find_path() behavior (zlib search problem) 2018-01-05 04:52:17 +00:00
Erik Man
37911e60d8 Allow compilation with unified include directory 
This makes it possible to compile OpenCV with for instance ndk-r16
 2018-01-05 04:52:17 +00:00
Alexander Alekhin
c92aa95726 android(toolchain): detailed error message 2018-01-05 04:52:17 +00:00
Alexander Alekhin
cac4a7e5b5 OpenCV version++ 
OpenCV 3.4.0-rc
 2017-12-16 01:30:43 +03:00
Alexander Alekhin
bd6fb497bc OpenCV version++ 
OpenCV 3.3.1
 2017-10-10 12:29:57 +03:00
Alexander Alekhin
4af3ca4e4d OpenCV version++ 
OpenCV 3.3.0
 2017-08-03 23:58:23 +00:00
berak
6b0661cca1 Update README.android 2017-07-31 08:28:34 +02:00
Alexander Alekhin
133b91a026 android: build fixes 
- eliminate CMake 3.5+ warnings
- removed usage of dropped "OPENCV_CAMERA_MODULES" variable
- partial support for Android NDK 11+
 2017-04-26 14:24:51 +03:00
Alexander Alekhin
d85c11e525 OpenCV version++ 
3.2.0-rc
 2016-12-19 17:12:18 +03:00
Matthew Cook
e06a9e9009 Fix android libc++ build 2016-09-02 10:25:46 +12:00
Alexander Alekhin
3e649895e5 android: increase default native API level 8=>9 2016-07-07 15:57:59 +03:00
Alexander Alekhin
7188e6e2ac android: update build scripts 2016-06-20 15:15:21 +03:00
Dmitry Mozgin
03e4b7552e Added --extra_modules_path to build_sdk.py 2016-05-12 12:36:42 +03:00
Anush Elangovan
3405a865c4 Add LLVM c++_static c++_shared STL targets 
The Android NDK would be moving to Clang as its default compiler
in the future. This patch allows OpenCV to build with the default
c++_shared / c++_static

TEST=Builds OpenCV with -DANDROID_TOOLCHAIN_NAME=
aarch64-linux-android-clang3.6 -DANDROID_STL=c++_shared
 2016-01-04 20:48:16 -08:00
Maksim Shabunin
8d1f5b5490 Version++ for android 2015-12-18 17:57:07 +03:00
Alexander Alekhin
4e669f59a0 fix android pack 2015-12-18 17:38:04 +03:00