Stable merge for week 6 of 2022 (#556)

* Stable merge for week 6 of 2022

New Packages:

* Add new rmkit apps: dumbskull, rpncalc and wordlet (#542)
* Add package for Folly (z-machine interpreter) (#543)

Updated Packages:

* Update KOReader to v2022.01 (#517)
* Update innernet to 1.5.3 (#545)
* Update to all rmkit applications (#542)
* Update plato to 0.9.25 (#534)
* Update rm2fb to v0.0.14 (#552)

Misc:

* Remove outdated todo from opkg completion (#541)

* Add hotfixes from #560

Co-authored-by: raisjn <[email protected]>
Co-authored-by: Mattéo Delabre <[email protected]>

.gitignore

@@ -1,3 +1,4 @@
 private
 build
 __pycache__
+.venv

package/display/package

@@ -4,11 +4,11 @@
 
 archs=(rm1 rm2)
 pkgnames=(display rm2fb-client)
-timestamp=2021-12-29T03:05:58Z
+timestamp=2022-02-11T17:23:07Z
 maintainer="raisjn <[email protected]>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.13-1
+pkgver=1:0.0.14-1
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
@@ -23,7 +23,7 @@ source=(
     rm2fb-preload.env
 )
 sha256sums=(
-    ffdd9e5c2a62e529995b2aae04b41459b58f5f963bccd9947b01cfb3c514b117
+    ff933cb8d81432b4a4809d49150fd75528c82e952def767659e85bb3c0ff7f5b
     SKIP
     SKIP
     SKIP

package/folly/folly.draft

@@ -0,0 +1,5 @@
+# Copyright (c) 2020 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+name=folly
+desc=Z-machine interpreter for interactive fiction
+call=/opt/bin/folly

package/folly/package

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Copyright (c) 2020 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(folly)
+pkgdesc="Z-machine interpreter for interactive fiction"
+url="https://github.com/bkirwi/folly"
+pkgver=0.0.1-1
+timestamp=2022-01-29T15:35:52-05:00
+section=games
+maintainer="Ben Kirwin <[email protected]>"
+license=MIT
+installdepends=(display)
+makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)
+
+image=rust:v2.2.2
+
+# Whitespace-separated list of source archives that are needed to build the package
+source=(
+    https://github.com/bkirwi/folly/archive/842bad4f0d6e0f35cd92d4693896ed353821a1fd.zip
+    folly.draft
+)
+# SHA-256 checksums of the source archives above
+sha256sums=(
+    9283495e87c0b4c383703b7c8514b17ead77298681eed0a186f4141fa9b129a8
+    SKIP
+)
+
+build() {
+    X_TOOLS="/opt/x-tools/arm-remarkable-linux-gnueabihf/arm-remarkable-linux-gnueabihf"
+    X_TOOLS_CPP="$X_TOOLS/include/c++/10.2.0"
+
+    # Arguments for bindgen's usage of clang
+    export BINDGEN_EXTRA_CLANG_ARGS="\
+      --sysroot=$X_TOOLS/sysroot\
+      -I$X_TOOLS_CPP -I$X_TOOLS_CPP/arm-remarkable-linux-gnueabihf"
+
+    # Arguments for the gcc-based tensorflow build in the build.rs file of tflite-rs.
+    export TFLITE_RS_MAKE_TARGET_TOOLCHAIN_PREFIX="arm-remarkable-linux-gnueabihf-"
+    export TFLITE_RS_MAKE_EXTRA_CFLAGS="$BINDGEN_EXTRA_CLANG_ARGS -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a9"
+
+    cargo build --release
+
+    # Save the build system the trouble of stripping unused binaries
+    rm -r target/release/build
+    rm -r target/armv7-unknown-linux-gnueabihf/release/build
+}
+
+package() {
+    # Install the app binary and the draft file
+    install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/folly "$pkgdir"/opt/bin/folly
+    install -D -m 644 "$srcdir"/folly.draft "$pkgdir"/opt/etc/draft/folly.draft
+}

package/innernet/package

@@ -5,23 +5,21 @@
 pkgnames=(innernet-client)
 pkgdesc="A private network system that uses WireGuard under the hood."
 url="https://github.com/tonarino/innernet"
-pkgver=1.5.0-1
-timestamp=2021-08-31T17:57:00Z
+pkgver=1.5.3-2
+timestamp=2022-01-31T20:08:43Z
 section="utils"
 maintainer="plan5 <[email protected]>"
 license=MIT
 installdepends=(wireguard)
 makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)
 
-image=rust:v2.2
+image=rust:v2.2.2
 _srcver="v${pkgver%-*}"
 source=(
     "https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip"
-    build.patch
 )
 sha256sums=(
-    1f2f38a0c7cbc91391f84f86849bc57e6351fdc6605232b839df25e1009b68f9
-    SKIP
+    2f7ca1d802d898b1c4fd090cba9e0562a1e80d617b55f23ba596e81c99441a1c
 )
 
 prepare() {
@@ -32,9 +30,6 @@ prepare() {
     # Change binary path in service file
     sed -i "s/\/usr\/bin\/innernet/\/opt\/bin\/innernet/g" "$srcdir/client/[email protected]"
 
-    # Insert line to look for headers under $SYSROOT instead of root filesystem
-    patch -u "$srcdir/wireguard-control-sys/build.rs" -i "$srcdir/build.patch"
-
     #tbd: change wireguard config dir to /opt/etc/wireguard?
     #sed -i "s/\/etc\/wireguard/\/opt\/etc\/wireguard/g" "$srcdir/shared/src/lib.rs"
 }

package/koreader/package

@@ -5,8 +5,8 @@
 pkgnames=(koreader)
 pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
 url=https://github.com/koreader/koreader
-pkgver=2021.12.1-1
-timestamp=2021-12-23T19:08:49Z
+pkgver=2022.01-1
+timestamp=2022-01-16T13:04:08Z
 section="readers"
 maintainer="raisjn <[email protected]>"
 license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
     koreader
 )
 sha256sums=(
-    df76e3f94d1b1d2e9cc386c8786bd414ccf47175a3f445ada06df134d1345a3e
+    0c8ca8705fa49dd10dc5359a86acdd1d16349c30d7dce166fe57f90112ec6c44
     SKIP
     SKIP
     SKIP

package/plato/package

@@ -5,18 +5,18 @@
 pkgnames=(plato)
 pkgdesc="Document reader"
 url=https://github.com/LinusCDE/plato
-pkgver=0.9.17-2
-timestamp=2021-05-02T14:39Z
+pkgver=0.9.25-2
+timestamp=2022-02-08T23:54Z
 section="readers"
 maintainer="Linus K. <[email protected]>"
 license=AGPL-3.0-or-later
 installdepends=(display jq)
 makedepends=(build:jq build:unzip build:wget)
 flags=(patch_rm2fb)
 
-image=rust:v2.1
-source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-10.zip")
-sha256sums=(25aae17979d9e259d228617eb26a0cc89a6251968b8fc355b8cde36fd6b26773)
+image=rust:v2.2.2
+source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-12.zip")
+sha256sums=(42e18e882e7e6853e299234a44eea9b9e3c4170076eec0577a0644dcf7005cf9)
 
 build() {
     # Fall back to system-wide config
@@ -36,6 +36,10 @@ build() {
     ./clean.sh
     ./build.sh
     ./dist.sh
+
+    # Patch wrapper script to have a process name consistent with the
+    # path of the symlink in /opt/bin
+    sed -i 's#exec ./plato#exec -a /opt/bin/plato ./plato#' dist/plato.sh
 }
 
 package() {

package/rmkit/changelog

@@ -1,3 +1,76 @@
+2022-01-29 raisjn <of.raisjn@arkose>
+	rpncalc:
+
+	* add 'back' button for erasing digits
+	* modifying how 'drop' works a tiny bit
+	* align push/drop, and tan/tanh, cos/cosh, sin/sinh buttons
+
+2022-01-27 raisjn <of.raisjn@arkose>
+
+	rmkit:
+
+	* rmkit went through a large refactoring, this updates all apps
+	* fix keyboard layout (swapped U and I keys originally)
+
+	dumbskull:
+
+	* add new game, "Dumbskull", which is a themed solitaire
+
+	genie:
+
+	* add palm rejection to genie
+
+	iago:
+
+	* add settings dialog (@aeneas) that allows snapping
+
+	mines:
+
+	* fix spurious crash when playing multiple games in a row
+
+	remux:
+
+	* add dialog_height/dialog_width options to remux.conf
+	* better memory analysis (of all processes)
+	* rm1: remove usb check that keeps it powered indefinitely
+
+	rpncalc:
+
+	* add new calculator, rpncalc
+	* add better spacing and layout
+	* add push after operation behavior (next input is on new stack element)
+
+	wordlet:
+
+	* add new game, "Wordlet", which is a wordle clone
+
+
+2021-12-29 raisjn <of.raisjn@arkose>
+
+	harmony:
+
+	* fix harmony not loading saved images
+
+	bufshot:
+
+	* fix bufshot to correctly recognize the tablet
+
+2021-12-17 raisjn <of.raisjn@arkose>
+
+	harmony:
+
+	* add `launch` command to remux
+
+	mines:
+
+	* fix pixmap display in minesweeper
+
+2021-11-29:
+
+	remux:
+
+	* add custom power management to remux that disables PM during xochitl
+
 2021-03-22 raisjn <of.raisjn@arkose>