From 88687172f1cc1b6fa3ef082d9082233645026441 Mon Sep 17 00:00:00 2001 From: thescheff Date: Tue, 26 Jan 2021 21:31:23 +0100 Subject: [PATCH 1/3] Avoids 'Permission Denied' error during docker build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9443597b98..e83737b1df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 From 4479df3836e74b16ef798c4093b3a338901bde0e Mon Sep 17 00:00:00 2001 From: thescheff Date: Sun, 14 Feb 2021 16:47:59 +0100 Subject: [PATCH 2/3] Avoids build error for opencv and bumps version to 4.5.1 --- pythonforandroid/recipes/opencv/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/opencv/__init__.py b/pythonforandroid/recipes/opencv/__init__.py index 8a7999d424..65b53efcc8 100644 --- a/pythonforandroid/recipes/opencv/__init__.py +++ b/pythonforandroid/recipes/opencv/__init__.py @@ -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'] @@ -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', From e172610880d5dbad49dcd5c606932b15c2bd8630 Mon Sep 17 00:00:00 2001 From: thescheff Date: Sun, 14 Feb 2021 16:54:30 +0100 Subject: [PATCH 3/3] Update opencv-extras to 4.5.1 --- pythonforandroid/recipes/opencv_extras/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/opencv_extras/__init__.py b/pythonforandroid/recipes/opencv_extras/__init__.py index c63d8da55b..693c3655dd 100644 --- a/pythonforandroid/recipes/opencv_extras/__init__.py +++ b/pythonforandroid/recipes/opencv_extras/__init__.py @@ -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']