From efaa63c14c1cc4ab305d9d89bb8c7b003f633fdc Mon Sep 17 00:00:00 2001 From: surbhi Date: Mon, 29 Jul 2024 08:14:20 +0530 Subject: [PATCH] Added zbarcam deps - replaces libpng wth pypng --- .buildbot/android/Dockerfile | 3 +++ .buildbot/android/build.sh | 2 +- packages/android/buildozer.spec | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.buildbot/android/Dockerfile b/.buildbot/android/Dockerfile index faf29233..d657451d 100755 --- a/.buildbot/android/Dockerfile +++ b/.buildbot/android/Dockerfile @@ -22,6 +22,9 @@ RUN apt-get -y update -qq \ RUN apt-get -y install -qq --no-install-recommends openjdk-17-jdk \ && apt-get -y autoremove +# pyzbar dependencies +RUN apt-get -y install -qq --no-install-recommends libzbar0 libtool gettext + RUN pip install buildozer cython virtualenv diff --git a/.buildbot/android/build.sh b/.buildbot/android/build.sh index e008218a..f2c08ac5 100755 --- a/.buildbot/android/build.sh +++ b/.buildbot/android/build.sh @@ -11,7 +11,7 @@ echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMe rm -rf src/pybitmessage mkdir -p src/pybitmessage cp src/*.py src/pybitmessage -cp -r src/bitmessagekivy src/backend src/mockbm src/pybitmessage +cp -r src/bitmessagekivy src/backend src/mockbm src/images src/pybitmessage pushd packages/android diff --git a/packages/android/buildozer.spec b/packages/android/buildozer.spec index 99393e86..afdd4282 100644 --- a/packages/android/buildozer.spec +++ b/packages/android/buildozer.spec @@ -36,7 +36,7 @@ version = 0.1.1 # (list) Application requirements # comma separated e.g. requirements = sqlite3,kivy -requirements = python3,kivy,sqlite3,kivymd==1.0.2,Pillow,opencv,kivy-garden.qrcode,qrcode,typing_extensions,libpng +requirements = python3,kivy,sqlite3,kivymd==1.0.2,Pillow,opencv,kivy-garden.qrcode,qrcode,typing_extensions,pypng,pyzbar,xcamera,zbarcam # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes