Skip to content

Add SF3 (OGG Vorbis compressed) SoundFont support and Android 15+ compatibilty via 16KB ELF page alignment #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Von-Cheam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add SF3 (OGG Vorbis compressed) SoundFont support and Android 15+ compatibilty via 16KB ELF page alignment #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
lib = "0.3.0"
lib = "0.3.0-sf3"

agp = "8.7.3"
kotlin = "2.1.10"
Expand Down
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
5,584 changes: 5,584 additions & 0 deletions native/src/stb_vorbis.c
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions native/src/tsf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define TSF_IMPLEMENTATION
#include "stb_vorbis.c"
#include "tsf.h"

// stub
5 changes: 4 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
pluginManagement {
repositories {
google()
Expand All @@ -7,6 +6,10 @@ pluginManagement {
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
}

dependencyResolutionManagement {
repositories {
google()
Expand Down
13 changes: 7 additions & 6 deletions soundfont/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,14 @@ mavenPublishing {
}
}

// Sign with default plugin
// Sign with default plugin (only when signing env vars are present)
signing {
useInMemoryPgpKeys(
System.getenv("SIGNING_KEY"),
System.getenv("SIGNING_KEY_PASSWORD")
)
sign(publishing.publications)
val signingKey = System.getenv("SIGNING_KEY")
val signingPassword = System.getenv("SIGNING_KEY_PASSWORD")
if (signingKey != null && signingPassword != null) {
useInMemoryPgpKeys(signingKey, signingPassword)
sign(publishing.publications)
}

// Temporary workaround, see https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
tasks.withType<AbstractPublishToMaven>().configureEach {
Expand Down
2 changes: 2 additions & 0 deletions soundfont/src/androidMain/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ target_link_libraries(
mikroSoundFontJNI
${log-lib}
)

target_link_options(mikroSoundFontJNI PRIVATE "-Wl,-z,max-page-size=16384")
2 changes: 1 addition & 1 deletion soundfont/src/androidMain/cpp/mikro_sound_font_jni.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <jni.h>

#define TSF_IMPLEMENTATION

#include "stb_vorbis.c"
#include "tsf.h"

// Declare global tsf (TinySoundFont) object
Expand Down