Add shared-with-shared-deps libraryType. Update GLib to 2.78.3, Harfb…

…uzz to 8.3.0, LCMS2 to 2.16, libxml2 to 2.12.3 Every single package needs to be re-published for the new library type, updating versions at the same time
ViliusSutkus89 · Dec 19, 2023 · ab12954 · ab12954
1 parent 3b6d537
commit ab12954
Show file tree

Hide file tree

Showing 38 changed files with 166 additions and 131 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,9 +26,9 @@ jobs:
           - "26.1.10909125"
           - "25.2.9519653"
         libraryType:
-          - "shared"
           - "static"
-
+          - "shared"
+          - "shared-with-shared-deps"
     steps:
       - uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,8 +48,9 @@ jobs:
           - "26.1.10909125"
           - "25.2.9519653"
         libraryType:
-          - "shared"
           - "static"
+          - "shared"
+          - "shared-with-shared-deps"
     steps:
       - uses: actions/setup-java@v3
         with:

diff --git a/README.md b/README.md
@@ -15,8 +15,10 @@ Each port is built on a matrix of NDK versions and library type.
 
 - com.viliussutkus89.ndk.thirdparty:libfoo-ndk26-static:0.4.1
 - com.viliussutkus89.ndk.thirdparty:libfoo-ndk26-shared:0.4.1
+- com.viliussutkus89.ndk.thirdparty:libfoo-ndk26-shared-with-shared-deps:0.4.1
 - com.viliussutkus89.ndk.thirdparty:libfoo-ndk25-static:0.4.1
 - com.viliussutkus89.ndk.thirdparty:libfoo-ndk25-shared:0.4.1
+- com.viliussutkus89.ndk.thirdparty:libfoo-ndk25-shared-with-shared-deps:0.4.1
 
 #### Min SDK Version:
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,12 +14,19 @@ buildscript {
         set("ndkVersionSuffix", "-ndk${majorNdkVersion}")
         set("minSdkSupportedByNdk", minSdkSupportedByNdk)
 
-        if (project.findProperty("libraryType") == "shared") {
-            set("libraryType", "shared")
-            set("libraryTypeSuffix", "-shared")
-        } else {
-            set("libraryType", "static")
-            set("libraryTypeSuffix", "-static")
+        when (project.findProperty("libraryType")) {
+            "shared" -> {
+                set("libraryType", "shared")
+                set("libraryTypeSuffix", "-shared")
+            }
+            "shared-with-shared-deps" -> {
+                set("libraryType", "shared-with-shared-deps")
+                set("libraryTypeSuffix", "-shared-with-shared-deps")
+            }
+            /* static */ else -> {
+                set("libraryType", "static")
+                set("libraryTypeSuffix", "-static")
+            }
         }
     }
 }

diff --git a/buildSrc/src/main/kotlin/com/android/ndkports/PortTask.kt b/buildSrc/src/main/kotlin/com/android/ndkports/PortTask.kt
@@ -23,10 +23,10 @@ abstract class PortTask(objects: ObjectFactory) : DefaultTask() {
     @get:Input
     val libraryType: Property<LibraryType> =
         objects.property(LibraryType::class.java).convention(
-            if (project.findProperty("libraryType") as String == "shared") {
-                LibraryType.Shared
-            } else {
+            if (project.findProperty("libraryType") as String == "static") {
                 LibraryType.Static
+            } else {
+                LibraryType.Shared
             }
         )
 

diff --git a/cairo/build.gradle.kts b/cairo/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "1.18.0"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-4"
 
 plugins {
     id("maven-publish")
@@ -16,11 +16,14 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:pixman${ndkVersionSuffix}-static:0.42.2-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
-    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-3")
+    val libraryTypeSuffix = rootProject.extra.get("libraryTypeSuffix")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}${libraryTypeSuffix}:2.13.2-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}${libraryTypeSuffix}:1.6.40-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:pixman${ndkVersionSuffix}${libraryTypeSuffix}:0.42.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}${libraryTypeSuffix}:2.78.3-beta-1")
+    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}${libraryTypeSuffix}:2.14.2-beta-4")
+
+    // Test dependencies
 //    Run-time dependency libspectre found: NO (tried pkgconfig and cmake) - CAIRO_CAN_TEST_PS_SURFACE
 //    Run-time dependency poppler-glib found: NO (tried pkgconfig and cmake) - CAIRO_CAN_TEST_PDF_SURFACE
 //    Run-time dependency librsvg-2.0 found: NO (tried pkgconfig and cmake) - CAIRO_CAN_TEST_SVG_SURFACE

