updates

.github/workflows/jni_libs.yml

@@ -73,6 +73,60 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           artifacts: "libjni-c-toxcore.jnilib"
 
+
+  build-raspi-jni-artifact:
+    name: JNI Artifact Raspi Build
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: install deps
+        run: |
+          sudo apt-get update && \
+          sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install -y --no-install-recommends \
+          ca-certificates
+
+      - name: make script dockcross-linux-armv7
+        run: docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7; chmod +x ./dockcross-linux-armv7
+
+      - name: test
+        run: ./dockcross-linux-armv7 bash -c 'ls -al;id;pwd;hostname;uname -a'
+
+      - name: build deps
+        run:  |
+          ./dockcross-linux-armv7 bash -c './circle_scripts/deps_linux.sh raspi'
+
+      - name: build jni lib
+        run:  |
+          ./dockcross-linux-armv7 bash -c './circle_scripts/java_jni_lib_linux.sh raspi'
+
+      - name: sha hash of jni lib
+        run:  |
+          mv -v /home/runner/work/trifa_material/trifa_material/libjni-c-toxcore.so /home/runner/work/trifa_material/trifa_material/libjni-c-toxcore_raspi.so
+          sha256sum /home/runner/work/trifa_material/trifa_material/libjni-c-toxcore_raspi.so || echo "ignore"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: libjni-c-toxcore_raspi.so
+          path: libjni-c-toxcore_raspi.so
+      - name: Upload to nightly release
+        uses: ncipollo/release-action@v1
+        if: github.ref == 'refs/heads/master'
+        with:
+          allowUpdates: true
+          tag: nightly
+          omitBodyDuringUpdate: true
+          omitNameDuringUpdate: true
+          prerelease: true
+          replacesArtifacts: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts: "libjni-c-toxcore_raspi.so"
+
+
   build-linux-jni-artifact:
     name: JNI Artifact Linux Build
     runs-on: ubuntu-20.04

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "com.zoffcc.applications.trifa_material"
-version = "1.0.3"
+version = "1.0.5"
 val appName = "trifa_material"
 
 repositories {
@@ -69,7 +69,7 @@ dependencies {
     implementation(compose.materialIconsExtended)
     //
     //
-    implementation("org.xerial:sqlite-jdbc:3.44.0.0")
+    implementation("org.xerial:sqlite-jdbc:3.44.1.0")
     implementation("ca.gosyer:kotlin-multiplatform-appdirs:1.1.1")
     implementation("com.sksamuel.scrimage:scrimage-core:4.1.1")
     implementation("com.sksamuel.scrimage:scrimage-webp:4.1.1")

circle_scripts/deps_linux.sh

@@ -67,6 +67,54 @@ export LDFLAGS=" "
 
   export CXXFLAGS=${CXXFLAGS_ADDON}
   export CFLAGS=${CFLAGS_ADDON}
+
+  if [ "$1""x" == "raspix" ]; then
+    echo "*** RASPI ***"
+  ./configure --arch="arm" \
+              --enable-gpl \
+              --prefix="$_INST_" \
+              --target-os="linux" \
+              --cross-prefix="armv7-unknown-linux-gnueabi-" \
+              --disable-asm \
+              --enable-pic \
+              --disable-swscale \
+              --disable-network \
+              --disable-everything \
+              --disable-debug \
+              --disable-shared \
+              --disable-programs \
+              --disable-protocols \
+              --disable-doc \
+              --disable-sdl2 \
+              --disable-avfilter \
+              --disable-filters \
+              --disable-iconv \
+              --disable-network \
+              --disable-muxers \
+              --disable-postproc \
+              --disable-swresample \
+              --disable-swscale-alpha \
+              --disable-dwt \
+              --disable-lsp \
+              --disable-faan \
+              --disable-vaapi \
+              --disable-vdpau \
+              --disable-zlib \
+              --disable-xlib \
+              --disable-bzlib \
+              --disable-lzma \
+              --disable-encoders \
+              --disable-decoders \
+              --disable-demuxers \
+              --disable-parsers \
+              --disable-bsfs \
+              --disable-libxcb \
+              --disable-libxcb-shm \
+              --enable-parser=h264 \
+              --enable-decoder=h264 || exit 1
+
+  else
+
   ./configure \
               --enable-gpl \
               --prefix="$_INST_" \
@@ -111,6 +159,7 @@ export LDFLAGS=" "
 #              --disable-lzo \
 #              --disable-avresample \
 
+  fi
 
   make -j || exit 1
   make install
@@ -144,13 +193,25 @@ chmod a+rx package_version
   ./autogen.sh
   export CXXFLAGS=${CXXFLAGS_ADDON}
   export CFLAGS=${CFLAGS_ADDON}
-  ./configure \
+
+  if [ "$1""x" == "raspix" ]; then
+    echo "*** RASPI ***"
+    ./configure --host="$CROSS_TRIPLE" \
                                --prefix="$_INST_" \
                                --disable-shared \
                                --enable-static \
                                --disable-soname-versions \
                                --disable-extra-programs \
                                --disable-doc || exit 1
+  else
+    ./configure \
+                               --prefix="$_INST_" \
+                               --disable-shared \
+                               --enable-static \
+                               --disable-soname-versions \
+                               --disable-extra-programs \
+                               --disable-doc || exit 1
+  fi
   make || exit 1
   make install
   unset CXXFLAGS
@@ -176,11 +237,20 @@ cd libsodium*/
 
   export CXXFLAGS=${CXXFLAGS_ADDON}
   export CFLAGS=${CFLAGS_ADDON}
-  ./configure \
+  if [ "$1""x" == "raspix" ]; then
+    echo "*** RASPI ***"
+    ./configure --host="$CROSS_TRIPLE" \
+              --prefix="$_INST_" \
+              --disable-shared \
+              --enable-static \
+              --with-pic || exit 1
+  else
+    ./configure \
               --prefix="$_INST_" \
               --disable-shared \
               --enable-static \
               --with-pic || exit 1
+  fi
 
   make || exit 1
   make install
@@ -208,7 +278,11 @@ cd libvpx*/
 
   export CXXFLAGS=${CXXFLAGS_ADDON}
   export CFLAGS=${CFLAGS_ADDON}
-  ./configure \
+
+  if [ "$1""x" == "raspix" ]; then
+    echo "*** RASPI ***"
+
+    ./configure --target=armv7-linux-gcc \
                                          --prefix="$_INST_" \
                                          --disable-shared \
                                          --size-limit=16384x16384 \
@@ -222,7 +296,22 @@ cd libvpx*/
                                          --disable-tools \
                                          --disable-docs \
                                          --disable-unit-tests || exit 1
-
+  else
+    ./configure \
+                                         --prefix="$_INST_" \
+                                         --disable-shared \
+                                         --size-limit=16384x16384 \
+                                         --enable-onthefly-bitpacking \
+                                         --enable-runtime-cpu-detect \
+                                         --enable-realtime-only \
+                                         --enable-multi-res-encoding \
+                                         --enable-temporal-denoising \
+                                         --enable-static \
+                                         --disable-examples \
+                                         --disable-tools \
+                                         --disable-docs \
+                                         --disable-unit-tests || exit 1
+  fi
   make || exit 1
   make install
   unset CXXFLAGS
@@ -235,10 +324,11 @@ fi
 
 
 # --- NASM ---
-if [ 1 == 1 ]; then
-
-cd "$_SRC_"
 
+if [ "$1""x" == "raspix" ]; then
+    echo "*** RASPI ***"
+else
+    cd "$_SRC_"
     export PATH=$ORIGPATH
 
     rm -Rf nasm
@@ -261,8 +351,7 @@ cd "$_SRC_"
     nasm --version || exit 1
 
     export PATH=$NEWPATH
-cd "$_HOME_"
-
+    cd "$_HOME_"
 fi
 # --- NASM ---
 
@@ -279,14 +368,26 @@ cd x264/
 
   export CXXFLAGS=${CXXFLAGS_ADDON}
   export CFLAGS=${CFLAGS_ADDON}
-  ./configure \
+
+  if [ "$1""x" == "raspix" ]; then
+    echo "*** RASPI ***"
+    ./configure --host="$CROSS_TRIPLE" \
+                                         --disable-asm \
                                          --prefix="$_INST_" \
                                          --disable-opencl \
                                          --enable-static \
                                          --disable-avs \
                                          --disable-cli \
                                          --enable-pic || exit 
-
+  else
+    ./configure \
+                                         --prefix="$_INST_" \
+                                         --disable-opencl \
+                                         --enable-static \
+                                         --disable-avs \
+                                         --disable-cli \
+                                         --enable-pic || exit 
+  fi
   make || exit 1
   make install
   unset CXXFLAGS
@@ -323,14 +424,26 @@ cat toxcore/tox.h | grep 'TOX_GIT_COMMIT_HASH'
 
 autoreconf -fi
 
-./configure \
+if [ "$1""x" == "raspix" ]; then
+  echo "*** RASPI ***"
+  ./configure --host="$CROSS_TRIPLE" \
+     CXXFLAGS="$CXXFLAGS_ADDON" \
+     CFLAGS="-fPIC $CFLAGS_ADDON $CFLAGS_MORE -DTOX_CAPABILITIES_ACTIVE $LOGG" \
+    --prefix="$_INST_" \
+    --disable-soname-versions \
+    --disable-shared \
+    --disable-testing \
+    --disable-rt || exit 1
+else
+  ./configure \
      CXXFLAGS="$CXXFLAGS_ADDON" \
      CFLAGS="-fPIC $CFLAGS_ADDON $CFLAGS_MORE -DTOX_CAPABILITIES_ACTIVE $LOGG" \
     --prefix="$_INST_" \
     --disable-soname-versions \
     --disable-shared \
     --disable-testing \
     --disable-rt || exit 1
+fi
 
     make || exit 1
     make install

circle_scripts/java_jni_lib_linux.sh

@@ -7,6 +7,16 @@ id -a
 pwd
 ls -al
 
+if [ "$1""x" == "raspix" ]; then
+  echo "*** RASPI ***"
+  sudo apt-get update && \
+          sudo apt-get install -y --no-install-recommends \
+          ca-certificates \
+          openjdk-17-jdk \
+          openjdk-17-jdk-headless \
+          coreutils autoconf libtool pkg-config
+fi
+
 export _SRC_=$_HOME_/src/
 export _INST_=$_HOME_/inst/
 
@@ -69,7 +79,14 @@ CFLAGS_MORE="--param=ssp-buffer-size=1 -fstack-protector-all -std=gnu99 -I$_INST
 #     export CFLAGS=" $CFLAGS -pg "
 # fi
 
-gcc $CFLAGS \
+GCC_=gcc
+
+if [ "$1""x" == "raspix" ]; then
+  echo "*** RASPI ***"
+  GCC_="$CC"
+fi
+
+$GCC_ $CFLAGS \
 -Wall \
 -DJAVA_LINUX \
 -DNOGLOBALVARS \

src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt

@@ -53,6 +53,7 @@ import com.zoffcc.applications.trifa.MainActivity.Companion.tox_version_minor
 import com.zoffcc.applications.trifa.MainActivity.Companion.tox_version_patch
 import com.zoffcc.applications.trifa_material.trifa_material.BuildConfig
 import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
+import org.sqlite.SQLiteJDBCLoader
 
 @Composable
 fun AboutScreen(
@@ -185,7 +186,7 @@ private fun GeneralInfo() {
             jninotifications_version = "JNI lib not loaded"
         }
         add(Entry(i18n("about.jninotifications_version"), jninotifications_version))
-
+        add(Entry(i18n("about.sqlitejdbc"), SQLiteJDBCLoader.getVersion()))
         // add(Entry(i18n("about.contact"), Strings.EMAIL, true))
     }