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

Avoids build error for opencv and bumps version to 4.5.1 #2419

Merged
merged 3 commits into from
Jun 14, 2021
Merged

Avoids build error for opencv and bumps version to 4.5.1 #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8868717
Avoids 'Permission Denied' error during docker build
thescheff Jan 26, 2021
4479df3
Avoids build error for opencv and bumps version to 4.5.1
thescheff Feb 14, 2021
e172610
Update opencv-extras to 4.5.1
thescheff Feb 14, 2021
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ RUN mkdir ${ANDROID_HOME} && chown --recursive ${USER} ${HOME_DIR} ${ANDROID_HOM
USER ${USER}

# Download and install android's NDK/SDK
COPY ci/makefiles/android.mk /tmp/android.mk
COPY --chown=user:user ci/makefiles/android.mk /tmp/android.mk
RUN make --file /tmp/android.mk \
&& sudo rm /tmp/android.mk
thescheff marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
4 changes: 3 additions & 1 deletion pythonforandroid/recipes/opencv/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class OpenCVRecipe(NDKRecipe):
build of most of the libraries of the opencv's package, so we can
process images, videos, objects, photos...
'''
version = '4.0.1'
version = '4.5.1'
url = 'https://github.com/opencv/opencv/archive/{version}.zip'
depends = ['numpy']
patches = ['patches/p4a_build.patch']
Expand Down Expand Up @@ -75,6 +75,8 @@ def build_arch(self, arch):
'-DANDROID_STANDALONE_TOOLCHAIN={}'.format(self.ctx.ndk_dir),
'-DANDROID_NATIVE_API_LEVEL={}'.format(self.ctx.ndk_api),
'-DANDROID_EXECUTABLE={}/tools/android'.format(env['ANDROID_SDK']),
'-DANDROID_SDK_TOOLS_VERSION=6514223',
'-DANDROID_PROJECTS_SUPPORT_GRADLE=ON',

'-DCMAKE_TOOLCHAIN_FILE={}'.format(
join(self.ctx.ndk_dir, 'build', 'cmake',
Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/opencv_extras/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class OpenCVExtrasRecipe(Recipe):
.. seealso:: https://github.com/opencv/opencv_contrib

"""
version = '4.0.1'
version = '4.5.1'
url = 'https://github.com/opencv/opencv_contrib/archive/{version}.zip'
depends = ['opencv']

Expand Down