diff --git a/fontconfig/build.gradle.kts b/fontconfig/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.14.2"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-4"
 
 plugins {
     id("maven-publish")
@@ -16,9 +16,10 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:libexpat${ndkVersionSuffix}-static:2.5.0-beta-3")
+    val libraryTypeSuffix = rootProject.extra.get("libraryTypeSuffix")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}${libraryTypeSuffix}:2.13.2-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}${libraryTypeSuffix}:1.6.40-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:libexpat${ndkVersionSuffix}${libraryTypeSuffix}:2.5.0-beta-4")
 }
 
 ndkPorts {

diff --git a/fontforge/build.gradle.kts b/fontforge/build.gradle.kts
@@ -9,15 +9,15 @@ group = rootProject.group
 // Hardcode a list of available versions
 val portVersion = when(project.findProperty("packageVersion")) {
     "20170731" -> {
-        version = "20170731-beta-6"
+        version = "20170731-beta-7"
         "20170731"
     }
     "20200314" -> {
-        version = "20200314-beta-10"
+        version = "20200314-beta-11"
         "20200314"
     }
     else /* "20230101" */ -> {
-        version = "20230101-beta-10"
+        version = "20230101-beta-11"
         "20230101"
     }
 }
@@ -36,26 +36,27 @@ val usingOpenLibm = portVersion != "20170731" && minSupportedSdk < 24
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:proxy-libintl${ndkVersionSuffix}-static:0.4.1.1")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
-    implementation("com.viliussutkus89.ndk.thirdparty:libjpeg-turbo${ndkVersionSuffix}-static:3.0.1-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:libtool${ndkVersionSuffix}-static:2.4.6-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:libuninameslist${ndkVersionSuffix}-static:20230916-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}-static:2.11.5-beta-4")
-    implementation("com.viliussutkus89.ndk.thirdparty:spiro${ndkVersionSuffix}-static:20221101-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-4")
+    val libraryTypeSuffix = rootProject.extra.get("libraryTypeSuffix")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}${libraryTypeSuffix}:1.18.0-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}${libraryTypeSuffix}:2.13.2-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:proxy-libintl${ndkVersionSuffix}${libraryTypeSuffix}:0.4.1.2")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}${libraryTypeSuffix}:2.78.3-beta-1")
+    implementation("com.viliussutkus89.ndk.thirdparty:libjpeg-turbo${ndkVersionSuffix}${libraryTypeSuffix}:3.0.1-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:libtool${ndkVersionSuffix}${libraryTypeSuffix}:2.4.6-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}${libraryTypeSuffix}:1.6.40-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:libuninameslist${ndkVersionSuffix}${libraryTypeSuffix}:20230916-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}${libraryTypeSuffix}:2.12.3-beta-1")
+    implementation("com.viliussutkus89.ndk.thirdparty:spiro${ndkVersionSuffix}${libraryTypeSuffix}:20221101-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}${libraryTypeSuffix}:1.51.0-beta-5")
 
     if (portVersion != "20170731") {
         // libfontforge checks for TIFFRewriteField , which was deprecated in libtiff-4
         // http://www.simplesystems.org/libtiff/v4.0.0.html
-        implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-4")
+        implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}${libraryTypeSuffix}:4.6.0-beta-5")
     }
 
     if (usingOpenLibm) {
-        implementation("com.viliussutkus89.ndk.thirdparty:openlibm${ndkVersionSuffix}-static:0.8.1-beta-1")
+        implementation("com.viliussutkus89.ndk.thirdparty:openlibm${ndkVersionSuffix}${libraryTypeSuffix}:0.8.1-beta-2")
     }
 
     // -- Could NOT find GIF (missing: GIF_LIBRARY GIF_INCLUDE_DIR)

