update to 1.1.4 and move to llvm/22

This commit is contained in:
robert
2026-06-10 07:48:53 +00:00
parent c99f6d78db
commit c552bd7fae
5 changed files with 27 additions and 18 deletions
+7 -6
View File
@@ -4,11 +4,11 @@ COMMENT = open reimplementation of Google's Widevine CDM
GH_ACCOUNT = tchebb
GH_PROJECT = openwv
GH_TAGNAME = v1.1.3
REVISION = 2
GH_TAGNAME = v1.1.4
# Rust crates downloaded via git
AUTOCXX = 1fca5acd26f533576f98da45075d5498a1731d92
AUTOCXX = cef6d9e9d2ad98daefa0eccef4a79dbfa1f175d2
AUTOCXX_BINDGEN = 2ed5c81765a6b3f59c775d4425ad06815dbdba5c
# Chromium CDM headers
CDM = 9920660ea0162f88c44a648de177e6f8cb976d07
@@ -16,7 +16,8 @@ CDM = 9920660ea0162f88c44a648de177e6f8cb976d07
DISTFILES.a += chromium-cdm-${CDM}.tar.gz
SITES.a += https://nerd.hu/distfiles/
DIST_TUPLE += github tchebb autocxx ${AUTOCXX} ../autocxx
DIST_TUPLE += github tchebb autocxx ${AUTOCXX} autocxx
DIST_TUPLE += github tchebb rust-bindgen ${AUTOCXX_BINDGEN} autocxx-bindgen
CATEGORIES = multimedia
@@ -34,9 +35,9 @@ MODULES = devel/cargo
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
BUILD_DEPENDS += devel/llvm/19
BUILD_DEPENDS += devel/llvm/22
MAKE_ENV += LIBCLANG_PATH=${LOCALBASE}/llvm19/lib
MAKE_ENV += LIBCLANG_PATH=${LOCALBASE}/llvm22/lib
.if ${MACHINE_ARCH} == "aarch64"
TARGET = arm64
-2
View File
@@ -5,7 +5,6 @@ MODCARGO_CRATES += anyhow 1.0.99 # MIT OR Apache-2.0
MODCARGO_CRATES += aquamarine 0.1.12 # MIT
MODCARGO_CRATES += atty 0.2.14 # MIT
MODCARGO_CRATES += autocfg 1.5.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += autocxx-bindgen 0.73.0 # BSD-3-Clause
MODCARGO_CRATES += base16ct 0.2.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += base64ct 1.8.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += bitflags 2.9.2 # MIT OR Apache-2.0
@@ -63,7 +62,6 @@ MODCARGO_CRATES += indoc 1.0.9 # MIT OR Apache-2.0
MODCARGO_CRATES += inout 0.2.0-rc.5 # MIT OR Apache-2.0
MODCARGO_CRATES += itertools 0.9.0 # MIT/Apache-2.0
MODCARGO_CRATES += itertools 0.10.5 # MIT/Apache-2.0
MODCARGO_CRATES += itertools 0.13.0 # MIT OR Apache-2.0
MODCARGO_CRATES += itertools 0.14.0 # MIT OR Apache-2.0
MODCARGO_CRATES += itoa 1.0.15 # MIT OR Apache-2.0
MODCARGO_CRATES += js-sys 0.3.77 # MIT OR Apache-2.0
+6 -8
View File
@@ -5,7 +5,6 @@ SHA256 (cargo/anyhow-1.0.99.tar.gz) = sGdKHd7stwGXeB6UXeSzuP+2H6k5pVl7z0hQNzdmMQ
SHA256 (cargo/aquamarine-0.1.12.tar.gz) = qUHDlwhHjo7qOSQ7WYPxxC0nF7NiDukfSlIRX9AqxD8=
SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug=
SHA256 (cargo/autocfg-1.5.0.tar.gz) = wIYG+MPL9M5uyOKPsAFKLAhnCP6VTqqIU4SmFlFy5+g=
SHA256 (cargo/autocxx-bindgen-0.73.0.tar.gz) = 7Kr4TZzxp3JAnAq9rH0kd6Mf2JDb32Btj2hNxgEpqpQ=
SHA256 (cargo/base16ct-0.2.0.tar.gz) = TH8C1Opl8sGFMIn/2NJ4e9vGPeLw0p3tvPjM36DM1M8=
SHA256 (cargo/base64ct-1.8.0.tar.gz) = VSSLR7DK8FRveYiQZYh3mYHEO7G8nQxECHJ4+AzbRLo=
SHA256 (cargo/bitflags-2.9.2.tar.gz) = amW1Rasx1ofP9SiZ1IkIVf7EWetq/g2mQXuKGNqHqik=
@@ -62,7 +61,6 @@ SHA256 (cargo/indexmap-2.10.0.tar.gz) = /kzYUzPiJBFBmgvK4Sl9JeWMlEOEixHcaob+/ox4
SHA256 (cargo/indoc-1.0.9.tar.gz) = v6eZ3V7SCn40nztGOaqA10VJyBcW2exPmUybWBVZgwY=
SHA256 (cargo/inout-0.2.0-rc.5.tar.gz) = x3TIa84g6gSr4cN88AUcVpAHmjoo71/awqWgQSs9fXQ=
SHA256 (cargo/itertools-0.10.5.tar.gz) = sP0iYOgpvd9MtuqAIoneL4bWp6aQGS++kbP0bg8shHM=
SHA256 (cargo/itertools-0.13.0.tar.gz) = QT7n38Uu4aSUnO6328ijPy1sCIGU2fki+4MY+vHwEYY=
SHA256 (cargo/itertools-0.14.0.tar.gz) = KxkseCA3+t2c+nVUgxBIiqvb89Lac4hbMb0KvQM1EoU=
SHA256 (cargo/itertools-0.9.0.tar.gz) = KE8Y+FZR/hHoqZGyrbQssHgyXJlu0CbZlHGe/Pyh1Us=
SHA256 (cargo/itoa-1.0.15.tar.gz) = Sl8TuFjI0xTuPo9jkBH3zO/nH5f5blAVH7mR8meSjiw=
@@ -163,8 +161,9 @@ SHA256 (cargo/zerocopy-0.8.26.tar.gz) = EDndDTwxDPBd4BLYo5/1V8sNIwh/1EytYd8I/DGQ
SHA256 (cargo/zerocopy-derive-0.8.26.tar.gz) = ns9bTMU2RXLX9MMpZhvMgnJCIpc/LKtvBQpOXCL3UYE=
SHA256 (cargo/zeroize-1.8.1.tar.gz) = ztNniih5swMG0yP0VCYmaXpGSpfAoHya6/frymXNTd4=
SHA256 (chromium-cdm-9920660ea0162f88c44a648de177e6f8cb976d07.tar.gz) = t9DKHb8ZkSdyADkJnA4BZVEv5XIK/lTAJzl382BvlKE=
SHA256 (openwv-1.1.3.tar.gz) = oUa2TBepGpevQCGeFso2T+fg+nQMoKvam23skW1pE/Q=
SHA256 (tchebb-autocxx-1fca5acd26f533576f98da45075d5498a1731d92.tar.gz) = lqm0FoXm1kRU4TShcXLnQ/UzySC3aXNBKdg9TzHxXEw=
SHA256 (openwv-1.1.4.tar.gz) = usnPk4rM4ar4uRZ0PUqK5vQtDkKFbKeUClblrNST7A4=
SHA256 (tchebb-autocxx-cef6d9e9d2ad98daefa0eccef4a79dbfa1f175d2.tar.gz) = l/i4PcsIE+USzkMu0czYAX+qcAs3zoLWFNKKcAUCEnc=
SHA256 (tchebb-rust-bindgen-2ed5c81765a6b3f59c775d4425ad06815dbdba5c.tar.gz) = ROoSSjxwAJWDzpV4dpx655v5uo0E4EdDzQwS+8TxKZw=
SIZE (cargo/aes-0.9.0-rc.0.tar.gz) = 126308
SIZE (cargo/aho-corasick-1.1.3.tar.gz) = 183311
SIZE (cargo/anstyle-1.0.11.tar.gz) = 15880
@@ -172,7 +171,6 @@ SIZE (cargo/anyhow-1.0.99.tar.gz) = 53809
SIZE (cargo/aquamarine-0.1.12.tar.gz) = 290835
SIZE (cargo/atty-0.2.14.tar.gz) = 5470
SIZE (cargo/autocfg-1.5.0.tar.gz) = 18729
SIZE (cargo/autocxx-bindgen-0.73.0.tar.gz) = 249462
SIZE (cargo/base16ct-0.2.0.tar.gz) = 10240
SIZE (cargo/base64ct-1.8.0.tar.gz) = 31211
SIZE (cargo/bitflags-2.9.2.tar.gz) = 47977
@@ -229,7 +227,6 @@ SIZE (cargo/indexmap-2.10.0.tar.gz) = 95836
SIZE (cargo/indoc-1.0.9.tar.gz) = 13475
SIZE (cargo/inout-0.2.0-rc.5.tar.gz) = 12490
SIZE (cargo/itertools-0.10.5.tar.gz) = 115354
SIZE (cargo/itertools-0.13.0.tar.gz) = 146261
SIZE (cargo/itertools-0.14.0.tar.gz) = 152715
SIZE (cargo/itertools-0.9.0.tar.gz) = 96429
SIZE (cargo/itoa-1.0.15.tar.gz) = 11231
@@ -330,5 +327,6 @@ SIZE (cargo/zerocopy-0.8.26.tar.gz) = 249223
SIZE (cargo/zerocopy-derive-0.8.26.tar.gz) = 88080
SIZE (cargo/zeroize-1.8.1.tar.gz) = 20029
SIZE (chromium-cdm-9920660ea0162f88c44a648de177e6f8cb976d07.tar.gz) = 14985
SIZE (openwv-1.1.3.tar.gz) = 38091
SIZE (tchebb-autocxx-1fca5acd26f533576f98da45075d5498a1731d92.tar.gz) = 834442
SIZE (openwv-1.1.4.tar.gz) = 38035
SIZE (tchebb-autocxx-cef6d9e9d2ad98daefa0eccef4a79dbfa1f175d2.tar.gz) = 834372
SIZE (tchebb-rust-bindgen-2ed5c81765a6b3f59c775d4425ad06815dbdba5c.tar.gz) = 2332883
+2 -2
View File
@@ -6,7 +6,7 @@ Index: Cargo.toml
[dependencies]
-autocxx = { git = "https://github.com/tchebb/autocxx.git", branch = "openwv-fixes" }
+autocxx = { path = "../autocxx" }
+autocxx = { path = "autocxx" }
cxx = "1"
prost = "0.14.1"
thiserror = "2"
@@ -15,7 +15,7 @@ Index: Cargo.toml
[build-dependencies]
-autocxx-build = { git = "https://github.com/tchebb/autocxx.git", branch = "openwv-fixes" }
+autocxx-build = { path = "../autocxx/gen/build" }
+autocxx-build = { path = "autocxx/gen/build" }
prost-build = "0.14.1"
thiserror = "2"
@@ -0,0 +1,12 @@
Index: autocxx/engine/Cargo.toml
--- autocxx/engine/Cargo.toml.orig
+++ autocxx/engine/Cargo.toml
@@ -30,7 +30,7 @@ log = "0.4"
proc-macro2 = "1.0.11"
quote = "1.0"
indoc = "1.0"
-autocxx-bindgen = { git = "https://github.com/tchebb/rust-bindgen", branch = "openwv-fixes", default-features = false, features = ["logging", "which-rustfmt"] }
+autocxx-bindgen = { path = "../../autocxx-bindgen/bindgen" }
itertools = "0.10.3"
cc = { version = "1.0", optional = true }
# Note: Keep the patch-level version of cxx-gen and cxx in sync.