From f580ab0c6dbb4999a75aa2f59fb8e5461a569f7b Mon Sep 17 00:00:00 2001 From: "jacob.eva" Date: Sat, 14 Sep 2024 09:24:58 +0100 Subject: [PATCH] Fix building --- Dockerfile | 6 +++--- Makefile | 2 +- recipes/codec2/__init__.py | 2 ++ sbapp/buildozer.spec | 6 +++--- sbapp/patches/AndroidManifest.tmpl.xml | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a1073ac..767fbc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM ubuntu:22.04 as build +FROM ubuntu:24.04 as build # Install dependencies RUN DEBIAN_FRONTEND=noninteractive \ apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y git libffi-dev python3-dev python3-virtualenv libssl-dev autoconf openjdk-17-jdk cmake libtool libssl-dev libncurses5-dev libsqlite3-dev libreadline-dev libtk8.6 libgdm-dev libdb4o-cil-dev libpcap-dev unzip zip wget apksigner \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y git libffi-dev python3-dev python3-virtualenv libssl-dev autoconf openjdk-17-jdk cmake libtool libssl-dev libncurses5-dev libsqlite3-dev libreadline-dev libtk8.6 libgdm-dev libpcap-dev unzip zip wget apksigner build-essential libopus-dev libogg-dev patchelf \ && apt-get install --reinstall python3 WORKDIR "/root" @@ -63,7 +63,7 @@ WORKDIR "../Sideband/sbapp" # Set up virtual environment RUN virtualenv venv -RUN bash -c "source venv/bin/activate && pip install -U pip && pip install setuptools==60.5 wheel==0.30 buildozer cython" +RUN bash -c "source venv/bin/activate && pip install -U pip && pip install setuptools==74.1.2 wheel==0.43 buildozer==1.4.0 cython==3.0.10 rich==13.8.1" WORKDIR "../" diff --git a/Makefile b/Makefile index 033277d..a4666b9 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ preparewheel: $(MAKE) -C sbapp cleanrns build_wheel: - python3 setup.py sdist bdist_wheel + . sbapp/venv/bin/activate; python3 setup.py sdist bdist_wheel release: build_wheel apk fetchapk diff --git a/recipes/codec2/__init__.py b/recipes/codec2/__init__.py index 81aa527..8c12d2a 100644 --- a/recipes/codec2/__init__.py +++ b/recipes/codec2/__init__.py @@ -1,4 +1,5 @@ from os.path import join +import os from pythonforandroid.recipe import Recipe from pythonforandroid.toolchain import current_directory, shprint import sh @@ -40,6 +41,7 @@ class Codec2Recipe(Recipe): mkdir = sh.mkdir("-p", "build_android") # cd = sh.cd("build_android") os.chdir("build_android") + sh.cp("/root/Sideband/recipes/codec2/generate_codebook", "/usr/bin") cmake = sh.Command('cmake') shprint(cmake, *flags, _env=env) diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec index b1ad31f..bddf07d 100644 --- a/sbapp/buildozer.spec +++ b/sbapp/buildozer.spec @@ -14,9 +14,9 @@ android.numeric_version = 20240911 requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,libwebp,libogg,libopus,opusfile,numpy,cryptography,ffpyplayer,codec2,pycodec2,sh,pynacl,android,able_recipe -android.gradle_dependencies = com.android.support:support-compat:28.0.0 +#android.gradle_dependencies = com.android.support:support-compat:28.0.0 #android.enable_androidx = True -#android.add_aars = patches/support-compat-28.0.0.aar +android.add_aars = patches/support-compat-28.0.0.aar p4a.local_recipes = ../recipes/ @@ -40,7 +40,7 @@ android.release_artifact = apk android.archs = arm64-v8a,armeabi-v7a #android.logcat_filters = *:S python:D -android.add_gradle_repositories = flatDir { dirs("../../../../../../patches") } +android.add_gradle_repositories = "flatDir { dirs('../../../../../../patches') }" services = sidebandservice:services/sidebandservice.py:foreground android.whitelist = lib-dynload/termios.so diff --git a/sbapp/patches/AndroidManifest.tmpl.xml b/sbapp/patches/AndroidManifest.tmpl.xml index 226a8ae..cdf88e5 100644 --- a/sbapp/patches/AndroidManifest.tmpl.xml +++ b/sbapp/patches/AndroidManifest.tmpl.xml @@ -138,7 +138,7 @@ {% endfor %}