diff --git a/freetype/build.gradle.kts b/freetype/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "2.13.2"
 
 group = rootProject.group
-version = "${portVersion}-beta-5"
+version = "${portVersion}-beta-6"
 
 plugins {
     id("maven-publish")
@@ -16,7 +16,8 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}-static:1.6.40-beta-5")
+    val libraryTypeSuffix = rootProject.extra.get("libraryTypeSuffix")
+    implementation("com.viliussutkus89.ndk.thirdparty:libpng${ndkVersionSuffix}${libraryTypeSuffix}:1.6.40-beta-6")
 
     // Library bz2 found: NO
     // Run-time dependency harfbuzz found: NO (tried pkgconfig and cmake)

diff --git a/fribidi/build.gradle.kts b/fribidi/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "1.0.13"
 
 group = rootProject.group
-version = "${portVersion}-beta-2"
+version = "${portVersion}-beta-3"
 
 plugins {
     id("maven-publish")
@@ -55,10 +55,6 @@ publishing {
             artifactId += rootProject.extra.get("libraryTypeSuffix")
             artifact(packageSources)
             pom {
-                scm {
-                    url.set("https://github.com/ViliusSutkus89/ndkports")
-                    connection.set("scm:git:https://github.com/ViliusSutkus89/ndkports.git")
-                }
                 name.set("GNU FriBidi")
                 description.set("The Free Implementation of the Unicode Bidirectional Algorithm.")
                 url.set("https://github.com/fribidi/fribidi")
@@ -127,6 +123,10 @@ publishing {
                         email.set("[email protected]")
                     }
                 }
+                scm {
+                    url.set("https://github.com/ViliusSutkus89/ndkports")
+                    connection.set("scm:git:https://github.com/ViliusSutkus89/ndkports.git")
+                }
             }
         }
     }

diff --git a/glib2/build.gradle.kts b/glib2/build.gradle.kts
@@ -3,10 +3,10 @@ import com.android.ndkports.CMakeCompatibleVersion
 import com.android.ndkports.PrefabSysrootPlugin
 import org.gradle.jvm.tasks.Jar
 
-val portVersion = "2.78.1"
+val portVersion = "2.78.3"
 
 group = rootProject.group
