jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-21 13:00:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix building

Browse Source
This commit is contained in:
jacob.eva 2024-09-14 09:24:58 +01:00
parent 39f00280a5
commit f580ab0c6d
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,9 +1,9 @@
FROM ubuntu:22.04 as build FROM ubuntu:24.04 as build
# Install dependencies # Install dependencies
RUN DEBIAN_FRONTEND=noninteractive \ RUN DEBIAN_FRONTEND=noninteractive \
apt-get update \ 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 && apt-get install --reinstall python3
WORKDIR "/root" WORKDIR "/root"
@ -63,7 +63,7 @@ WORKDIR "../Sideband/sbapp"
# Set up virtual environment # Set up virtual environment
RUN virtualenv venv 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 "../" WORKDIR "../"

2
Makefile
View File

@ -29,7 +29,7 @@ preparewheel:
$(MAKE) -C sbapp cleanrns $(MAKE) -C sbapp cleanrns
build_wheel: build_wheel:
python3 setup.py sdist bdist_wheel . sbapp/venv/bin/activate; python3 setup.py sdist bdist_wheel
release: build_wheel apk fetchapk release: build_wheel apk fetchapk

2
recipes/codec2/__init__.py
View File

@ -1,4 +1,5 @@
from os.path import join from os.path import join
import os
from pythonforandroid.recipe import Recipe from pythonforandroid.recipe import Recipe
from pythonforandroid.toolchain import current_directory, shprint from pythonforandroid.toolchain import current_directory, shprint
import sh import sh
@ -40,6 +41,7 @@ class Codec2Recipe(Recipe):
mkdir = sh.mkdir("-p", "build_android") mkdir = sh.mkdir("-p", "build_android")
# cd = sh.cd("build_android") # cd = sh.cd("build_android")
os.chdir("build_android") os.chdir("build_android")
sh.cp("/root/Sideband/recipes/codec2/generate_codebook", "/usr/bin")
cmake = sh.Command('cmake') cmake = sh.Command('cmake')
shprint(cmake, *flags, _env=env) shprint(cmake, *flags, _env=env)

6
sbapp/buildozer.spec
View File

@ -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 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.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/ p4a.local_recipes = ../recipes/
@ -40,7 +40,7 @@ android.release_artifact = apk
android.archs = arm64-v8a,armeabi-v7a android.archs = arm64-v8a,armeabi-v7a
#android.logcat_filters = *:S python:D #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 services = sidebandservice:services/sidebandservice.py:foreground
android.whitelist = lib-dynload/termios.so android.whitelist = lib-dynload/termios.so

2
sbapp/patches/AndroidManifest.tmpl.xml
View File

@ -138,7 +138,7 @@
{% endfor %} {% endfor %}
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="io.unsigned.sideband.provider" android:authorities="io.unsigned.sideband.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">