build: use jni-utils for platform detections

Author: silenium-dev

.github/actions/deploy-ubuntu/action.yml

@@ -317,9 +317,9 @@ runs:
     - name: Publish release
       shell: bash
       if: "github.event_name == 'release'"
-      run: ./gradlew build publish -Pnative.extension=${{ matrix.ext }} -Pdeploy.version=${{ github.event.release.tag_name }} --console=plain --info --configure-on-demand --parallel --build-cache
+      run: ./gradlew build publish -Pffmpeg.gpl=${{ matrix.gpl }} -Pdeploy.version=${{ github.event.release.tag_name }} --console=plain --info --configure-on-demand --parallel --build-cache
 
     - name: Publish snapshot
       shell: bash
       if: "github.event_name != 'release'"
-      run: ./gradlew build publish -Pnative.extension=${{ matrix.ext }} --console=plain --info --configure-on-demand --parallel --build-cache
+      run: ./gradlew build publish -Pffmpeg.gpl=${{ matrix.gpl }} --console=plain --info --configure-on-demand --parallel --build-cache

.github/workflows/ffmpeg.yml

@@ -26,63 +26,63 @@ jobs:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  android-arm64:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  android-x86:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  android-x86_64:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  linux-armhf:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  linux-arm64:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  linux-ppc64le:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
   #  linux-x86:
   #    runs-on: ubuntu-22.04
   #    strategy:
   #      matrix:
-  #        ext: ["", -gpl]
+  #        gpl: ["false", "true"]
   #    steps:
   #      - uses: actions/checkout@v4
   #      - uses: ./.github/actions/deploy-ubuntu
@@ -100,31 +100,31 @@ jobs:
 #    runs-on: macos-12
 #    strategy:
 #      matrix:
-#        ext: ["", -gpl]
+#        gpl: ["false", "true"]
 #    steps:
 #      - uses: actions/checkout@v4
 #      - uses: ./.github/actions/deploy-macosx
 #  macosx-x86_64:
 #    runs-on: macos-12
 #    strategy:
 #      matrix:
-#        ext: ["", -gpl]
+#        gpl: ["false", "true"]
 #    steps:
 #      - uses: actions/checkout@v4
 #      - uses: ./.github/actions/deploy-macosx
 #  windows-x86:
 #    runs-on: windows-2019
 #    strategy:
 #      matrix:
-#        ext: ["", -gpl]
+#        gpl: ["false", "true"]
 #    steps:
 #      - uses: actions/checkout@v4
 #      - uses: ./.github/actions/deploy-windows
 #  windows-x86_64:
 #    runs-on: windows-2019
 #    strategy:
 #      matrix:
-#        ext: ["", -gpl]
+#        gpl: ["false", "true"]
 #    steps:
 #      - uses: actions/checkout@v4
 #      - uses: ./.github/actions/deploy-windows

.gitignore

@@ -1,7 +1,7 @@
 .idea/
 .gradle/
 .kotlin/
-/build/
+build/
 local.properties
 /downloads/
 *.iml

build.gradle.kts

@@ -1,59 +1,70 @@
-import org.gradle.internal.extensions.stdlib.capitalized
+import dev.silenium.libs.jni.NativePlatform
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
+buildscript {
+    repositories {
+        maven("https://reposilite.silenium.dev/releases") {
+            name = "silenium-releases"
+        }
+    }
+    dependencies {
+        classpath(libs.jni.utils)
+    }
+}
 
 plugins {
-    base
+    alias(libs.plugins.kotlin)
     `maven-publish`
 }
 
-group = "dev.silenium.libs"
+group = "dev.silenium.libs.ffmpeg"
 version = findProperty("deploy.version") as String? ?: "0.0.0-SNAPSHOT"
 