-version = "${portVersion}-beta-4"
+version = "${portVersion}-beta-1"
 
 plugins {
     id("maven-publish")
@@ -16,10 +16,11 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:libiconv${ndkVersionSuffix}-static:1.17-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:proxy-libintl${ndkVersionSuffix}-static:0.4.1.1")
-    implementation("com.viliussutkus89.ndk.thirdparty:libffi${ndkVersionSuffix}-static:3.4.4-beta-2")
-    implementation("com.viliussutkus89.ndk.thirdparty:pcre2${ndkVersionSuffix}-static:10.42-beta-3")
+    val libraryTypeSuffix = rootProject.extra.get("libraryTypeSuffix")
+    implementation("com.viliussutkus89.ndk.thirdparty:libiconv${ndkVersionSuffix}${libraryTypeSuffix}:1.17-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:proxy-libintl${ndkVersionSuffix}${libraryTypeSuffix}:0.4.1.2")
+    implementation("com.viliussutkus89.ndk.thirdparty:libffi${ndkVersionSuffix}${libraryTypeSuffix}:3.4.4-beta-3")
+    implementation("com.viliussutkus89.ndk.thirdparty:pcre2${ndkVersionSuffix}${libraryTypeSuffix}:10.42-beta-4")
 }
 
 ndkPorts {
@@ -199,18 +200,18 @@ publishing {
                 licenses {
                     license {
                         name.set("LGPL-2.1-or-later")
-                        url.set("https://gitlab.gnome.org/GNOME/glib/-/raw/2.78.1/COPYING")
+                        url.set("https://gitlab.gnome.org/GNOME/glib/-/raw/${portVersion}/COPYING")
                         distribution.set("repo")
                     }
                     license {
                         name.set("LGPL-2.1-or-later")
-                        url.set("https://gitlab.gnome.org/GNOME/glib/-/raw/2.78.1/LICENSES/LGPL-2.1-or-later.txt")
+                        url.set("https://gitlab.gnome.org/GNOME/glib/-/raw/${portVersion}/LICENSES/LGPL-2.1-or-later.txt")
                         distribution.set("repo")
                     }
                 }
                 developers {
                     // Developer list obtained from:
-                    // https://gitlab.gnome.org/GNOME/glib/-/raw/2.78.1/docs/CODEOWNERS
+                    // https://gitlab.gnome.org/GNOME/glib/-/raw/2.78.3/docs/CODEOWNERS
                     developer {
                         id.set("pwithnall")
                     }

diff --git a/glib2/glib-2.78.1.tar.xz b/glib2/glib-2.78.1.tar.xz
diff --git a/glib2/glib-2.78.3.tar.xz b/glib2/glib-2.78.3.tar.xz
diff --git a/graphite2/build.gradle.kts b/graphite2/build.gradle.kts
@@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
 val portVersion = "1.3.14"
 
 group = rootProject.group
-version = "${portVersion}-beta-2"
+version = "${portVersion}-beta-3"
 
 plugins {
     id("maven-publish")

diff --git a/harfbuzz/build.gradle.kts b/harfbuzz/build.gradle.kts
@@ -3,10 +3,10 @@ import com.android.ndkports.MesonPortTask
 import com.android.ndkports.PrefabSysrootPlugin
 import org.gradle.jvm.tasks.Jar
 
-val portVersion = "8.2.2"
+val portVersion = "8.3.0"
 
 group = rootProject.group
-version = "${portVersion}-beta-3"
+version = "${portVersion}-beta-1"
 
 plugins {
     id("maven-publish")
@@ -16,10 +16,11 @@ plugins {
 
 dependencies {
     val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
-    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-3")
-    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-5")
-    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-4")
+    val libraryTypeSuffix = rootProject.extra.get("libraryTypeSuffix")
+    implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}${libraryTypeSuffix}:1.18.0-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}${libraryTypeSuffix}:2.14.2-beta-4")
+    implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}${libraryTypeSuffix}:2.13.2-beta-6")
+    implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}${libraryTypeSuffix}:2.78.3-beta-1")
 }
 
 ndkPorts {
@@ -126,29 +127,29 @@ publishing {
                 licenses {
                     license {
                         name.set("Old MIT")
-                        url.set("https://github.com/harfbuzz/harfbuzz/blob/3.2.0/COPYING")
+                        url.set("https://github.com/harfbuzz/harfbuzz/blob/${portVersion}/COPYING")
                         distribution.set("repo")
                     }
                     license {
                         name.set("OFL-1.1")
-                        url.set("https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.2.2/test/COPYING")
+                        url.set("https://raw.githubusercontent.com/harfbuzz/harfbuzz/${portVersion}/test/COPYING")
                         distribution.set("repo")
                     }
                     license {
                         name.set("Apache-2.0")
-                        url.set("https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.2.2/test/shape/data/aots/COPYING")
+                        url.set("https://raw.githubusercontent.com/harfbuzz/harfbuzz/${portVersion}/test/shape/data/aots/COPYING")
                         distribution.set("repo")
                     }
                     license {
                         name.set("Apache-2.0")
-                        url.set("https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.2.2/test/shape/data/text-rendering-tests/COPYING")
+                        url.set("https://raw.githubusercontent.com/harfbuzz/harfbuzz/${portVersion}/test/shape/data/text-rendering-tests/COPYING")
                         distribution.set("repo")
                     }
                 }
                 developers {
                     // Developer list obtained from:
-                    // https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.2.2/AUTHORS
-                    // https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.2.2/THANKS
+                    // https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.3.0/AUTHORS
+                    // https://raw.githubusercontent.com/harfbuzz/harfbuzz/8.3.0/THANKS
                     developer {
                         name.set("Behdad Esfahbod")
                     }

diff --git a/harfbuzz/harfbuzz-8.2.2.tar.xz → harfbuzz/harfbuzz-8.3.0.tar.xz b/harfbuzz/harfbuzz-8.2.2.tar.xz → harfbuzz/harfbuzz-8.3.0.tar.xz