Skip to content

Commit

Permalink
Update prefab dependencies. Again
Browse files Browse the repository at this point in the history
  • Loading branch information
@ViliusSutkus89
ViliusSutkus89 committed Nov 13, 2023
1 parent 36c76a1 commit ef92cc2
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 80 deletions.
16 changes: 12 additions & 4 deletions cairo/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
val portVersion = "1.18.0"

group = rootProject.group
version = "${portVersion}-beta-2"
version = "${portVersion}-beta-3"

plugins {
id("maven-publish")
Expand All @@ -16,11 +16,11 @@ plugins {

dependencies {
val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
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-3")
implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-2")
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")
// 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
Expand Down Expand Up @@ -59,6 +59,14 @@ tasks.prefabPackage {

licensePath.set("COPYING")

dependencies.set(mapOf(
"fontconfig" to "1",
"freetype" to "1",
"glib2" to "1",
"pixman" to "1",
"libpng" to "1",
))

modules {
create("cairo") {
static.set(project.findProperty("libraryType") == "static")
Expand Down
10 changes: 8 additions & 2 deletions fontconfig/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
val portVersion = "2.14.2"

group = rootProject.group
version = "${portVersion}-beta-2"
version = "${portVersion}-beta-3"

plugins {
id("maven-publish")
Expand All @@ -16,7 +16,7 @@ plugins {

dependencies {
val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
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")
}
Expand Down Expand Up @@ -68,6 +68,12 @@ tasks.prefabPackage {

licensePath.set("COPYING")

dependencies.set(mapOf(
"libexpat" to "1",
"freetype" to "1",
"libpng" to "1",
))

modules {
create("fontconfig") {
static.set(project.findProperty("libraryType") == "static")
Expand Down
78 changes: 48 additions & 30 deletions fontforge/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ group = rootProject.group
// Hardcode a list of available versions
val portVersion = when(project.findProperty("packageVersion")) {
"20170731" -> {
version = "20170731-beta-3"
version = "20170731-beta-4"
"20170731"
}
"20200314" -> {
version = "20200314-beta-3"
version = "20200314-beta-4"
"20200314"
}
else /* "20230101" */ -> {
version = "20230101-beta-3"
version = "20230101-beta-4"
"20230101"
}
}
Expand All @@ -39,26 +39,26 @@ val minSupportedSdk = when (portVersion) {

dependencies {
val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
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-3")
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-3")
implementation("com.viliussutkus89.ndk.thirdparty:libxml2${ndkVersionSuffix}-static:2.11.5-beta-4")
implementation("com.viliussutkus89.ndk.thirdparty:spiro${ndkVersionSuffix}-static:20221101-beta-2")

if (minSupportedSdk >= 21)
implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-2")
implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.51.0-beta-3")
else
implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.49.4-beta-2")
implementation("com.viliussutkus89.ndk.thirdparty:pango${ndkVersionSuffix}-static:1.49.4-beta-3")

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-3")
implementation("com.viliussutkus89.ndk.thirdparty:libtiff${ndkVersionSuffix}-static:4.6.0-beta-4")
}

// -- Could NOT find GIF (missing: GIF_LIBRARY GIF_INCLUDE_DIR)
Expand Down Expand Up @@ -302,39 +302,57 @@ when (portVersion) {
}
}


tasks.prefabPackage {
version.set(CMakeCompatibleVersion.parse(portVersion))

licensePath.set("LICENSE")

dependencies.set(mutableMapOf(
"cairo" to "1",
"freetype" to "1",
"proxy-libintl" to "1",
"glib2" to "1",
"libjpeg-turbo" to "1",
"libtool" to "1",
"libpng" to "1",
"libuninameslist" to "1",
"libxml2" to "1",
"spiro" to "1",
"pango" to "1",
).apply {
if (portVersion != "20170731") {
put("libtiff", "1")
}
})

modules {
val isStatic = project.findProperty("libraryType") == "static"
when (portVersion) {
"20170731" -> {
create("fontforge") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
dependencies.set(listOf(
":gioftp",
":gutils",
":gunicode",
"z",
"m",
"//libtool:tool",
"//libtool:ltdl",
"//libjpeg-turbo:jpeg",
"//libpng:png16",
"//spiro:spiro",
"//libuninameslist:uninameslist",
"//freetype:freetype",
"//proxy-libintl:intl",
"//glib2:gio-2.0",
"//libxml2:xml-2.0",
"//pango:pango",
"//libxml2:xml2",
"//pango:pango-1.0",
"//cairo:cairo",
))
}
create("fontforgeexe") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
dependencies.set(listOf(
":fontforge",
Expand All @@ -343,50 +361,50 @@ tasks.prefabPackage {
":gunicode",
"z",
"m",
"//libtool:tool",
"//libtool:ltdl",
"//libjpeg-turbo:jpeg",
"//libpng:png16",
"//spiro:spiro",
"//libuninameslist:uninameslist",
"//freetype:freetype",
"//proxy-libintl:intl",
"//glib2:gio-2.0",
"//libxml2:xml-2.0",
"//pango:pango",
"//libxml2:xml2",
"//pango:pango-1.0",
"//cairo:cairo",
))
}
create("gioftp") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
}
create("gunicode") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
}
create("gutils") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
}
}
"20200314" -> {
// @TODO: this could be wrong, because no pkg-config.pc to verify
create("fontforge") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
dependencies.set(listOf(
"z",
"m",
"//libtool:tool",
"//libtool:ltdl",
"//libjpeg-turbo:jpeg",
"//libpng:png16",
"//spiro:spiro",
"//libuninameslist:uninameslist",
"//freetype:freetype",
"//proxy-libintl:intl",
"//glib2:gio-2.0",
"//libxml2:xml-2.0",
"//pango:pango",
"//libxml2:xml2",
"//pango:pango-1.0",
"//cairo:cairo",
"//libtiff:tiff",
))
Expand All @@ -395,21 +413,21 @@ tasks.prefabPackage {
"20230101" -> {
// @TODO: this could be wrong, because no pkg-config.pc to verify
create("fontforge") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
includesPerAbi.set(true)
dependencies.set(listOf(
"z",
"m",
"//libtool:tool",
"//libtool:ltdl",
"//libjpeg-turbo:jpeg",
"//libpng:png16",
"//spiro:spiro",
"//libuninameslist:uninameslist",
"//freetype:freetype",
"//proxy-libintl:intl",
"//glib2:gio-2.0",
"//libxml2:xml-2.0",
"//pango:pango",
"//libxml2:xml2",
"//pango:pango-1.0",
"//cairo:cairo",
"//libtiff:tiff",
))
Expand Down
4 changes: 3 additions & 1 deletion freetype/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
val portVersion = "2.13.2"

group = rootProject.group
version = "${portVersion}-beta-4"
version = "${portVersion}-beta-5"

plugins {
id("maven-publish")
Expand Down Expand Up @@ -42,6 +42,8 @@ tasks.prefabPackage {

licensePath.set("LICENSE.TXT")

dependencies.set(mapOf("libpng" to "1"))

modules {
create("freetype") {
static.set(project.findProperty("libraryType") == "static")
Expand Down
9 changes: 8 additions & 1 deletion glib2/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
val portVersion = "2.78.1"

group = rootProject.group
version = "${portVersion}-beta-3"
version = "${portVersion}-beta-4"

plugins {
id("maven-publish")
Expand Down Expand Up @@ -120,6 +120,13 @@ tasks.prefabPackage {

licensePath.set("COPYING")

dependencies.set(mapOf(
"libiconv" to "1",
"proxy-libintl" to "1",
"libffi" to "1",
"pcre2" to "1",
))

modules {
val isStatic = project.findProperty("libraryType") == "static"
create("glib-2.0") {
Expand Down
26 changes: 17 additions & 9 deletions harfbuzz/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.jvm.tasks.Jar
val portVersion = "8.2.2"

group = rootProject.group
version = "${portVersion}-beta-2"
version = "${portVersion}-beta-3"

plugins {
id("maven-publish")
Expand All @@ -16,10 +16,10 @@ plugins {

dependencies {
val ndkVersionSuffix = rootProject.extra.get("ndkVersionSuffix")
implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}-static:1.18.0-beta-2")
implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}-static:2.14.2-beta-2")
implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}-static:2.13.2-beta-4")
implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}-static:2.78.1-beta-3")
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")
}

ndkPorts {
Expand Down Expand Up @@ -61,17 +61,25 @@ tasks.prefabPackage {

licensePath.set("COPYING")

dependencies.set(mapOf(
"cairo" to "1",
"fontconfig" to "1",
"freetype" to "1",
"glib2" to "1",
))

modules {
val isStatic = project.findProperty("libraryType") == "static"
create("harfbuzz") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
dependencies.set(listOf(
"m",
"//freetype:freetype",
"//glib2:glib-2.0",
))
}
create("harfbuzz-cairo") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
dependencies.set(listOf(
"m",
":harfbuzz",
Expand All @@ -81,15 +89,15 @@ tasks.prefabPackage {
))
}
create("harfbuzz-gobject") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
dependencies.set(listOf(
":harfbuzz",
"//glib2:glib-2.0",
"//glib2:gobject-2.0",
))
}
create("harfbuzz-subset") {
static.set(project.findProperty("libraryType") == "static")
static.set(isStatic)
dependencies.set(listOf(
"m",
":harfbuzz",
Expand Down
Loading

0 comments on commit ef92cc2

Please sign in to comment.