Skip to content

Commit b06d7e8

Browse files
tsukimi: update to 26.9.1
Co-authored-by: Alan Lin (@miwu04) Co-authored-by: MutsukiC <mutsuki@aosc.io>
1 parent 6372d7c commit b06d7e8

7 files changed

Lines changed: 18 additions & 58 deletions

app-multimedia/tsukimi/autobuild/defines

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ PKGDEP="gcc-runtime gdk-pixbuf glib graphene gstreamer gtk-4 libadwaita mpv \
88
ABTYPE=meson
99

1010
USECLANG=1
11-
# FIXME: https://github.com/aws/aws-lc-rs/issues/1211
12-
NOLTO=1

app-multimedia/tsukimi/autobuild/patches/0001-fix-build-use-local-patched-uapi.patch.loongarch64 renamed to app-multimedia/tsukimi/autobuild/patches/0001-Override-uapi-crate-to-use-git-src.patch.loongarch64

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
From 063094689d5f36e533282ad57e123a1fa1dee5ef Mon Sep 17 00:00:00 2001
1+
From 01c36371cc626df9d6148b971454a0583c49e721 Mon Sep 17 00:00:00 2001
22
From: MutsukiC <mutsuki@kmi.moe>
3-
Date: Sat, 1 Aug 2026 09:44:48 +0800
4-
Subject: [PATCH] fix(build): use local patched uapi
3+
Date: Wed, 9 Sep 2026 12:17:14 +0800
4+
Subject: [PATCH] Override uapi crate to use git src
5+
6+
This brings loongarch support from upstream
57

68
Signed-off-by: MutsukiC <mutsuki@kmi.moe>
79
---
8-
Cargo.lock | 17 +----------------
10+
Cargo.lock | 19 +++----------------
911
Cargo.toml | 3 +++
10-
2 files changed, 4 insertions(+), 16 deletions(-)
12+
2 files changed, 6 insertions(+), 16 deletions(-)
1113

1214
diff --git a/Cargo.lock b/Cargo.lock
13-
index 33d25dd..c706a6d 100644
15+
index d95209c..db3d8cf 100644
1416
--- a/Cargo.lock
1517
+++ b/Cargo.lock
16-
@@ -3192,17 +3192,6 @@ version = "2.6.1"
18+
@@ -4568,17 +4568,6 @@ version = "2.6.1"
1719
source = "registry+https://github.com/rust-lang/crates.io-index"
1820
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
1921

@@ -31,21 +33,23 @@ index 33d25dd..c706a6d 100644
3133
[[package]]
3234
name = "syn"
3335
version = "2.0.119"
34-
@@ -3633,8 +3622,6 @@ dependencies = [
36+
@@ -5124,8 +5113,7 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
3537
[[package]]
3638
name = "uapi"
3739
version = "0.2.13"
3840
-source = "registry+https://github.com/rust-lang/crates.io-index"
3941
-checksum = "3bf073840d1b16485bfe28b4e752eccee38d9ac53f152adf869708e3136561e6"
42+
+source = "git+https://github.com/mahkoh/uapi.git?rev=64f4eec#64f4eec52862002ba8293cd387329ccb3595d4d0"
4043
dependencies = [
4144
"cc",
4245
"cfg-if",
43-
@@ -3645,15 +3632,13 @@ dependencies = [
46+
@@ -5136,15 +5124,14 @@ dependencies = [
4447
[[package]]
4548
name = "uapi-proc"
4649
version = "0.0.5"
4750
-source = "registry+https://github.com/rust-lang/crates.io-index"
4851
-checksum = "54de46f980cea7b2ae8d8f7f9f1c35cf7062c68343e99345ef73758f8e60975a"
52+
+source = "git+https://github.com/mahkoh/uapi.git?rev=64f4eec#64f4eec52862002ba8293cd387329ccb3595d4d0"
4953
dependencies = [
5054
"lazy_static",
5155
"libc",
@@ -58,16 +62,16 @@ index 33d25dd..c706a6d 100644
5862

5963
[[package]]
6064
diff --git a/Cargo.toml b/Cargo.toml
61-
index a23115b..486649e 100644
65+
index d49e324..fc8c5eb 100644
6266
--- a/Cargo.toml
6367
+++ b/Cargo.toml
64-
@@ -81,3 +81,6 @@ codegen-units = 1
68+
@@ -22,3 +22,6 @@ codegen-units = 1
6569

6670
[profile.dev]
6771
debug = true
6872
+
6973
+[patch.crates-io]
70-
+uapi = { path = "../uapi/uapi" }
74+
+uapi = { git = "https://github.com/mahkoh/uapi.git", rev = "64f4eec" }
7175
--
7276
2.55.0
7377

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
app-multimedia/tsukimi/autobuild/patches/0001-Override-uapi-crate-to-use-git-src.patch.loongarch64

app-multimedia/tsukimi/autobuild/patches/0001-fix-build-use-local-patched-uapi.patch.loongarch64_nosimd

Lines changed: 0 additions & 1 deletion
This file was deleted.

app-multimedia/tsukimi/autobuild/patches/Add-ioctl-defs-for-loongarch64.patch.uapi.deferred

Lines changed: 0 additions & 27 deletions
This file was deleted.

app-multimedia/tsukimi/autobuild/prepare

Lines changed: 0 additions & 7 deletions
This file was deleted.

app-multimedia/tsukimi/spec

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
VER=26.8.4
2-
UAPI_CRATE_VER=0.2.13
1+
VER=26.9.1
32
SRCS="git::commit=tags/v$VER;rename=tsukimi::https://github.com/tsukinaha/tsukimi"
4-
SRCS__LOONGARCH64="${SRCS} \
5-
git::commit=tags/v$UAPI_CRATE_VER;rename=uapi::https://github.com/mahkoh/uapi"
6-
SRCS__LOONGARCH64_NOSIMD="${SRCS__LOONGARCH64}"
73
CHKSUMS="SKIP"
8-
CHKSUMS__LOONGARCH64="$CHKSUMS \
9-
SKIP"
10-
CHKSUMS__LOONGARCH64_NOSIMD="${CHKSUMS__LOONGARCH64}"
114
CHKUPDATE="anitya::id=376111"
12-
SUBDIR=tsukimi

0 commit comments

Comments
 (0)