1 files changed, 11 insertions, 6 deletions
diff --git a/src/utau/openutau/APKBUILD b/src/utau/openutau/APKBUILD
index c880dc4..6257b75 100644
--- a/src/utau/openutau/APKBUILD
+++ b/src/utau/openutau/APKBUILD
@@ -21,10 +21,10 @@ depends="dotnet8-runtime so:libgcompat.so.0 so:ld-linux-x86-64.so.2 so:libfontco
 
 # Docs say to use .NET 6, but thats testing repos only.
 # Bazel 8 and 9 remove required features for worldline for some reason.
-makedepends="dotnet8-sdk musl-dev zsh bazel7@testing linux-headers"
+makedepends="dotnet8-sdk musl-dev zsh bazel7@testing linux-headers gcompat-libdl2"
 
 install=""
-subpackages="${pkgname}-worldline"
+subpackages="${pkgname}-worldline ${pkgname}-onnxruntime"
 
 options="net !check !strip" # network needed for dotnet restore, no check due to laziness for now, dotnet dies with strip
 
@@ -36,6 +36,7 @@ source="${_reponame}-${_reporef}.tar.gz::${_repourl}/archive/${_reporef}.tar.gz
         openutau.desktop
         openutau.svg"
 builddir="${srcdir}/${_reponame}-${_reporef}"
+_outdir="${builddir}/OpenUtau/bin/${_buildtarget}"
 
 build() {
   cd "${builddir}"
@@ -53,8 +54,6 @@ build() {
 }
 
 package() {
-  _outdir="${builddir}/OpenUtau/bin/${_buildtarget}"
-
   # Install the main binary
   mkdir -p "${pkgdir}/usr/bin" "${pkgdir}/usr/lib/openutau"
   install -Dm755 "${_outdir}/OpenUtau" "${pkgdir}/usr/lib/openutau/OpenUtau"
@@ -65,8 +64,6 @@ package() {
   mkdir -p "${pkgdir}/usr/lib/openutau"
   install -Dm755 "${_outdir}/libHarfBuzzSharp.so" "${pkgdir}/usr/lib/openutau/libHarfBuzzSharp.so"
   install -Dm755 "${_outdir}/libSkiaSharp.so" "${pkgdir}/usr/lib/openutau/libSkiaSharp.so"
-  install -Dm755 "${_outdir}/libonnxruntime.so" "${pkgdir}/usr/lib/openutau/libonnxruntime.so"
-  ln -s "../../../lib/libgcompat.so.0" "${pkgdir}/usr/lib/openutau/libdl.so.2" # needed for libonnxruntime
 
   # when debugging:
   # tar caf "${pkgdir}/usr/lib/openutau/all.tar.gz" --directory="${_outdir}" .
@@ -76,8 +73,16 @@ package() {
 	install -Dm644 "${srcdir}/${pkgname}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
 }
 
+onnxruntime() {
+  pkgdesc="The onnxruntime library as provided by OpenUtau"
+  install_if="${pkgname}=${pkgver}-r${pkgrel}"
+  # options="!check !strip !tracedeps"
+  install -Dm755 "${_outdir}/libonnxruntime.so" "${subpkgdir}/usr/lib/openutau/libonnxruntime.so"
+}
+
 worldline() {
   pkgdesc="The WORLDLINE-R resampler for OpenUtau"
+  depends="so:libsdtc++.so.6 so:libgcc_s.so.1"
   install_if="${pkgname}=${pkgver}-r${pkgrel}"
   # TODO: consider moving these to /usr/lib/ directly
   install -Dm755 "${builddir}/cpp/bazel-bin/worldline/libworldline.so" "${subpkgdir}/usr/lib/openutau/libworldline.so"