-val platformTxt = layout.buildDirectory.file("platform.txt").apply {
-    get().asFile.parentFile.mkdirs()
+repositories {
+    mavenCentral()
+    maven("https://reposilite.silenium.dev/releases") {
+        name = "silenium-releases"
+    }
 }
-exec {
-    commandLine(
-        "bash",
-        "-c",
-        "bash " + layout.projectDirectory.file("detect-platform.sh").asFile.absolutePath + " > " + platformTxt.get().asFile.absolutePath,
-    )
-    workingDir(layout.projectDirectory.asFile)
-}.assertNormalExitValue()
-val platform: String = platformTxt.get().asFile.readText().trim()
-val platformExtension = findProperty("native.extension") as String? ?: ""
-logger.lifecycle("Building for platform: $platform${platformExtension}")
 
-val compileDir = layout.projectDirectory.dir("ffmpeg/cppbuild/${platform}${platformExtension}")
+dependencies {
+    implementation(libs.jni.utils)
+}
+
+val withGPL: Boolean = findProperty("ffmpeg.gpl")?.toString()?.toBoolean() ?: false
+val platformExtension = "-gpl".takeIf { withGPL }.orEmpty()
+val platform = NativePlatform.platform(platformExtension)
 
 val compileNative by tasks.registering(Exec::class) {
     commandLine(
         "bash",
         layout.projectDirectory.file("cppbuild.sh").asFile.absolutePath,
-        "-extension", platformExtension,
-        "install",
+        "-extension", platform.extension,
+        "-platform", platform.osArch,
+        "install", "ffmpeg",
     )
     workingDir(layout.projectDirectory.asFile)
-    environment("PROJECTS" to "ffmpeg")
 
     inputs.property("platform", platform)
+    inputs.files(layout.projectDirectory.files("cppbuild.sh"))
+    inputs.files(layout.projectDirectory.files("detect-platform.sh"))
+    inputs.files(layout.projectDirectory.files("ffmpeg/cppbuild.sh"))
     inputs.files(layout.projectDirectory.files("ffmpeg/*.patch"))
     inputs.files(layout.projectDirectory.files("ffmpeg/*.diff"))
-    inputs.files(layout.projectDirectory.files("ffmpeg/cppbuild.sh"))
-    outputs.dir(compileDir)
+    outputs.dir(layout.projectDirectory.dir("ffmpeg/cppbuild/${platform}"))
     outputs.cacheIf { true }
 }
 
-tasks.build {
-    dependsOn(compileNative)
-}
+tasks.processResources {
+    val platform = NativePlatform.platform(platformExtension)
 
-val bundleJar by tasks.registering(Jar::class) {
     from(compileNative.get().outputs.files) {
         include("lib/*.so")
         include("lib/*.dll")
         include("lib/*.dylib")
         eachFile {
-            path = "natives/$platform/${this.name}"
+            path = "natives/$platform/$name"
         }
         into("natives/$platform/")
     }
@@ -68,12 +79,24 @@ val zipBuild by tasks.registering(Zip::class) {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+        languageVersion = KotlinVersion.KOTLIN_1_7
+    }
+    jvmToolchain(8)
+}
+
+java {
+    withSourcesJar()
+}
+
 publishing {
     publications {
-        create<MavenPublication>("native${platform.split("-").joinToString("") { it.capitalized() }}") {
-            artifact(bundleJar)
+        create<MavenPublication>("native${platform.capitalized}") {
+            from(components["java"])
             artifact(zipBuild)
-            artifactId = "ffmpeg-natives-${platform}${platformExtension}"
+            artifactId = "ffmpeg-natives-${platform}"
         }
     }
 

gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+kotlin = "2.0.0"
+jni-utils = "0.1.2"
+
+[libraries]
+jni-utils = { group = "dev.silenium.libs.jni", name = "jni-utils", version.ref = "jni-utils" }
+
+[plugins]
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "ffmpeg-static"

src/main/kotlin/dev/silenium/libs/ffmpeg/FFmpeg.kt

@@ -0,0 +1,32 @@
+package dev.silenium.libs.ffmpeg
+
+import dev.silenium.libs.jni.NativeLoader
+import dev.silenium.libs.jni.NativePlatform
+
+object FFmpeg {
+    private val libs = listOf(
+        "avcodec",
+        "avdevice",
+        "avfilter",
+        "avformat",
+        "avutil",
+        "postproc",
+        "swresample",
+        "swscale",
+    )
+    private var loaded = false
+
+    @Synchronized
+    fun ensureLoaded(withGPL: Boolean = false) {
+        if (loaded) return
+
+        libs.forEach {
+            NativeLoader.loadLibraryFromClasspath(
+                baseName = it,
+                platform = NativePlatform.platform("-gpl".takeIf { withGPL }.orEmpty()),
+            )
+        }
+
+        loaded = true
+    }
+}