mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
Compare commits
363 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f3fdd11916 | ||
|
|
8e680ee94d | ||
|
|
9bf440454e | ||
|
|
213fd15973 | ||
|
|
7055c44ddf | ||
|
|
825839e4a0 | ||
|
|
4e3b343bf8 | ||
|
|
eae8402f7a | ||
|
|
ee5dcdc762 | ||
|
|
a752aa8093 | ||
|
|
bfa3cc31ab | ||
|
|
6c4919fbbb | ||
|
|
9c7fbc169e | ||
|
|
00cc1532cf | ||
|
|
5f86fe213a | ||
|
|
30d715edc2 | ||
|
|
df9613c862 | ||
|
|
19d226bfcc | ||
|
|
7da4654abc | ||
|
|
37e4458c2f | ||
|
|
fa57ba0ddb | ||
|
|
d0438cc25d | ||
|
|
e4d1ab99e4 | ||
|
|
e0b004a5a1 | ||
|
|
2ddea34f07 | ||
|
|
71e67d71b5 | ||
|
|
657f57efe8 | ||
|
|
adaffb4691 | ||
|
|
52ff3cd567 | ||
|
|
306eb6e83c | ||
|
|
5d04c04bda | ||
|
|
0525a78973 | ||
|
|
84c85e6844 | ||
|
|
0770af2f00 | ||
|
|
f18bb345cd | ||
|
|
4f14ea1d6c | ||
|
|
371179ed43 | ||
|
|
a0590028d6 | ||
|
|
2a59ce0d3f | ||
|
|
f5f3be4388 | ||
|
|
235487857d | ||
|
|
7df85cf2fc | ||
|
|
99c73bebc8 | ||
|
|
fdb54d52ac | ||
|
|
bf6e76c2c8 | ||
|
|
8fa330dc87 | ||
|
|
d46c131d9d | ||
|
|
aaabe97491 | ||
|
|
fe78677796 | ||
|
|
6b3b46b25a | ||
|
|
87e4eedf81 | ||
|
|
875d576293 | ||
|
|
1114cb271a | ||
|
|
1622de740e | ||
|
|
f5e9a68174 | ||
|
|
9ec45259c0 | ||
|
|
06dbfde338 | ||
|
|
e9bd6725c0 | ||
|
|
43e64332c4 | ||
|
|
282b913aef | ||
|
|
1a203a7989 | ||
|
|
4de42ea671 | ||
|
|
7dd19fd76c | ||
|
|
4800dfd01f | ||
|
|
8f61792e09 | ||
|
|
06fe77f51a | ||
|
|
1f03e241ed | ||
|
|
1ba08bc635 | ||
|
|
fd120b0896 | ||
|
|
6046e0464f | ||
|
|
19907d1f6f | ||
|
|
cca645b532 | ||
|
|
7d22c1a852 | ||
|
|
512bb84ec2 | ||
|
|
a1ccf82c94 | ||
|
|
a4704d51bc | ||
|
|
997594ea28 | ||
|
|
e6bb9a0fd8 | ||
|
|
4d4da56094 | ||
|
|
1e4c5e0d60 | ||
|
|
20b099e3e5 | ||
|
|
88a4aac2bb | ||
|
|
8e4708d4ac | ||
|
|
ad778a098e | ||
|
|
738d8fa874 | ||
|
|
01ab4dfe7f | ||
|
|
79f574609b | ||
|
|
44c35dc21f | ||
|
|
3286bb4851 | ||
|
|
db6a8e7247 | ||
|
|
335b0e2c7d | ||
|
|
69d843d9f7 | ||
|
|
32f88326d6 | ||
|
|
9941270cb3 | ||
|
|
b77841081e | ||
|
|
0b49c1e1e4 | ||
|
|
bfacf1cc83 | ||
|
|
43a8df4b8e | ||
|
|
fdd83bd889 | ||
|
|
45b1110b43 | ||
|
|
3dfd8485ec | ||
|
|
83c18f6710 | ||
|
|
99bef5c187 | ||
|
|
52579aa5e2 | ||
|
|
b3b3c9d85f | ||
|
|
5ebd83a3f3 | ||
|
|
f71c39f40e | ||
|
|
e0024a1c96 | ||
|
|
5cdfbf426a | ||
|
|
c8da57b250 | ||
|
|
4d0d00c2dc | ||
|
|
8cf75aadd8 | ||
|
|
f894320ced | ||
|
|
14e57977ec | ||
|
|
7f472f761f | ||
|
|
8db27fe661 | ||
|
|
6ddfff5370 | ||
|
|
24262e167c | ||
|
|
579aab6086 | ||
|
|
d46264f837 | ||
|
|
9ad6c3a8e4 | ||
|
|
ae87e4aefc | ||
|
|
ac154c8708 | ||
|
|
9653f7f7de | ||
|
|
20af6bbcf8 | ||
|
|
5eb5405ff7 | ||
|
|
fea117491b | ||
|
|
e58a4798e2 | ||
|
|
3e7c67c2c3 | ||
|
|
0b6c4feebc | ||
|
|
1b5af142ff | ||
|
|
bf424352f8 | ||
|
|
3d1c13b978 | ||
|
|
398ecea051 | ||
|
|
dfad711bd2 | ||
|
|
687e297485 | ||
|
|
d4b52a1f08 | ||
|
|
4190aa83da | ||
|
|
f000f3c65b | ||
|
|
1a6a92e9df | ||
|
|
24e8a1288f | ||
|
|
c1d7ad24a0 | ||
|
|
b97b16db22 | ||
|
|
9ca18024aa | ||
|
|
c399af7db0 | ||
|
|
5ac4c2dea1 | ||
|
|
71c7319cb3 | ||
|
|
e105437d0a | ||
|
|
0ae5b50b0a | ||
|
|
1c7bd2ec86 | ||
|
|
5196d20c16 | ||
|
|
c2e4fbbe22 | ||
|
|
197b981499 | ||
|
|
3b7530965c | ||
|
|
cedb69b66e | ||
|
|
ab9942a041 | ||
|
|
f6a3ada6fa | ||
|
|
4f2a9609d7 | ||
|
|
4c8c03c99b | ||
|
|
a5ae7e7736 | ||
|
|
3b703790d0 | ||
|
|
e26daff418 | ||
|
|
5540a41e84 | ||
|
|
2dfedd8447 | ||
|
|
eb53258dcf | ||
|
|
a9708d0150 | ||
|
|
8091d3cf37 | ||
|
|
81a0f74829 | ||
|
|
080506b43c | ||
|
|
2bd7c57aef | ||
|
|
41443968c6 | ||
|
|
f60f99a778 | ||
|
|
5033eb68bb | ||
|
|
79636cc5f1 | ||
|
|
9d22160c38 | ||
|
|
03e407ee5f | ||
|
|
f9edf04972 | ||
|
|
57ec0a33c6 | ||
|
|
18e2aa0f55 | ||
|
|
c9aa2ea100 | ||
|
|
4df04d47b2 | ||
|
|
a0b38747d8 | ||
|
|
4e897856fc | ||
|
|
3913532ab0 | ||
|
|
04e337bb78 | ||
|
|
ff644df038 | ||
|
|
c1a5a94121 | ||
|
|
310dbe5efa | ||
|
|
b79956bda8 | ||
|
|
9ceeb920b6 | ||
|
|
dc676c2897 | ||
|
|
bcf2402577 | ||
|
|
e3e02b6d74 | ||
|
|
6c92e9b2ee | ||
|
|
c5a4eb1ed4 | ||
|
|
f7c6461f27 | ||
|
|
91911f6e3d | ||
|
|
bd9510b74f | ||
|
|
b54a85dc50 | ||
|
|
5c7e5d6c21 | ||
|
|
06a8697cdb | ||
|
|
06fb26c327 | ||
|
|
72fd4f15a4 | ||
|
|
e7eb36c7ae | ||
|
|
d0fa39f333 | ||
|
|
ee73ae5e64 | ||
|
|
f7f922c0be | ||
|
|
953ca9677a | ||
|
|
1695cc1d12 | ||
|
|
11701e6df8 | ||
|
|
d52ea1b33e | ||
|
|
54c495f65d | ||
|
|
5c9c7566f2 | ||
|
|
553d4d0830 | ||
|
|
a2d293de6a | ||
|
|
b54582899c | ||
|
|
f2fc6f4338 | ||
|
|
9f883dc87a | ||
|
|
680aa5b7c8 | ||
|
|
6fd8727853 | ||
|
|
6034a726f2 | ||
|
|
dcff6ee432 | ||
|
|
c91481e4ff | ||
|
|
9d18c841a4 | ||
|
|
77099d070a | ||
|
|
0182d1ea4d | ||
|
|
39ab6fcb93 | ||
|
|
e6669d7309 | ||
|
|
04ee92965e | ||
|
|
ab6f1d5ca2 | ||
|
|
a9a41cfca9 | ||
|
|
0803b93082 | ||
|
|
ff20e8ce77 | ||
|
|
4ec9f52d79 | ||
|
|
540447ee73 | ||
|
|
07dca10fd7 | ||
|
|
28e63f2b2f | ||
|
|
1d9bbd9de2 | ||
|
|
2bd0640f00 | ||
|
|
5539426aa5 | ||
|
|
124b9da8c9 | ||
|
|
4dbb5fe775 | ||
|
|
52f8237334 | ||
|
|
26e5acab63 | ||
|
|
828abbd7a4 | ||
|
|
7dff4edd5c | ||
|
|
7c487d3d37 | ||
|
|
e3fa45f5f3 | ||
|
|
1944d188eb | ||
|
|
3d969a98c0 | ||
|
|
970a634945 | ||
|
|
6ad97d5724 | ||
|
|
2ab2fa8279 | ||
|
|
e64b28b128 | ||
|
|
66948b60af | ||
|
|
8491af1471 | ||
|
|
240fb37abb | ||
|
|
cdddc9df7f | ||
|
|
c04e8aa98c | ||
|
|
31d50032b8 | ||
|
|
f35cbc083f | ||
|
|
d7ebff5f5b | ||
|
|
d2d7f06b17 | ||
|
|
ccb997d958 | ||
|
|
c15209b9dd | ||
|
|
03bec6c761 | ||
|
|
7de0439447 | ||
|
|
09e19d38e7 | ||
|
|
22fc063278 | ||
|
|
c81dd7341a | ||
|
|
0af13afbe7 | ||
|
|
830d3ffde4 | ||
|
|
05c2a6a606 | ||
|
|
701e0597bd | ||
|
|
0be537a579 | ||
|
|
e0e338e948 | ||
|
|
89be060385 | ||
|
|
e37013e242 | ||
|
|
b5c094f158 | ||
|
|
7b7b3dbe82 | ||
|
|
6c44256a1a | ||
|
|
0c731af4c2 | ||
|
|
550c0c82c0 | ||
|
|
4cdf5c6db6 | ||
|
|
4a3a351d35 | ||
|
|
1f64d9f045 | ||
|
|
3799320225 | ||
|
|
8b1a63d053 | ||
|
|
e78dd8ff73 | ||
|
|
05800580d0 | ||
|
|
a50eb41e71 | ||
|
|
a521ab9ee9 | ||
|
|
e9555b4c26 | ||
|
|
bd771c9faf | ||
|
|
de6a865fbb | ||
|
|
ef165c3e9d | ||
|
|
c4271a2a25 | ||
|
|
669ed4c5f8 | ||
|
|
c323ef5e40 | ||
|
|
e68ffc0e9c | ||
|
|
ad85d8ab3e | ||
|
|
4e61a2a481 | ||
|
|
c179a51a8d | ||
|
|
898ad70603 | ||
|
|
b0d0dcb1c5 | ||
|
|
41d71a9264 | ||
|
|
4972b00635 | ||
|
|
247dcace4d | ||
|
|
85dea6b54f | ||
|
|
5a730bc742 | ||
|
|
7ce7604a48 | ||
|
|
1d018052f4 | ||
|
|
6662a82d09 | ||
|
|
00ff8204f1 | ||
|
|
a08d201567 | ||
|
|
ee40b52438 | ||
|
|
d5950d91d0 | ||
|
|
a7e7ad868e | ||
|
|
9c33be7f13 | ||
|
|
d35b6412b8 | ||
|
|
205390df95 | ||
|
|
304b21288f | ||
|
|
f0db7759cd | ||
|
|
d0dff504f1 | ||
|
|
6a5f4cbbf7 | ||
|
|
7b3fca4338 | ||
|
|
8af44cc559 | ||
|
|
dbe9182830 | ||
|
|
8af58fb01b | ||
|
|
0c003eddbf | ||
|
|
891616a6a4 | ||
|
|
0728be1969 | ||
|
|
7e8546ac4f | ||
|
|
20466d8db1 | ||
|
|
096ba56640 | ||
|
|
aa1d521f47 | ||
|
|
1f2adb4194 | ||
|
|
3354be1353 | ||
|
|
6196b8d5eb | ||
|
|
d409484b67 | ||
|
|
a510d055b8 | ||
|
|
a09f6152a7 | ||
|
|
8f90d477cb | ||
|
|
c96e0fcdb8 | ||
|
|
71764cad02 | ||
|
|
73b9725ea9 | ||
|
|
7a1ab7bf6a | ||
|
|
54cceb9e29 | ||
|
|
cc8b46a00c | ||
|
|
f76d445261 | ||
|
|
49d106a6de | ||
|
|
a7111758fd | ||
|
|
e63d9c8c75 | ||
|
|
aba85ae45d | ||
|
|
eaed1ddbf2 | ||
|
|
e0326a735a | ||
|
|
61cde8d0b4 | ||
|
|
cf24cfbea4 | ||
|
|
3609a2cd5f | ||
|
|
0b10634c6e | ||
|
|
4cadebb078 | ||
|
|
11838d2765 | ||
|
|
4b6c2f3508 |
@@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="cli"
|
||||
PKG_VERSION="$(get_pkg_version moby)"
|
||||
PKG_SHA256="f992e895c949852686abef9a6fa9efd622826c4f4d70b83876569a4641c4c8fc"
|
||||
PKG_SHA256="df7d44387166d90954e290dfbe0a278649bf71d0e89933615bdc0757580b68e4"
|
||||
PKG_LICENSE="ASL"
|
||||
PKG_SITE="https://github.com/docker/cli"
|
||||
PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz"
|
||||
@@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
# Git commit of the matching tag https://github.com/docker/cli/tags
|
||||
export PKG_GIT_COMMIT="7d4bcd863a4c863e650eed02a550dfeb98560b83"
|
||||
export PKG_GIT_COMMIT="ce1223035ac3ab8922717092e63a184cf67b493d"
|
||||
|
||||
configure_target() {
|
||||
go_configure
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="containerd"
|
||||
PKG_VERSION="1.7.19"
|
||||
PKG_SHA256="152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62"
|
||||
PKG_VERSION="1.7.23"
|
||||
PKG_SHA256="393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c"
|
||||
PKG_LICENSE="APL"
|
||||
PKG_SITE="https://containerd.io"
|
||||
PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
|
||||
@@ -13,7 +13,7 @@ PKG_LONGDESC="A daemon to control runC, built for performance and density."
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
# Git commit of the matching release https://github.com/containerd/containerd/releases
|
||||
export PKG_GIT_COMMIT="2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41"
|
||||
export PKG_GIT_COMMIT="57f17b0a6295a39009d861b89e3b3b87b005ca27"
|
||||
|
||||
pre_make_target() {
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="moby"
|
||||
PKG_VERSION="27.0.3"
|
||||
PKG_SHA256="db02d9b5d98e85284538d6ead43b549c025acf937e98c09d18395bb331c1e607"
|
||||
PKG_VERSION="27.3.1"
|
||||
PKG_SHA256="d18208d9e0b6421307342cdef266193984c97c87177b9262b1113e6e9e7e020e"
|
||||
PKG_LICENSE="ASL"
|
||||
PKG_SITE="https://mobyproject.org/"
|
||||
PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
|
||||
@@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
# Git commit of the matching release https://github.com/moby/moby
|
||||
export PKG_GIT_COMMIT="662f78c0b1bb5114172427cfcb40491d73159be2"
|
||||
export PKG_GIT_COMMIT="41ca978a0a5400cc24b274137efa9f25517fcc0b"
|
||||
|
||||
PKG_MOBY_BUILDTAGS="daemon \
|
||||
autogen \
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
#
|
||||
diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
|
||||
--- a/cmd/dockerd/daemon_unix.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/cmd/dockerd/daemon_unix.go 2024-01-06 03:43:42.144311172 +0000
|
||||
--- a/cmd/dockerd/daemon_unix.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/cmd/dockerd/daemon_unix.go 2024-09-10 06:47:41.951753985 +0000
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
func getDefaultDaemonConfigDir() (string, error) {
|
||||
@@ -16,8 +16,8 @@ diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
|
||||
// NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because
|
||||
// ~/.docker was not designed to store daemon configurations.
|
||||
diff -Naur a/cmd/dockerd/options.go b/cmd/dockerd/options.go
|
||||
--- a/cmd/dockerd/options.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/cmd/dockerd/options.go 2024-01-06 03:43:42.144311172 +0000
|
||||
--- a/cmd/dockerd/options.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/cmd/dockerd/options.go 2024-09-10 06:47:41.951753985 +0000
|
||||
@@ -39,7 +39,7 @@
|
||||
//
|
||||
// - DOCKER_CONFIG only affects TLS certificates, but does not change the
|
||||
@@ -37,8 +37,8 @@ diff -Naur a/cmd/dockerd/options.go b/cmd/dockerd/options.go
|
||||
// needed for rootless, but perhaps could be used for non-rootless(?)
|
||||
// - When changing the location for TLS config, (ideally) they should
|
||||
diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go
|
||||
--- a/integration/plugin/authz/authz_plugin_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/integration/plugin/authz/authz_plugin_test.go 2024-01-06 03:43:42.100977532 +0000
|
||||
--- a/integration/plugin/authz/authz_plugin_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/integration/plugin/authz/authz_plugin_test.go 2024-09-10 06:47:41.908420295 +0000
|
||||
@@ -56,15 +56,15 @@
|
||||
|
||||
ctrl = &authorizationController{}
|
||||
@@ -59,9 +59,9 @@ diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/
|
||||
ctrl = nil
|
||||
})
|
||||
diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go
|
||||
--- a/integration/plugin/graphdriver/external_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/integration/plugin/graphdriver/external_test.go 2024-01-06 03:43:42.100977532 +0000
|
||||
@@ -87,7 +87,7 @@
|
||||
--- a/integration/plugin/graphdriver/external_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/integration/plugin/graphdriver/external_test.go 2024-09-10 06:47:41.908420295 +0000
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
sserver.Close()
|
||||
jserver.Close()
|
||||
@@ -70,7 +70,7 @@ diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugi
|
||||
assert.NilError(t, err)
|
||||
}
|
||||
|
||||
@@ -351,10 +351,10 @@
|
||||
@@ -352,10 +352,10 @@
|
||||
respond(w, &graphDriverResponse{Size: size})
|
||||
})
|
||||
|
||||
@@ -84,8 +84,8 @@ diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugi
|
||||
assert.NilError(t, err)
|
||||
}
|
||||
diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integration-cli/docker_cli_external_volume_driver_test.go
|
||||
--- a/integration-cli/docker_cli_external_volume_driver_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/integration-cli/docker_cli_external_volume_driver_test.go 2024-01-06 03:43:42.487646940 +0000
|
||||
--- a/integration-cli/docker_cli_external_volume_driver_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/integration-cli/docker_cli_external_volume_driver_test.go 2024-09-10 06:47:42.278423345 +0000
|
||||
@@ -262,10 +262,10 @@
|
||||
send(w, `{"Capabilities": { "Scope": "global" }}`)
|
||||
})
|
||||
@@ -118,27 +118,27 @@ diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integra
|
||||
assert.NilError(c, err)
|
||||
defer os.RemoveAll(specPath)
|
||||
diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
|
||||
--- a/integration-cli/docker_cli_network_unix_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/integration-cli/docker_cli_network_unix_test.go 2024-01-06 03:43:42.487646940 +0000
|
||||
@@ -201,14 +201,14 @@
|
||||
--- a/integration-cli/docker_cli_network_unix_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/integration-cli/docker_cli_network_unix_test.go 2024-09-10 06:47:42.278423345 +0000
|
||||
@@ -225,14 +225,14 @@
|
||||
}
|
||||
})
|
||||
|
||||
- err := os.MkdirAll("/etc/docker/plugins", 0o755)
|
||||
+ err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
|
||||
assert.NilError(c, err)
|
||||
assert.NilError(t, err)
|
||||
|
||||
- fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
|
||||
+ fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
|
||||
err = os.WriteFile(fileName, []byte(url), 0o644)
|
||||
assert.NilError(c, err)
|
||||
assert.NilError(t, err)
|
||||
|
||||
- ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
|
||||
+ ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
|
||||
err = os.WriteFile(ipamFileName, []byte(url), 0o644)
|
||||
assert.NilError(c, err)
|
||||
assert.NilError(t, err)
|
||||
}
|
||||
@@ -220,7 +220,7 @@
|
||||
@@ -244,7 +244,7 @@
|
||||
|
||||
s.server.Close()
|
||||
|
||||
@@ -148,27 +148,27 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
|
||||
}
|
||||
|
||||
diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
|
||||
--- a/integration-cli/docker_cli_swarm_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/integration-cli/docker_cli_swarm_test.go 2024-01-06 03:43:42.494313654 +0000
|
||||
@@ -793,14 +793,14 @@
|
||||
--- a/integration-cli/docker_cli_swarm_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/integration-cli/docker_cli_swarm_test.go 2024-09-10 06:47:42.281756705 +0000
|
||||
@@ -823,14 +823,14 @@
|
||||
}
|
||||
})
|
||||
|
||||
- err := os.MkdirAll("/etc/docker/plugins", 0o755)
|
||||
+ err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
|
||||
assert.NilError(c, err)
|
||||
assert.NilError(t, err)
|
||||
|
||||
- fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
|
||||
+ fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
|
||||
err = os.WriteFile(fileName, []byte(url), 0o644)
|
||||
assert.NilError(c, err)
|
||||
assert.NilError(t, err)
|
||||
|
||||
- ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
|
||||
+ ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
|
||||
err = os.WriteFile(ipamFileName, []byte(url), 0o644)
|
||||
assert.NilError(c, err)
|
||||
assert.NilError(t, err)
|
||||
}
|
||||
@@ -813,7 +813,7 @@
|
||||
@@ -843,7 +843,7 @@
|
||||
setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin)
|
||||
defer func() {
|
||||
s.server.Close()
|
||||
@@ -178,9 +178,9 @@ diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_c
|
||||
}()
|
||||
|
||||
diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remote/driver_test.go
|
||||
--- a/libnetwork/drivers/remote/driver_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/libnetwork/drivers/remote/driver_test.go 2024-01-06 03:43:42.480980226 +0000
|
||||
@@ -41,7 +41,7 @@
|
||||
--- a/libnetwork/drivers/remote/driver_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/libnetwork/drivers/remote/driver_test.go 2024-09-10 06:47:42.268423262 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
}
|
||||
|
||||
func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
|
||||
@@ -190,9 +190,9 @@ diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remot
|
||||
specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
|
||||
}
|
||||
diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/remote_test.go
|
||||
--- a/libnetwork/ipams/remote/remote_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/libnetwork/ipams/remote/remote_test.go 2024-01-06 03:43:42.470980156 +0000
|
||||
@@ -36,7 +36,7 @@
|
||||
--- a/libnetwork/ipams/remote/remote_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/libnetwork/ipams/remote/remote_test.go 2024-09-10 06:47:42.261756541 +0000
|
||||
@@ -38,7 +38,7 @@
|
||||
}
|
||||
|
||||
func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
|
||||
@@ -202,8 +202,8 @@ diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/re
|
||||
specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
|
||||
}
|
||||
diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_test.go
|
||||
--- a/libnetwork/libnetwork_unix_test.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/libnetwork/libnetwork_unix_test.go 2024-01-06 03:43:42.484313584 +0000
|
||||
--- a/libnetwork/libnetwork_unix_test.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/libnetwork/libnetwork_unix_test.go 2024-09-10 06:47:42.271756623 +0000
|
||||
@@ -2,4 +2,4 @@
|
||||
|
||||
package libnetwork_test
|
||||
@@ -211,9 +211,9 @@ diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_tes
|
||||
-var specPath = "/etc/docker/plugins"
|
||||
+var specPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
|
||||
diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
|
||||
--- a/pkg/plugins/discovery.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/pkg/plugins/discovery.go 2024-01-06 03:43:42.107644246 +0000
|
||||
@@ -120,12 +120,12 @@
|
||||
--- a/pkg/plugins/discovery.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/pkg/plugins/discovery.go 2024-09-10 06:47:41.915087017 +0000
|
||||
@@ -128,12 +128,12 @@
|
||||
//
|
||||
// On Unix in non-rootless mode:
|
||||
//
|
||||
@@ -229,8 +229,8 @@ diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
|
||||
func SpecsPaths() []string {
|
||||
return specsPaths()
|
||||
diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
|
||||
--- a/pkg/plugins/discovery_unix.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/pkg/plugins/discovery_unix.go 2024-01-06 03:43:42.107644246 +0000
|
||||
--- a/pkg/plugins/discovery_unix.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/pkg/plugins/discovery_unix.go 2024-09-10 06:47:41.915087017 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
if configHome, err := homedir.GetConfigHome(); err != nil {
|
||||
return filepath.Join(configHome, "docker/plugins")
|
||||
@@ -248,8 +248,8 @@ diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
|
||||
+ return []string{"/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", "/usr/lib/docker/plugins"}
|
||||
}
|
||||
diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
|
||||
--- a/pkg/plugins/plugins.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/pkg/plugins/plugins.go 2024-01-06 03:43:42.107644246 +0000
|
||||
--- a/pkg/plugins/plugins.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/pkg/plugins/plugins.go 2024-09-10 06:47:41.915087017 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
// Docker discovers plugins by looking for them in the plugin directory whenever
|
||||
// a user or container tries to use one by name. UNIX domain socket files must
|
||||
@@ -260,8 +260,8 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
|
||||
// its name if it exists.
|
||||
//
|
||||
diff -Naur a/registry/config_unix.go b/registry/config_unix.go
|
||||
--- a/registry/config_unix.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/registry/config_unix.go 2024-01-06 03:43:42.487646940 +0000
|
||||
--- a/registry/config_unix.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/registry/config_unix.go 2024-09-10 06:47:42.275089984 +0000
|
||||
@@ -5,7 +5,7 @@
|
||||
// defaultCertsDir is the platform-specific default directory where certificates
|
||||
// are stored. On Linux, it may be overridden through certsDir, for example, when
|
||||
@@ -272,8 +272,8 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
|
||||
// cleanPath is used to ensure that a directory name is valid on the target
|
||||
// platform. It will be passed in something *similar* to a URL such as
|
||||
diff -Naur a/registry/search_endpoint_v1.go b/registry/search_endpoint_v1.go
|
||||
--- a/registry/search_endpoint_v1.go 2024-01-04 15:38:22.000000000 +0000
|
||||
+++ b/registry/search_endpoint_v1.go 2024-01-06 03:43:42.487646940 +0000
|
||||
--- a/registry/search_endpoint_v1.go 2024-09-06 09:57:40.000000000 +0000
|
||||
+++ b/registry/search_endpoint_v1.go 2024-09-10 06:47:42.278423345 +0000
|
||||
@@ -54,7 +54,7 @@
|
||||
if endpoint.IsSecure {
|
||||
// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="aspnet6-runtime"
|
||||
PKG_VERSION="6.0.32"
|
||||
PKG_VERSION="6.0.33"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://dotnet.microsoft.com/"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
@@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual"
|
||||
|
||||
case "${ARCH}" in
|
||||
"aarch64")
|
||||
PKG_SHA256="70d7035083bc2b330709eb6208d082a3cfc18839425b31bccff032aadc66c212"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/7b3ead1a-441d-42b9-ac91-1253ed8aee48/044d517eaff9f65e18e3e27f4d825d34/aspnetcore-runtime-6.0.32-linux-arm64.tar.gz"
|
||||
PKG_SHA256="4019316b34bbdf5756abda4037f87a4328f26abfb6c0c4fd79cf160c35ad337b"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"
|
||||
;;
|
||||
"arm")
|
||||
PKG_SHA256="1500178b218dc218c1465b9b60b248c8780dccb15b62a56641d03c8d816eff16"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d5106f1a-d140-4c8c-b480-001824b72768/7e9cf426bf45040eadfcc8bb20227b6d/aspnetcore-runtime-6.0.32-linux-arm.tar.gz"
|
||||
PKG_SHA256="f19cf33ad2c53f6285130809f976255c8f45d043e52c4d6a8759363ef4a47cfa"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4ac9397f-3f4a-4cd0-aba2-35e7f1b47396/9823f50c32028899f430bc3ae87251b1/aspnetcore-runtime-6.0.33-linux-arm.tar.gz"
|
||||
;;
|
||||
"x86_64")
|
||||
PKG_SHA256="ee937f7c03f4e908c3dcb0f1c063bd911bc08f7a30d49ea41f084fa403b923f0"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/99f90118-96b4-4d06-97ad-d779715319f6/aecf393f9b9d362b66b93a47d90cfa8d/aspnetcore-runtime-6.0.32-linux-x64.tar.gz"
|
||||
PKG_SHA256="4fb761ed8d344405a690b628de883223594e0f19794aa226fb21bd6ddd0c0d0b"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"
|
||||
;;
|
||||
esac
|
||||
PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="aspnet8-runtime"
|
||||
PKG_VERSION="8.0.7"
|
||||
PKG_VERSION="8.0.8"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://dotnet.microsoft.com/"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
@@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual"
|
||||
|
||||
case "${ARCH}" in
|
||||
"aarch64")
|
||||
PKG_SHA256="61a21ef486e0075ba2c68aaceee0429d731414611d2291e1c7056cd3e5d955bb"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/421d499f-85cb-43dd-97b2-8ebfd06dda8a/61b03be4662125e4af044c7881e66f0e/aspnetcore-runtime-8.0.7-linux-arm64.tar.gz"
|
||||
PKG_SHA256="ac79115682ee679756838ee623ca46617322c787826f3638438bc6443fcee345"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"
|
||||
;;
|
||||
"arm")
|
||||
PKG_SHA256="9ad9398327a6cb239e7bda239f29a9db64838676113d5a2e54d9319b443f52e7"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d37fc703-70c6-46f2-a5a1-b60f45fd71d0/6a74aa0bb89feb7f795df1ea92d030bf/aspnetcore-runtime-8.0.7-linux-arm.tar.gz"
|
||||
PKG_SHA256="284c4c9ae3eae7548450ead59e445b3b64c72301ecf393926578231e480dd21e"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"
|
||||
;;
|
||||
"x86_64")
|
||||
PKG_SHA256="e55bc969b1cb58f96b927127b5c448a15ea844cfc94387f6e35ab585d94abc93"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/06cbb934-ef54-4627-8848-a24a879f2130/52d4247944cee754ec8f4fd617d502a6/aspnetcore-runtime-8.0.7-linux-x64.tar.gz"
|
||||
PKG_SHA256="7bee47a53a0a4977e4182e8085355d146be6b2f958aa3f3ae2de0c39439e7348"
|
||||
PKG_URL="https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"
|
||||
;;
|
||||
esac
|
||||
PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="dtv-scan-tables"
|
||||
PKG_VERSION="2022-04-30-57ed29822750"
|
||||
PKG_SHA256="6a6268aa392459378fa3a13922fc015a3fa63ff822f4b0d64d33d71350a6ec9e"
|
||||
PKG_VERSION="2024-03-24-7098bdd27548"
|
||||
PKG_SHA256="3f4c8981b3a4829066b396abc0da270e5c7e674b5d190e92532a06951a07e98e"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://git.linuxtv.org/dtv-scan-tables.git"
|
||||
PKG_URL="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PKG_VERSION}.tar.bz2"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="x264"
|
||||
PKG_VERSION="7ed753b10a61d0be95f683289dfb925b800b0676"
|
||||
PKG_SHA256="1bdf238ef065e711c4cf436046917de4a7a3e920a0b0ae1fa0f528ab23f17b12"
|
||||
PKG_VERSION="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
|
||||
PKG_SHA256="2a1b197fd1fbc85045794f18c9353648a9ae3cbe194b7b92d523d096f9445464"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.videolan.org/developers/x264.html"
|
||||
PKG_URL="https://code.videolan.org/videolan/x264/-/archive/${PKG_VERSION}/x264-${PKG_VERSION}.tar.bz2"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="x265"
|
||||
PKG_VERSION="3.6"
|
||||
PKG_SHA256="eccd9ee41ba64c55bb906ea79d28b563fdfb4fd3b7626746a0e5f8c9581491b5"
|
||||
PKG_VERSION="4.0"
|
||||
PKG_SHA256="a5b6b1176a6cbf6905cdc3fcc464d6bc626cb72ea886751e8fe445f85aa5e386"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.videolan.org/developers/x265.html"
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
From 1f801dfdb5066aadf0ade9cb5e94d620f33eacdc Mon Sep 17 00:00:00 2001
|
||||
From: Gyan Doshi <ffmpeg@gyani.pro>
|
||||
Date: Sun, 11 Aug 2024 12:51:50 +0530
|
||||
Subject: [PATCH] lavc/libx265: unbreak build for X265_BUILD >= 210
|
||||
|
||||
x265 added support for alpha starting with build 210.
|
||||
While doing so, x265_encoder_encode() changed its fifth arg to
|
||||
an array of pointers to x265_picture. This broke building lavc/libx265.c
|
||||
|
||||
This patch simply unbreaks the build and maintains existing single-layer
|
||||
non-alpha encoding support.
|
||||
|
||||
Fixes #11130
|
||||
---
|
||||
libavcodec/libx265.c | 40 ++++++++++++++++++++++++++++++----------
|
||||
1 file changed, 30 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
|
||||
index 0dc7ab6eeb6a3..3bc3b5a03e9fc 100644
|
||||
--- a/libavcodec/libx265.c
|
||||
+++ b/libavcodec/libx265.c
|
||||
@@ -661,7 +661,13 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||
{
|
||||
libx265Context *ctx = avctx->priv_data;
|
||||
x265_picture x265pic;
|
||||
- x265_picture x265pic_out = { 0 };
|
||||
+#if X265_BUILD >= 210
|
||||
+ x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
|
||||
+ x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
|
||||
+#else
|
||||
+ x265_picture x265pic_solo_out = { 0 };
|
||||
+#endif
|
||||
+ x265_picture* x265pic_out;
|
||||
x265_nal *nal;
|
||||
x265_sei *sei;
|
||||
uint8_t *dst;
|
||||
@@ -798,8 +804,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||
#endif
|
||||
}
|
||||
|
||||
+#if X265_BUILD >= 210
|
||||
+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
|
||||
+ x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
|
||||
+
|
||||
+ ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
|
||||
+ pic ? &x265pic : NULL, x265pic_lyrptr_out);
|
||||
+#else
|
||||
ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
|
||||
- pic ? &x265pic : NULL, &x265pic_out);
|
||||
+ pic ? &x265pic : NULL, &x265pic_solo_out);
|
||||
+#endif
|
||||
|
||||
for (i = 0; i < sei->numPayloads; i++)
|
||||
av_free(sei->payloads[i].payload);
|
||||
@@ -829,10 +843,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||
}
|
||||
|
||||
- pkt->pts = x265pic_out.pts;
|
||||
- pkt->dts = x265pic_out.dts;
|
||||
+#if X265_BUILD >= 210
|
||||
+ x265pic_out = x265pic_lyrptr_out[0];
|
||||
+#else
|
||||
+ x265pic_out = &x265pic_solo_out;
|
||||
+#endif
|
||||
+
|
||||
+ pkt->pts = x265pic_out->pts;
|
||||
+ pkt->dts = x265pic_out->dts;
|
||||
|
||||
- switch (x265pic_out.sliceType) {
|
||||
+ switch (x265pic_out->sliceType) {
|
||||
case X265_TYPE_IDR:
|
||||
case X265_TYPE_I:
|
||||
pict_type = AV_PICTURE_TYPE_I;
|
||||
@@ -850,16 +870,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||
}
|
||||
|
||||
#if X265_BUILD >= 130
|
||||
- if (x265pic_out.sliceType == X265_TYPE_B)
|
||||
+ if (x265pic_out->sliceType == X265_TYPE_B)
|
||||
#else
|
||||
- if (x265pic_out.frameData.sliceType == 'b')
|
||||
+ if (x265pic_out->frameData.sliceType == 'b')
|
||||
#endif
|
||||
pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
|
||||
|
||||
- ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
|
||||
+ ff_side_data_set_encoder_stats(pkt, x265pic_out->frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
|
||||
|
||||
- if (x265pic_out.userData) {
|
||||
- int idx = (int)(intptr_t)x265pic_out.userData - 1;
|
||||
+ if (x265pic_out->userData) {
|
||||
+ int idx = (int)(intptr_t)x265pic_out->userData - 1;
|
||||
ReorderedData *rd = &ctx->rd[idx];
|
||||
|
||||
pkt->duration = rd->duration;
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="go"
|
||||
PKG_VERSION="1.22.4"
|
||||
PKG_SHA256="8e035e7418ae53a20a4c9eedc906e5c43e8c31f5bfc044d2f9f70dc409cd88b1"
|
||||
PKG_VERSION="1.23.2"
|
||||
PKG_SHA256="fc3448a68fca887ceb0e0d4357d0ecd05d54a78e052f8667b283e745c87e7f2e"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://golang.org"
|
||||
PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="apache-ant"
|
||||
PKG_VERSION="1.10.14"
|
||||
PKG_SHA256="a0456ecbf934b41dca74747413f2da7eafe40355fbdf5bfd38d8f3713dd828cd"
|
||||
PKG_VERSION="1.10.15"
|
||||
PKG_SHA256="4d5bb20cee34afbad17782de61f4f422c5a03e4d2dffc503bcbd0651c3d3c396"
|
||||
PKG_LICENSE="Apache License 2.0"
|
||||
PKG_SITE="https://ant.apache.org/"
|
||||
PKG_URL="https://archive.apache.org/dist/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
|
||||
|
||||
27
packages/addons/addon-depends/libgpiod/package.mk
Normal file
27
packages/addons/addon-depends/libgpiod/package.mk
Normal file
@@ -0,0 +1,27 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libgpiod"
|
||||
PKG_VERSION="2.2"
|
||||
PKG_SHA256="ae35329db7027c740e90c883baf27c26311f0614e6a7b115771b28188b992aec"
|
||||
PKG_LICENSE="GPLv2+"
|
||||
PKG_SITE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"
|
||||
PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
|
||||
PKG_LONGDESC="Tools for interacting with the linux GPIO character device."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_BUILD_FLAGS="+pic -sysroot"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-tools --disable-shared"
|
||||
|
||||
post_make_target() {
|
||||
(
|
||||
export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
|
||||
export LDFLAGS+=" -L${PKG_BUILD}/.${TARGET_NAME}/lib/.libs"
|
||||
export LDSHARED="${CC} -shared"
|
||||
export CFLAGS+=" -fcommon -I${PKG_BUILD}/include"
|
||||
export CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}"
|
||||
cd ../bindings/python
|
||||
python3 setup.py build
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/bindings/python/setup.py 2024-11-12 14:29:25.000000000 +0100
|
||||
+++ b/bindings/python/setup.py 2025-01-05 17:00:00.000000000 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
from setuptools.command.build_ext import build_ext as orig_build_ext
|
||||
from setuptools.command.sdist import log
|
||||
from setuptools.command.sdist import sdist as orig_sdist
|
||||
-from setuptools.errors import BaseError
|
||||
+from distutils.errors import DistutilsError as BaseError
|
||||
|
||||
LINK_SYSTEM_LIBGPIOD = getenv("LINK_SYSTEM_LIBGPIOD") == "1"
|
||||
LIBGPIOD_MINIMUM_VERSION = "2.1"
|
||||
@@ -3,17 +3,12 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libid3tag"
|
||||
PKG_VERSION="0.15.1b"
|
||||
PKG_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
|
||||
PKG_VERSION="0.16.3"
|
||||
PKG_SHA256="0561009778513a95d91dac33cee8418d6622f710450a7cb56a74636d53b588cb"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.underbit.com/products/mad/"
|
||||
PKG_URL="ftp://ftp.mars.org/pub/mpeg/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="https://codeberg.org/tenacityteam/libid3tag/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain zlib"
|
||||
PKG_LONGDESC="A library for id3 tagging."
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static \
|
||||
--disable-shared"
|
||||
|
||||
post_makeinstall_target(){
|
||||
cp ${PKG_BUILD}/id3tag.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
|
||||
}
|
||||
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF"
|
||||
|
||||
@@ -20,7 +20,7 @@ configure_target() {
|
||||
--host=${TARGET_NAME} \
|
||||
--build=${HOST_NAME} \
|
||||
--enable-static \
|
||||
--disable-shared \
|
||||
--enable-shared \
|
||||
--prefix=/usr \
|
||||
--enable-visibility
|
||||
}
|
||||
@@ -36,6 +36,8 @@ makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/usr/include/MediaInfo/${i}/
|
||||
cp -aP ../../../Source/MediaInfo/${i}/*.h ${INSTALL}/usr/include/MediaInfo/${i}/
|
||||
done
|
||||
cp -P .libs/* ${INSTALL}/usr/lib
|
||||
|
||||
# only install static library, so mediainfo does not build with shared library
|
||||
cp -P .libs/libmediainfo.a ${INSTALL}/usr/lib
|
||||
cp -P libmediainfo.pc ${INSTALL}/usr/lib/pkgconfig
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libpcap"
|
||||
PKG_VERSION="1.10.4"
|
||||
PKG_SHA256="ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f"
|
||||
PKG_VERSION="1.10.5"
|
||||
PKG_SHA256="37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.tcpdump.org/"
|
||||
PKG_URL="https://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="tcpdump"
|
||||
PKG_VERSION="4.99.4"
|
||||
PKG_SHA256="0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea"
|
||||
PKG_VERSION="4.99.5"
|
||||
PKG_SHA256="8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb"
|
||||
PKG_SITE="https://www.tcpdump.org/"
|
||||
PKG_URL="https://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain libpcap libtirpc"
|
||||
|
||||
26
packages/addons/addon-depends/ntfs-3g_ntfsprogs/package.mk
Normal file
26
packages/addons/addon-depends/ntfs-3g_ntfsprogs/package.mk
Normal file
@@ -0,0 +1,26 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="ntfs-3g_ntfsprogs"
|
||||
PKG_VERSION="2022.10.3"
|
||||
PKG_SHA256="f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/tuxera/ntfs-3g"
|
||||
PKG_URL="https://tuxera.com/opensource/${PKG_NAME}-${PKG_VERSION}.tgz"
|
||||
PKG_DEPENDS_TARGET="toolchain fuse libgcrypt"
|
||||
PKG_LONGDESC="A NTFS driver with read and write support."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_BUILD_FLAGS="+lto +speed -sysroot"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \
|
||||
--disable-dependency-tracking \
|
||||
--disable-library \
|
||||
--enable-posix-acls \
|
||||
--enable-mtab \
|
||||
--enable-ntfsprogs \
|
||||
--disable-crypto \
|
||||
--with-fuse=external \
|
||||
--with-uuid \
|
||||
--disable-mount-helper"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="conmon"
|
||||
PKG_VERSION="2.1.10"
|
||||
PKG_SHA256="455fabcbd4a5a5dc5e05374a71b62dc0b08ee865c2ba398e9dc9acac1ea1836a"
|
||||
PKG_VERSION="2.1.12"
|
||||
PKG_SHA256="842f0b5614281f7e35eec2a4e35f9f7b9834819aa58ecdad8d0ff6a84f6796a6"
|
||||
PKG_LICENSE="Apache-2.0"
|
||||
PKG_SITE="https://github.com/containers/conmon"
|
||||
PKG_URL="https://github.com/containers/conmon/archive/v${PKG_VERSION}.tar.gz"
|
||||
@@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain glib libseccomp systemd"
|
||||
PKG_LONGDESC="An OCI container runtime monitor"
|
||||
|
||||
# Git commit of the matching release https://github.com/containers/conmon
|
||||
export PKG_GIT_COMMIT="2dcd736e46ded79a53339462bc251694b150f870"
|
||||
export PKG_GIT_COMMIT="e8896631295ccb0bfdda4284f1751be19b483264"
|
||||
|
||||
pre_configure_target() {
|
||||
export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libassuan"
|
||||
PKG_VERSION="2.5.7"
|
||||
PKG_SHA256="0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"
|
||||
PKG_VERSION="3.0.1"
|
||||
PKG_SHA256="c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"
|
||||
PKG_LICENSE="LGPLv2.1+"
|
||||
PKG_SITE="https://gnupg.org/software/libassuan/index.html"
|
||||
PKG_URL="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_VERSION}.tar.bz2"
|
||||
|
||||
@@ -2,10 +2,24 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="netavark"
|
||||
PKG_VERSION="1.10.3"
|
||||
PKG_SHA256="fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7"
|
||||
PKG_VERSION="1.12.2"
|
||||
PKG_SHA256="d1e5a7e65b825724fd084b0162084d9b61db8cda1dad26de8a07be1bd6891dbc"
|
||||
PKG_LICENSE="Apache-2.0"
|
||||
PKG_SITE="https://github.com/containers/netavark"
|
||||
PKG_URL="https://github.com/containers/netavark/archive/v${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain cargo:host protobuf:host"
|
||||
PKG_LONGDESC="Container network stack"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
make_target() {
|
||||
cargo build \
|
||||
--target ${TARGET_NAME} \
|
||||
--release \
|
||||
--locked \
|
||||
--all-features
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p ${INSTALL}
|
||||
cp ${PKG_BUILD}/.${TARGET_NAME}/target/${TARGET_NAME}/release/netavark ${INSTALL}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
--- a/Makefile 2023-02-05 14:03:46.260848926 +0000
|
||||
+++ b/Makefile 2023-02-05 14:03:51.737539552 +0000
|
||||
@@ -73,7 +73,6 @@
|
||||
--- a/Makefile 2024-05-30 14:20:33.000000000 +0000
|
||||
+++ b/Makefile 2024-06-01 01:36:21.083916685 +0000
|
||||
@@ -96,7 +96,6 @@
|
||||
.PHONY: install
|
||||
install: $(NV_UNIT_FILES)
|
||||
install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)/$(LIBEXECPODMAN)/netavark
|
||||
install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)$(LIBEXECPODMAN)/netavark
|
||||
- $(MAKE) -C docs install
|
||||
install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}
|
||||
install ${SELINUXOPT} -m 644 contrib/systemd/system/netavark-dhcp-proxy.socket ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.socket
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="podman-bin"
|
||||
PKG_VERSION="5.0.2"
|
||||
PKG_SHA256="85c3f70a1c293ccf48907d8e9fe13c6c9aac67242525a539296beeef31ba11a8"
|
||||
PKG_VERSION="5.2.2"
|
||||
PKG_SHA256="571658f175d61724269c1a20626c1e39424af59b7bcf7ff94135d03b790bbecb"
|
||||
PKG_LICENSE="Apache-2.0"
|
||||
PKG_SITE="https://podman.io/"
|
||||
PKG_URL="https://github.com/containers/podman/archive/v${PKG_VERSION}.tar.gz"
|
||||
@@ -12,7 +12,7 @@ PKG_LONGDESC="Podman: A tool for managing OCI containers and pods."
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
# Git commit of the matching release https://github.com/containers/podman
|
||||
export PKG_GIT_COMMIT="3304dd95b8978a8346b96b7d43134990609b3b29"
|
||||
export PKG_GIT_COMMIT="fcee48106a12dd531702d729d17f40f6e152027f"
|
||||
|
||||
PKG_PODMAN_BUILDTAGS="exclude_graphdriver_devicemapper \
|
||||
exclude_graphdriver_btrfs \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
diff -Nur a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go
|
||||
--- a/pkg/api/handlers/libpod/swagger_spec.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/api/handlers/libpod/swagger_spec.go 2024-03-20 11:56:21.227611985 +0000
|
||||
@@ -10,7 +10,7 @@
|
||||
--- a/pkg/api/handlers/libpod/swagger_spec.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/api/handlers/libpod/swagger_spec.go 2024-09-14 06:41:57.836922873 +0000
|
||||
@@ -13,7 +13,7 @@
|
||||
)
|
||||
|
||||
// DefaultPodmanSwaggerSpec provides the default path to the podman swagger spec file
|
||||
@@ -11,8 +11,8 @@ diff -Nur a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/sw
|
||||
func ServeSwagger(w http.ResponseWriter, r *http.Request) {
|
||||
path := DefaultPodmanSwaggerSpec
|
||||
diff -Nur a/pkg/machine/define/config.go b/pkg/machine/define/config.go
|
||||
--- a/pkg/machine/define/config.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/machine/define/config.go 2024-03-20 11:56:21.260945621 +0000
|
||||
--- a/pkg/machine/define/config.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/machine/define/config.go 2024-09-14 06:41:57.863589758 +0000
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import "os"
|
||||
@@ -21,11 +21,11 @@ diff -Nur a/pkg/machine/define/config.go b/pkg/machine/define/config.go
|
||||
+const UserCertsTargetPath = "/storage/.kodi/addons/service.system.podman/etc/containers/certs.d"
|
||||
const DefaultIdentityName = "machine"
|
||||
|
||||
var (
|
||||
// MountTag is an identifier to mount a VirtioFS file system tag on a mount point in the VM.
|
||||
diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go
|
||||
--- a/pkg/machine/ignition/ignition.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/machine/ignition/ignition.go 2024-03-20 11:56:21.270945712 +0000
|
||||
@@ -365,7 +365,7 @@
|
||||
--- a/pkg/machine/ignition/ignition.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/machine/ignition/ignition.go 2024-09-14 06:41:57.870256479 +0000
|
||||
@@ -381,7 +381,7 @@
|
||||
files = append(files, File{
|
||||
Node: Node{
|
||||
Group: GetNodeGrp("root"),
|
||||
@@ -35,9 +35,9 @@ diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go
|
||||
},
|
||||
FileEmbedded1: FileEmbedded1{
|
||||
diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
|
||||
--- a/pkg/machine/wsl/machine.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/machine/wsl/machine.go 2024-03-20 11:56:21.267612349 +0000
|
||||
@@ -179,7 +179,7 @@
|
||||
--- a/pkg/machine/wsl/machine.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/machine/wsl/machine.go 2024-09-14 06:41:57.870256479 +0000
|
||||
@@ -180,7 +180,7 @@
|
||||
return fmt.Errorf("could not configure systemd settings for guest OS: %w", err)
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
|
||||
return fmt.Errorf("could not create containers.conf for guest OS: %w", err)
|
||||
}
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
@@ -192,7 +192,7 @@
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
|
||||
return fmt.Errorf("could not create podman-machine file for guest OS: %w", err)
|
||||
}
|
||||
|
||||
@@ -264,7 +264,7 @@
|
||||
@@ -265,7 +265,7 @@
|
||||
}
|
||||
|
||||
func configureRegistries(dist string) error {
|
||||
@@ -65,8 +65,8 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
|
||||
return fmt.Errorf("could not configure registries on guest OS: %w", err)
|
||||
}
|
||||
diff -Nur a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go
|
||||
--- a/pkg/systemd/generate/containers_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/systemd/generate/containers_test.go 2024-03-20 11:56:21.234278713 +0000
|
||||
--- a/pkg/systemd/generate/containers_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/systemd/generate/containers_test.go 2024-09-14 06:41:57.843589594 +0000
|
||||
@@ -1045,7 +1045,7 @@
|
||||
StopTimeout: 22,
|
||||
PodmanVersion: "CI",
|
||||
@@ -383,8 +383,8 @@ diff -Nur a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/conta
|
||||
RestartSec: 15,
|
||||
},
|
||||
diff -Nur a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go
|
||||
--- a/pkg/systemd/generate/pods_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/systemd/generate/pods_test.go 2024-03-20 11:56:21.234278713 +0000
|
||||
--- a/pkg/systemd/generate/pods_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/systemd/generate/pods_test.go 2024-09-14 06:41:57.843589594 +0000
|
||||
@@ -485,7 +485,7 @@
|
||||
PIDFile: "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
|
||||
StopTimeout: 42,
|
||||
@@ -521,9 +521,9 @@ diff -Nur a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.g
|
||||
RequiredServices: []string{"container-1", "container-2"},
|
||||
CreateCommand: []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"},
|
||||
diff -Nur a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
|
||||
--- a/pkg/systemd/quadlet/quadlet.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/systemd/quadlet/quadlet.go 2024-03-20 11:56:21.237612076 +0000
|
||||
@@ -20,9 +20,9 @@
|
||||
--- a/pkg/systemd/quadlet/quadlet.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/systemd/quadlet/quadlet.go 2024-09-14 06:41:57.843589594 +0000
|
||||
@@ -21,9 +21,9 @@
|
||||
// but it is causing bloat
|
||||
autoUpdateLabel = "io.containers.autoupdate"
|
||||
// Directory for global Quadlet files (sysadmin owned)
|
||||
@@ -536,9 +536,9 @@ diff -Nur a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
|
||||
// Names of commonly used systemd/quadlet group names
|
||||
ContainerGroup = "Container"
|
||||
diff -Nur a/pkg/trust/registries.go b/pkg/trust/registries.go
|
||||
--- a/pkg/trust/registries.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/pkg/trust/registries.go 2024-03-20 11:56:21.260945621 +0000
|
||||
@@ -28,7 +28,7 @@
|
||||
--- a/pkg/trust/registries.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/pkg/trust/registries.go 2024-09-14 06:41:57.860256397 +0000
|
||||
@@ -29,7 +29,7 @@
|
||||
}
|
||||
|
||||
// systemRegistriesDirPath is the path to registries.d.
|
||||
@@ -548,9 +548,9 @@ diff -Nur a/pkg/trust/registries.go b/pkg/trust/registries.go
|
||||
// userRegistriesDir is the path to the per user registries.d.
|
||||
var userRegistriesDir = filepath.FromSlash(".config/containers/registries.d")
|
||||
diff -Nur a/test/e2e/common_test.go b/test/e2e/common_test.go
|
||||
--- a/test/e2e/common_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/common_test.go 2024-03-20 11:56:21.417613710 +0000
|
||||
@@ -293,7 +293,7 @@
|
||||
--- a/test/e2e/common_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/common_test.go 2024-09-14 06:41:58.060258033 +0000
|
||||
@@ -284,7 +284,7 @@
|
||||
}
|
||||
|
||||
networkBackend := Netavark
|
||||
@@ -560,33 +560,33 @@ diff -Nur a/test/e2e/common_test.go b/test/e2e/common_test.go
|
||||
networkConfigDir = filepath.Join(root, "etc", "networks")
|
||||
}
|
||||
diff -Nur a/test/e2e/create_test.go b/test/e2e/create_test.go
|
||||
--- a/test/e2e/create_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/create_test.go 2024-03-20 11:56:21.420947074 +0000
|
||||
@@ -351,7 +351,7 @@
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).To(ExitWithError())
|
||||
--- a/test/e2e/create_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/create_test.go 2024-09-14 06:41:58.063591394 +0000
|
||||
@@ -355,7 +355,7 @@
|
||||
Expect(session).To(ExitWithError(125, "open /no/such/file: no such file or directory"))
|
||||
}
|
||||
|
||||
- session = podmanTest.Podman([]string{"create", "-q", "--pull=always", "--signature-policy", "/etc/containers/policy.json", ALPINE})
|
||||
+ session = podmanTest.Podman([]string{"create", "-q", "--pull=always", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", ALPINE})
|
||||
session.WaitWithDefaultTimeout()
|
||||
if IsRemote() {
|
||||
Expect(session).To(ExitWithError())
|
||||
Expect(session).Should(ExitCleanly())
|
||||
})
|
||||
diff -Nur a/test/e2e/import_test.go b/test/e2e/import_test.go
|
||||
--- a/test/e2e/import_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/import_test.go 2024-03-20 11:56:21.407613619 +0000
|
||||
@@ -173,7 +173,7 @@
|
||||
--- a/test/e2e/import_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/import_test.go 2024-09-14 06:41:58.053591313 +0000
|
||||
@@ -175,7 +175,7 @@
|
||||
importImage.WaitWithDefaultTimeout()
|
||||
Expect(importImage).To(ExitWithError())
|
||||
Expect(importImage).To(ExitWithError(125, "open /no/such/file: no such file or directory"))
|
||||
|
||||
- result := podmanTest.Podman([]string{"import", "-q", "--signature-policy", "/etc/containers/policy.json", outfile})
|
||||
+ result := podmanTest.Podman([]string{"import", "-q", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", outfile})
|
||||
result.WaitWithDefaultTimeout()
|
||||
if IsRemote() {
|
||||
Expect(result).To(ExitWithError())
|
||||
Expect(result).Should(ExitCleanly())
|
||||
})
|
||||
diff -Nur a/test/e2e/load_test.go b/test/e2e/load_test.go
|
||||
--- a/test/e2e/load_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/load_test.go 2024-03-20 11:56:21.407613619 +0000
|
||||
@@ -83,7 +83,7 @@
|
||||
--- a/test/e2e/load_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/load_test.go 2024-09-14 06:41:58.053591313 +0000
|
||||
@@ -85,7 +85,7 @@
|
||||
rmi.WaitWithDefaultTimeout()
|
||||
Expect(rmi).Should(ExitCleanly())
|
||||
|
||||
@@ -594,11 +594,11 @@ diff -Nur a/test/e2e/load_test.go b/test/e2e/load_test.go
|
||||
+ result := podmanTest.Podman([]string{"load", "-q", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", "-i", outfile})
|
||||
result.WaitWithDefaultTimeout()
|
||||
if IsRemote() {
|
||||
Expect(result).To(ExitWithError())
|
||||
Expect(result).To(ExitWithError(125, "unknown flag: --signature-policy"))
|
||||
diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
|
||||
--- a/test/e2e/push_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/push_test.go 2024-03-20 11:56:21.410946983 +0000
|
||||
@@ -196,11 +196,11 @@
|
||||
--- a/test/e2e/push_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/push_test.go 2024-09-14 06:41:58.056924672 +0000
|
||||
@@ -197,11 +197,11 @@
|
||||
// Ideally, this should set SystemContext.RegistriesDirPath, but Podman currently doesn’t
|
||||
// expose that as an option. So, for now, modify /etc/directly, and skip testing sigstore if
|
||||
// we don’t have permission to do so.
|
||||
@@ -612,7 +612,7 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
|
||||
} else {
|
||||
defer func() {
|
||||
err := os.Remove(systemRegistriesDAddition)
|
||||
@@ -268,16 +268,16 @@
|
||||
@@ -267,16 +267,16 @@
|
||||
})
|
||||
|
||||
It("podman push to local registry with authorization", func() {
|
||||
@@ -632,7 +632,7 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
|
||||
|
||||
cwd, _ := os.Getwd()
|
||||
certPath := filepath.Join(cwd, "../", "certs")
|
||||
@@ -317,7 +317,7 @@
|
||||
@@ -315,7 +315,7 @@
|
||||
Expect(push).Should(Exit(0))
|
||||
Expect(push.ErrorToString()).To(ContainSubstring("Writing manifest to image destination"))
|
||||
|
||||
@@ -642,21 +642,21 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
|
||||
|
||||
push = podmanTest.Podman([]string{"push", "--creds=podmantest:wrongpasswd", ALPINE, "localhost:5004/credstest"})
|
||||
diff -Nur a/test/e2e/run_test.go b/test/e2e/run_test.go
|
||||
--- a/test/e2e/run_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/run_test.go 2024-03-20 11:56:21.404280256 +0000
|
||||
@@ -117,7 +117,7 @@
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).To(ExitWithError())
|
||||
--- a/test/e2e/run_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/run_test.go 2024-09-14 06:41:58.053591313 +0000
|
||||
@@ -124,7 +124,7 @@
|
||||
}
|
||||
Expect(session).To(ExitWithError(125, "open /no/such/file: no such file or directory"))
|
||||
|
||||
- session = podmanTest.Podman([]string{"run", "--pull=always", "--signature-policy", "/etc/containers/policy.json", ALPINE})
|
||||
+ session = podmanTest.Podman([]string{"run", "--pull=always", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", ALPINE})
|
||||
session.WaitWithDefaultTimeout()
|
||||
if IsRemote() {
|
||||
Expect(session).To(ExitWithError())
|
||||
Expect(session).Should(Exit(0))
|
||||
Expect(session.ErrorToString()).To(ContainSubstring("Getting image source signatures"))
|
||||
diff -Nur a/test/e2e/save_test.go b/test/e2e/save_test.go
|
||||
--- a/test/e2e/save_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/save_test.go 2024-03-20 11:56:21.400946892 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
--- a/test/e2e/save_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/save_test.go 2024-09-14 06:41:58.050257951 +0000
|
||||
@@ -29,7 +29,7 @@
|
||||
SkipIfRemote("--signature-policy N/A for remote")
|
||||
outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
|
||||
|
||||
@@ -695,9 +695,9 @@ diff -Nur a/test/e2e/save_test.go b/test/e2e/save_test.go
|
||||
pushedImage := fmt.Sprintf("localhost:%d/alpine", port)
|
||||
session = podmanTest.Podman([]string{"tag", ALPINE, pushedImage})
|
||||
diff -Nur a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
|
||||
--- a/test/e2e/system_reset_test.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/test/e2e/system_reset_test.go 2024-03-20 11:56:21.400946892 +0000
|
||||
@@ -43,7 +43,7 @@
|
||||
--- a/test/e2e/system_reset_test.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/test/e2e/system_reset_test.go 2024-09-14 06:41:58.050257951 +0000
|
||||
@@ -45,7 +45,7 @@
|
||||
Expect(session).Should(ExitCleanly())
|
||||
|
||||
Expect(session.ErrorToString()).To(Not(ContainSubstring("Failed to add pause process")))
|
||||
@@ -707,8 +707,8 @@ diff -Nur a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
|
||||
session = podmanTest.Podman([]string{"images", "-n"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go
|
||||
--- a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-03-20 11:56:22.294288333 +0000
|
||||
--- a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go 2024-09-14 06:41:58.693596546 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
// cniConfigDir is the directory where cni configuration is found
|
||||
cniConfigDir = "/usr/local/etc/cni/net.d/"
|
||||
@@ -719,8 +719,8 @@ diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_fre
|
||||
netavarkRunDir = "/var/run/containers/networks"
|
||||
)
|
||||
diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go
|
||||
--- a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-03-20 11:56:22.294288333 +0000
|
||||
--- a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go 2024-09-14 06:41:58.693596546 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
// cniConfigDir is the directory where cni configuration is found
|
||||
cniConfigDir = "/etc/cni/net.d/"
|
||||
@@ -730,9 +730,21 @@ diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_lin
|
||||
// netavarkRunDir is the run directory for the rootful temporary network files such as the ipam db
|
||||
netavarkRunDir = "/run/containers/networks"
|
||||
)
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/config/config_bsd.go b/vendor/github.com/containers/common/pkg/config/config_bsd.go
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_bsd.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_bsd.go 2024-09-14 06:41:58.690263186 +0000
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
- DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
|
||||
+ DefaultSignaturePolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
|
||||
)
|
||||
|
||||
var defaultHelperBinariesDir = []string{
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/vendor/github.com/containers/common/pkg/config/config_darwin.go
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-03-20 11:56:22.290954970 +0000
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go 2024-09-14 06:41:58.690263186 +0000
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
// DefaultSignaturePolicyPath is the default value for the
|
||||
@@ -741,22 +753,10 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/ve
|
||||
+ DefaultSignaturePolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
|
||||
)
|
||||
|
||||
var defaultHelperBinariesDir = []string{
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/config/config_freebsd.go b/vendor/github.com/containers/common/pkg/config/config_freebsd.go
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_freebsd.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_freebsd.go 2024-03-20 11:56:22.290954970 +0000
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
- DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
|
||||
+ DefaultSignaturePolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
|
||||
)
|
||||
|
||||
var defaultHelperBinariesDir = []string{
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/github.com/containers/common/pkg/config/config_linux.go
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-03-20 11:56:22.290954970 +0000
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_linux.go 2024-09-14 06:41:58.693596546 +0000
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
// DefaultSignaturePolicyPath is the default value for the
|
||||
@@ -767,9 +767,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_linux.go b/ven
|
||||
|
||||
func selinuxEnabled() bool {
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-03-20 11:56:22.290954970 +0000
|
||||
@@ -11,7 +11,7 @@
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config_windows.go 2024-09-14 06:41:58.690263186 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
@@ -779,9 +779,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_windows.go b/v
|
||||
// Mount type for mounting host dir
|
||||
_typeBind = "bind"
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
|
||||
--- a/vendor/github.com/containers/common/pkg/config/default.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/default.go 2024-03-20 11:56:22.290954970 +0000
|
||||
@@ -22,7 +22,7 @@
|
||||
--- a/vendor/github.com/containers/common/pkg/config/default.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/default.go 2024-09-14 06:41:58.690263186 +0000
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
const (
|
||||
// _defaultGraphRoot points to the default path of the graph root.
|
||||
@@ -790,18 +790,18 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/g
|
||||
|
||||
// _defaultTransport is a prefix that we apply to an image name to check
|
||||
// docker hub first for the image.
|
||||
@@ -73,7 +73,7 @@
|
||||
@@ -74,7 +74,7 @@
|
||||
// ErrInvalidArg indicates that an invalid argument was passed.
|
||||
ErrInvalidArg = errors.New("invalid argument")
|
||||
// DefaultHooksDirs defines the default hooks directory.
|
||||
- DefaultHooksDirs = []string{"/usr/share/containers/oci/hooks.d"}
|
||||
+ DefaultHooksDirs = []string{"/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/oci/hooks.d"}
|
||||
// DefaultCdiSpecDirs defines the default cdi spec directories.
|
||||
DefaultCdiSpecDirs = []string{"/etc/cdi"}
|
||||
// DefaultCapabilities is the default for the default_capabilities option in the containers.conf file.
|
||||
DefaultCapabilities = []string{
|
||||
"CAP_CHOWN",
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/github.com/containers/common/pkg/hooks/hooks.go
|
||||
--- a/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-03-20 11:56:22.284288242 +0000
|
||||
--- a/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go 2024-09-14 06:41:58.686929825 +0000
|
||||
@@ -20,10 +20,10 @@
|
||||
|
||||
const (
|
||||
@@ -816,8 +816,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/gith
|
||||
|
||||
// Manager provides an opaque interface for managing CRI-O hooks.
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/github.com/containers/common/pkg/machine/machine.go
|
||||
--- a/vendor/github.com/containers/common/pkg/machine/machine.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/machine/machine.go 2024-03-20 11:56:22.294288333 +0000
|
||||
--- a/vendor/github.com/containers/common/pkg/machine/machine.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/machine/machine.go 2024-09-14 06:41:58.693596546 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
}
|
||||
|
||||
@@ -828,9 +828,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/
|
||||
Qemu = "qemu"
|
||||
AppleHV = "applehv"
|
||||
diff -Nur a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go
|
||||
--- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-03-20 11:56:22.287621606 +0000
|
||||
@@ -18,10 +18,10 @@
|
||||
--- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go 2024-09-14 06:41:58.690263186 +0000
|
||||
@@ -19,10 +19,10 @@
|
||||
var (
|
||||
// DefaultMountsFile holds the default mount paths in the form
|
||||
// "host_path:container_path"
|
||||
@@ -844,9 +844,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.
|
||||
// "host_path:container_path" overridden by the rootless user
|
||||
UserOverrideMountsFile = filepath.Join(os.Getenv("HOME"), ".config/containers/mounts.conf")
|
||||
diff -Nur a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendor/github.com/containers/image/v5/docker/registries_d.go
|
||||
--- a/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-03-20 11:56:22.267621424 +0000
|
||||
@@ -34,7 +34,7 @@
|
||||
--- a/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/docker/registries_d.go 2024-09-14 06:41:58.673596383 +0000
|
||||
@@ -35,7 +35,7 @@
|
||||
var defaultUserDockerDir = filepath.FromSlash(".local/share/containers/sigstore")
|
||||
|
||||
// defaultDockerDir is the default lookaside directory for root
|
||||
@@ -856,8 +856,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendo
|
||||
// registryConfiguration is one of the files in registriesDirPath configuring lookaside locations, or the result of merging them all.
|
||||
// NOTE: Keep this in sync with docs/registries.d.md!
|
||||
diff -Nur a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go
|
||||
--- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-03-20 11:56:22.257621333 +0000
|
||||
--- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go 2024-09-14 06:41:58.666929661 +0000
|
||||
@@ -17,7 +17,7 @@
|
||||
// If the format changes in an incompatible way, increase the version number.
|
||||
blobInfoCacheFilename = "blob-info-cache-v1.sqlite"
|
||||
@@ -868,8 +868,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b
|
||||
|
||||
// blobInfoCacheDir returns a path to a blob info cache appropriate for sys and euid.
|
||||
diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go
|
||||
--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-03-20 11:56:22.254287971 +0000
|
||||
--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go 2024-09-14 06:41:58.663596301 +0000
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
// builtinRegistriesConfPath is the path to the registry configuration file.
|
||||
@@ -882,8 +882,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_comm
|
||||
-const builtinRegistriesConfDirPath = "/etc/containers/registries.conf.d"
|
||||
+const builtinRegistriesConfDirPath = "/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d"
|
||||
diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go
|
||||
--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-03-20 11:56:22.254287971 +0000
|
||||
--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go 2024-09-14 06:41:58.663596301 +0000
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
// builtinRegistriesConfPath is the path to the registry configuration file.
|
||||
@@ -896,8 +896,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_free
|
||||
-const builtinRegistriesConfDirPath = "/usr/local/etc/containers/registries.conf.d"
|
||||
+const builtinRegistriesConfDirPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d"
|
||||
diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go
|
||||
--- a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-03-20 11:56:22.257621333 +0000
|
||||
--- a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go 2024-09-14 06:41:58.666929661 +0000
|
||||
@@ -5,4 +5,4 @@
|
||||
|
||||
// builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
|
||||
@@ -905,17 +905,29 @@ diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_common.
|
||||
-const builtinDefaultPolicyPath = "/etc/containers/policy.json"
|
||||
+const builtinDefaultPolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
|
||||
diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go
|
||||
--- a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-03-20 11:56:22.257621333 +0000
|
||||
--- a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go 2024-09-14 06:41:58.666929661 +0000
|
||||
@@ -5,4 +5,4 @@
|
||||
|
||||
// builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
|
||||
// DO NOT change this, instead see systemDefaultPolicyPath above.
|
||||
-const builtinDefaultPolicyPath = "/usr/local/etc/containers/policy.json"
|
||||
+const builtinDefaultPolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
|
||||
diff -Nur a/vendor/github.com/containers/storage/types/options_bsd.go b/vendor/github.com/containers/storage/types/options_bsd.go
|
||||
--- a/vendor/github.com/containers/storage/types/options_bsd.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_bsd.go 2024-09-14 06:41:58.643596138 +0000
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
// defaultConfigFile path to the system wide storage.conf file
|
||||
var (
|
||||
- defaultOverrideConfigFile = "/usr/local/etc/containers/storage.conf"
|
||||
+ defaultOverrideConfigFile = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/storage.conf"
|
||||
)
|
||||
|
||||
// canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
|
||||
diff -Nur a/vendor/github.com/containers/storage/types/options_darwin.go b/vendor/github.com/containers/storage/types/options_darwin.go
|
||||
--- a/vendor/github.com/containers/storage/types/options_darwin.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_darwin.go 2024-03-20 11:56:22.227621061 +0000
|
||||
--- a/vendor/github.com/containers/storage/types/options_darwin.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_darwin.go 2024-09-14 06:41:58.643596138 +0000
|
||||
@@ -4,11 +4,11 @@
|
||||
// these are default path for run and graph root for rootful users
|
||||
// for rootless path is constructed via getRootlessStorageOpts
|
||||
@@ -930,22 +942,10 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_darwin.go b/vendo
|
||||
+var defaultOverrideConfigFile = "/storage/.kodi/addons/service.system.podman/etc/containers/storage.conf"
|
||||
|
||||
// canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
|
||||
func canUseRootlessOverlay(home, runhome string) bool {
|
||||
diff -Nur a/vendor/github.com/containers/storage/types/options_freebsd.go b/vendor/github.com/containers/storage/types/options_freebsd.go
|
||||
--- a/vendor/github.com/containers/storage/types/options_freebsd.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_freebsd.go 2024-03-20 11:56:22.227621061 +0000
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
// defaultConfigFile path to the system wide storage.conf file
|
||||
var (
|
||||
- defaultOverrideConfigFile = "/usr/local/etc/containers/storage.conf"
|
||||
+ defaultOverrideConfigFile = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/storage.conf"
|
||||
)
|
||||
|
||||
// canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
|
||||
func canUseRootlessOverlay() bool {
|
||||
diff -Nur a/vendor/github.com/containers/storage/types/options_linux.go b/vendor/github.com/containers/storage/types/options_linux.go
|
||||
--- a/vendor/github.com/containers/storage/types/options_linux.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_linux.go 2024-03-20 11:56:22.227621061 +0000
|
||||
--- a/vendor/github.com/containers/storage/types/options_linux.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_linux.go 2024-09-14 06:41:58.643596138 +0000
|
||||
@@ -12,13 +12,13 @@
|
||||
// these are default path for run and graph root for rootful users
|
||||
// for rootless path is constructed via getRootlessStorageOpts
|
||||
@@ -964,8 +964,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_linux.go b/vendor
|
||||
|
||||
// canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
|
||||
diff -Nur a/vendor/github.com/containers/storage/types/options_windows.go b/vendor/github.com/containers/storage/types/options_windows.go
|
||||
--- a/vendor/github.com/containers/storage/types/options_windows.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_windows.go 2024-03-20 11:56:22.227621061 +0000
|
||||
--- a/vendor/github.com/containers/storage/types/options_windows.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/containers/storage/types/options_windows.go 2024-09-14 06:41:58.643596138 +0000
|
||||
@@ -4,13 +4,13 @@
|
||||
// these are default path for run and graph root for rootful users
|
||||
// for rootless path is constructed via getRootlessStorageOpts
|
||||
@@ -984,8 +984,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_windows.go b/vend
|
||||
|
||||
// canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
|
||||
diff -Nur a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
|
||||
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-03-19 09:47:46.000000000 +0000
|
||||
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-03-20 11:56:22.077619701 +0000
|
||||
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-08-21 17:43:11.000000000 +0000
|
||||
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go 2024-09-14 06:41:58.540261960 +0000
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
const (
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="runc"
|
||||
PKG_VERSION="1.1.13"
|
||||
PKG_SHA256="789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25"
|
||||
PKG_VERSION="1.2.0"
|
||||
PKG_SHA256="25072beb84f4adae316a968241dc74ac30982d38e4459635074aa9e9d87d3de7"
|
||||
PKG_LICENSE="APL"
|
||||
PKG_SITE="https://github.com/opencontainers/runc"
|
||||
PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz"
|
||||
@@ -13,7 +13,7 @@ PKG_LONGDESC="A CLI tool for spawning and running containers according to the OC
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
# Git commit of the matching release https://github.com/opencontainers/runc/releases
|
||||
export PKG_GIT_COMMIT="58aa9203c123022138b22cf96540c284876a7910"
|
||||
export PKG_GIT_COMMIT="0b9fa21be2bcba45f6d9d748b4bcf70cfbffbc19"
|
||||
|
||||
pre_make_target() {
|
||||
go_configure
|
||||
|
||||
@@ -6,8 +6,8 @@ PKG_NAME="alsa-plugins"
|
||||
PKG_VERSION="1.2.7.1"
|
||||
PKG_SHA256="8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.alsa-project.org/"
|
||||
PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_SITE="https://www.alsa-project.org/wiki/Main_Page"
|
||||
PKG_URL="http://www.alsa-project.org/files/pub/plugins/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain alsa-lib"
|
||||
PKG_LONGDESC="Alsa plugins."
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bottom"
|
||||
PKG_VERSION="0.9.7"
|
||||
PKG_SHA256="29c3f75323ae0245576ea23268bb0956757352bf3b16d05f511357655b9cc71e"
|
||||
PKG_VERSION="0.10.2"
|
||||
PKG_SHA256="1db45fe9bc1fabb62d67bf8a1ea50c96e78ff4d2a5e25bf8ae8880e3ad5af80a"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://github.com/ClementTsang/bottom"
|
||||
PKG_URL="https://github.com/ClementTsang/bottom/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libgpiod"
|
||||
PKG_VERSION="2.1.2"
|
||||
PKG_SHA256="b1bdf1e3f75238695f93e442062bafc069170f2bf4f0cd4b8e049ca67131a1f0"
|
||||
PKG_LICENSE="GPLv2+"
|
||||
PKG_SITE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"
|
||||
PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="Tools for interacting with the linux GPIO character device."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-tools --disable-shared"
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mc"
|
||||
PKG_VERSION="4.8.31"
|
||||
PKG_SHA256="24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a"
|
||||
PKG_VERSION="4.8.32"
|
||||
PKG_SHA256="4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.midnight-commander.org"
|
||||
PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@@ -2,11 +2,13 @@
|
||||
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mmc-utils"
|
||||
PKG_VERSION="613495ecaca97a19fa7f8f3ea23306472b36453c"
|
||||
PKG_SHA256="1c76924aa3f636af70bd841bc1dcd85d5728ef1d4326921da30cbab7d643e2a7"
|
||||
PKG_VERSION="123fd8b2ac3933be1319486fb1f32236a4a86a7c"
|
||||
PKG_SHA256="d718338740cc75c8b0b54647a0522baff1824a31d4f9ee7d0d022405d07284f6"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.kernel.org/doc/html/latest/driver-api/mmc/mmc-tools.html"
|
||||
PKG_URL="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="Configure MMC storage devices from userspace."
|
||||
PKG_BUILD_FLAGS="-sysroot"
|
||||
|
||||
PKG_MAKE_OPTS_TARGET+=" C="
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pv"
|
||||
PKG_VERSION="1.8.12"
|
||||
PKG_SHA256="9687f9deedb09d0dc00d80c30691f0c91282c0d5d8fa7d6a2a085c8742c2cd7c"
|
||||
PKG_VERSION="1.8.14"
|
||||
PKG_SHA256="0cc18811a4809a587d4b11d47691bbc0ad83a5d95d2c2606af74ea7b4a674756"
|
||||
PKG_LICENSE="GNU"
|
||||
PKG_SITE="http://www.ivarch.com/programs/pv.shtml"
|
||||
PKG_URL="http://www.ivarch.com/programs/sources/pv-${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="screen"
|
||||
PKG_VERSION="4.9.1"
|
||||
PKG_SHA256="26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69"
|
||||
PKG_VERSION="5.0.0"
|
||||
PKG_SHA256="f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.gnu.org/software/screen/"
|
||||
PKG_URL="https://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
@@ -13,9 +13,6 @@ PKG_BUILD_FLAGS="-sysroot -parallel"
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
|
||||
--enable-colors256 \
|
||||
--disable-pam \
|
||||
--disable-use-locale \
|
||||
--disable-telnet \
|
||||
--disable-socket-dir"
|
||||
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
diff -Nu screen-5.0.0/display.c screen-5.0.0/display.c
|
||||
--- screen-5.0.0/display.c 2024-08-28 19:55:03.000000000 +0000
|
||||
+++ screen-5.0.0/display.c 2024-08-29 18:08:34.942979909 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
#include "mark.h"
|
||||
#include "misc.h"
|
||||
#include "process.h"
|
||||
-#include "pty.h"
|
||||
+#include "screen-pty.h"
|
||||
#include "resize.h"
|
||||
#include "termcap.h"
|
||||
#include "tty.h"
|
||||
diff -Nu screen-5.0.0/Makefile.in screen-5.0.0/Makefile.in
|
||||
--- screen-5.0.0/Makefile.in 2024-08-28 19:55:03.000000000 +0000
|
||||
+++ screen-5.0.0/Makefile.in 2024-08-29 18:10:05.120409357 +0000
|
||||
@@ -66,7 +66,7 @@
|
||||
$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
|
||||
|
||||
.c.o:
|
||||
- $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
|
||||
+ $(CC) -c -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $< -o $@
|
||||
|
||||
check: $(TESTBIN)
|
||||
for f in $(TESTBIN); do \
|
||||
@@ -197,12 +197,12 @@
|
||||
logfile.h mark.h input.h
|
||||
tty.o: tty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \
|
||||
term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h \
|
||||
- fileio.h misc.h pty.h telnet.h tty.h
|
||||
+ fileio.h misc.h screen-pty.h telnet.h tty.h
|
||||
term.o: term.c term.h
|
||||
window.o: window.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \
|
||||
layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
|
||||
logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h help.h \
|
||||
- input.h mark.h misc.h process.h pty.h resize.h telnet.h termcap.h tty.h \
|
||||
+ input.h mark.h misc.h process.h screen-pty.h resize.h telnet.h termcap.h tty.h \
|
||||
utmp.h
|
||||
utmp.o: utmp.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \
|
||||
layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
|
||||
@@ -229,7 +229,7 @@
|
||||
display.o: display.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \
|
||||
layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
|
||||
logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h mark.h \
|
||||
- misc.h process.h pty.h resize.h termcap.h tty.h
|
||||
+ misc.h process.h screen-pty.h resize.h termcap.h tty.h
|
||||
comm.o: comm.c config.h os.h screen.h ansi.h sched.h acls.h comm.h \
|
||||
layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
|
||||
logfile.h
|
||||
diff -Nu screen-5.0.0/pty.c screen-5.0.0/pty.c
|
||||
--- screen-5.0.0/pty.c 2024-08-28 19:55:03.000000000 +0000
|
||||
+++ screen-5.0.0/pty.c 2024-08-29 18:09:06.889919017 +0000
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
-#include "pty.h"
|
||||
+#include "screen-pty.h"
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
diff -Nu screen-5.0.0/pty.h screen-5.0.0/pty.h
|
||||
--- screen-5.0.0/pty.h 2024-08-28 19:55:03.000000000 +0000
|
||||
+++ screen-5.0.0/pty.h 1970-01-01 00:00:00.000000000 +0000
|
||||
@@ -1,11 +0,0 @@
|
||||
-#ifndef SCREEN_PTY_H
|
||||
-#define SCREEN_PTY_H
|
||||
-
|
||||
-int OpenPTY (char **);
|
||||
-int ClosePTY (int);
|
||||
-
|
||||
-/* global variables */
|
||||
-
|
||||
-extern int pty_preopen;
|
||||
-
|
||||
-#endif /* SCREEN_PTY_H */
|
||||
diff -Nu screen-5.0.0/screen-pty.h screen-5.0.0/screen-pty.h
|
||||
--- screen-5.0.0/screen-pty.h 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ screen-5.0.0/screen-pty.h 2024-08-28 19:55:03.000000000 +0000
|
||||
@@ -0,0 +1,11 @@
|
||||
+#ifndef SCREEN_PTY_H
|
||||
+#define SCREEN_PTY_H
|
||||
+
|
||||
+int OpenPTY (char **);
|
||||
+int ClosePTY (int);
|
||||
+
|
||||
+/* global variables */
|
||||
+
|
||||
+extern int pty_preopen;
|
||||
+
|
||||
+#endif /* SCREEN_PTY_H */
|
||||
diff -Nu screen-5.0.0/tty.c screen-5.0.0/tty.c
|
||||
--- screen-5.0.0/tty.c 2024-08-28 19:55:03.000000000 +0000
|
||||
+++ screen-5.0.0/tty.c 2024-08-29 18:09:19.073355563 +0000
|
||||
@@ -44,7 +44,7 @@
|
||||
#include "screen.h"
|
||||
#include "fileio.h"
|
||||
#include "misc.h"
|
||||
-#include "pty.h"
|
||||
+#include "screen-pty.h"
|
||||
#include "telnet.h"
|
||||
#include "tty.h"
|
||||
|
||||
diff -Nu screen-5.0.0/window.c screen-5.0.0/window.c
|
||||
--- screen-5.0.0/window.c 2024-08-28 19:55:03.000000000 +0000
|
||||
+++ screen-5.0.0/window.c 2024-08-29 18:14:12.542433618 +0000
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "mark.h"
|
||||
#include "misc.h"
|
||||
#include "process.h"
|
||||
-#include "pty.h"
|
||||
+#include "screen-pty.h"
|
||||
#include "resize.h"
|
||||
#include "telnet.h"
|
||||
#include "termcap.h"
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="stress-ng"
|
||||
PKG_VERSION="0.18.01"
|
||||
PKG_SHA256="30465ee60a32d9018d0de8a78cfeaa576e869b6e6db87e3628d0704dbe61b561"
|
||||
PKG_VERSION="0.18.04"
|
||||
PKG_SHA256="c76cf067e582fb8a066d47207bbccc6d0d4175ba700b5d122909132d79e7f6ea"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/ColinIanKing/stress-ng"
|
||||
PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
From c958894e6a4fffff58b0dc276fc978616560192d Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 13 Sep 2024 13:22:54 +0000
|
||||
Subject: [PATCH] fix build with vdr 2.7.1
|
||||
|
||||
---
|
||||
eepg.c | 12 ++++++++++++
|
||||
eit2.c | 8 ++++++++
|
||||
epghandler.c | 13 +++++++++++++
|
||||
equivhandler.c | 9 +++++++++
|
||||
util.c | 9 +++++++++
|
||||
5 files changed, 51 insertions(+)
|
||||
|
||||
diff --git a/eepg.c b/eepg.c
|
||||
index a78819d..d39581d 100644
|
||||
--- a/eepg.c
|
||||
+++ b/eepg.c
|
||||
@@ -1324,12 +1324,20 @@ void cFilterEEPG::WriteToSchedule(tChannelID channelID, cSchedules* pSchedules,
|
||||
cEvent *Event = NULL;
|
||||
if (ps/*[eq]*/) {
|
||||
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ Event = (cEvent *) ps->GetEventById (EventId); //since Nagra uses consistent EventIds, try this first
|
||||
+#else
|
||||
Event = (cEvent *) ps->GetEvent (EventId); //since Nagra uses consistent EventIds, try this first
|
||||
+#endif
|
||||
bool TableIdMatches = false;
|
||||
if (Event)
|
||||
TableIdMatches = (Event->TableID() == TableId);
|
||||
if (!Event || !TableIdMatches || abs(Event->StartTime() - (time_t) StartTime) > Duration * 60) //if EventId does not match, or it matched with wrong TableId, then try with StartTime
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ Event = (cEvent *) ps->GetEventByTime (StartTime);
|
||||
+#else
|
||||
Event = (cEvent *) ps->GetEvent (EventId, StartTime);
|
||||
+#endif
|
||||
}
|
||||
cEvent *newEvent = NULL;
|
||||
if (!Event) { //event is new
|
||||
@@ -3477,7 +3485,11 @@ void cFilterEEPG::ProcessPremiere(const u_char *& Data)
|
||||
}
|
||||
|
||||
bool newEvent = false;
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ cEvent *pEvent = (cEvent *) pSchedule->GetEventById (EventId);
|
||||
+#else
|
||||
cEvent *pEvent = (cEvent *) pSchedule->GetEvent (EventId, -1);
|
||||
+#endif
|
||||
if (!pEvent) {
|
||||
LogI(2, "(new)\n");
|
||||
pEvent = new cEvent (EventId);
|
||||
diff --git a/eit2.c b/eit2.c
|
||||
index 9ee190d..31aa816 100644
|
||||
--- a/eit2.c
|
||||
+++ b/eit2.c
|
||||
@@ -32,7 +32,11 @@ cEvent* cEIT2::ProcessEitEvent(cSchedule* pSchedule,const SI::EIT::Event* EitEve
|
||||
// int versionNumber = getVersionNumber();
|
||||
|
||||
cEvent *newEvent = NULL;
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ cEvent *pEvent = (cEvent *) pSchedule->GetEventByTime (EitEvent->getStartTime ());
|
||||
+#else
|
||||
cEvent *pEvent = (cEvent *) pSchedule->GetEvent (EitEvent->getEventId (), EitEvent->getStartTime ());
|
||||
+#endif
|
||||
if (!pEvent) {
|
||||
if (OnlyRunningStatus)
|
||||
return NULL;
|
||||
@@ -243,7 +247,11 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid,
|
||||
tChannelID(Source, channel->Nid(), channel->Tid(), tsed->getReferenceServiceId()));
|
||||
if (!rSchedule)
|
||||
break;
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ rEvent = rSchedule->GetEventById(tsed->getReferenceEventId());
|
||||
+#else
|
||||
rEvent = rSchedule->GetEvent(tsed->getReferenceEventId());
|
||||
+#endif
|
||||
if (!rEvent)
|
||||
break;
|
||||
pEvent->SetTitle(rEvent->Title());
|
||||
diff --git a/epghandler.c b/epghandler.c
|
||||
index 1e2db9f..a81bc86 100644
|
||||
--- a/epghandler.c
|
||||
+++ b/epghandler.c
|
||||
@@ -66,10 +66,23 @@ bool cEEpgHandler::HandleEitEvent(cSchedule* Schedule,
|
||||
modified = false;
|
||||
//VDR creates new event if the EitEvent StartTime is different than EEPG time so
|
||||
//the EPG event has to be deleted but the data should be kept
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ const cEvent *ev;
|
||||
+ if (EitEvent->getStartTime() > 0){
|
||||
+ ev = schedule->GetEventByTime(EitEvent->getStartTime());
|
||||
+ } else {
|
||||
+ ev = schedule->GetEventById(EitEvent->getEventId());
|
||||
+ }
|
||||
+#else
|
||||
const cEvent* ev = schedule->GetEvent(EitEvent->getEventId(),EitEvent->getStartTime());
|
||||
+#endif
|
||||
searchDuplicates = !ev; //if the event exist with a same start time, it is handled by SetShortText/SetDescription
|
||||
if (!ev){
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ ev = schedule->GetEventById(EitEvent->getEventId());
|
||||
+#else
|
||||
ev = schedule->GetEvent(EitEvent->getEventId());
|
||||
+#endif
|
||||
// remove shifted duplicates with same ID
|
||||
if (ev && ((ev->StartTime()>EitEvent->getStartTime() && ev->StartTime() < EitEvent->getStartTime()+EitEvent->getDuration())
|
||||
|| (EitEvent->getStartTime() > ev->StartTime() && EitEvent->getStartTime() < ev->EndTime()))) {
|
||||
diff --git a/equivhandler.c b/equivhandler.c
|
||||
index 75007ec..cd23d38 100644
|
||||
--- a/equivhandler.c
|
||||
+++ b/equivhandler.c
|
||||
@@ -143,7 +143,16 @@ void cEquivHandler::updateEquivalent(cSchedules * Schedules, tChannelID channelI
|
||||
if (equChannel) {
|
||||
LogD(2, prep("found Equivalent channel %s"), *equChannelID.ToString());
|
||||
cSchedule *pSchedule = (cSchedule *) Schedules->GetSchedule (equChannel, true);
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ cEvent *pEqvEvent;
|
||||
+ if (pEvent->StartTime() > 0){
|
||||
+ pEqvEvent = (cEvent *) pSchedule->GetEventByTime (pEvent->StartTime());
|
||||
+ } else {
|
||||
+ pEqvEvent = (cEvent *) pSchedule->GetEventById (pEvent->EventID());
|
||||
+ }
|
||||
+#else
|
||||
cEvent *pEqvEvent = (cEvent *) pSchedule->GetEvent (pEvent->EventID(), pEvent->StartTime());
|
||||
+#endif
|
||||
if (pEqvEvent) {
|
||||
LogD(3, prep("equivalent event exists"));
|
||||
if (pEqvEvent == pEvent) {
|
||||
diff --git a/util.c b/util.c
|
||||
index 1109181..029fcc6 100644
|
||||
--- a/util.c
|
||||
+++ b/util.c
|
||||
@@ -214,7 +214,16 @@ void cAddEventThread::Action(void)
|
||||
while (((*it).second->First()) != NULL) {
|
||||
cEvent* event = (*it).second->First();
|
||||
|
||||
+#if APIVERSNUM >= 20502
|
||||
+ cEvent *pEqvEvent;
|
||||
+ if (event->StartTime() > 0){
|
||||
+ pEqvEvent = (cEvent *) schedule->GetEventByTime (event->StartTime());
|
||||
+ } else {
|
||||
+ pEqvEvent = (cEvent *) schedule->GetEventById (event->EventID());
|
||||
+ }
|
||||
+#else
|
||||
cEvent *pEqvEvent = (cEvent *) schedule->GetEvent (event->EventID(), event->StartTime());
|
||||
+#endif
|
||||
if (pEqvEvent){
|
||||
(*it).second->Del(event);
|
||||
} else {
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-plugin-epgsearch"
|
||||
PKG_VERSION="2.4.2"
|
||||
PKG_SHA256="7c0a03c22fedbc73a34220da0edf3293a903185c412d5b20fb48d72f2e4fd118"
|
||||
PKG_VERSION="2.4.3"
|
||||
PKG_SHA256="3824a72be529391ce26d00f0323b9d71572855c1c660bae9d30064f42366aadf"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
|
||||
PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-plugin-live"
|
||||
PKG_VERSION="3.3.5"
|
||||
PKG_SHA256="8b41fe5c885e9f2e4fab470feda89742885567885d93b6435692ce1c7c320fee"
|
||||
PKG_VERSION="3.3.6"
|
||||
PKG_SHA256="2dc11ab4d68ce7100d8dca8eef65bc81280e30493bd7670ec661714b2bf18211"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://live.vdr-developer.org/en/index.php"
|
||||
PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-plugin-restfulapi"
|
||||
PKG_VERSION="0.2.6.6"
|
||||
PKG_SHA256="a392c8ac9da58bce06674208711a786209ce802e77f93b48d21e424fa79f5eba"
|
||||
PKG_VERSION="be8a3a60af7e8926cb28c06e6b6d2adc2c2ed968"
|
||||
PKG_SHA256="18cb9b6735f5ac2060ecedd6043a09bc742bd5132f33ef8a0155ddfe266b9dc2"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/yavdr/vdr-plugin-restfulapi"
|
||||
PKG_URL="https://github.com/yavdr/${PKG_NAME}/archive/refs/tags/${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="https://github.com/yavdr/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain vdr cxxtools vdr-plugin-wirbelscan"
|
||||
PKG_NEED_UNPACK="$(get_pkg_directory vdr) $(get_pkg_directory vdr-plugin-wirbelscan)"
|
||||
PKG_LONGDESC="Allows to access many internals of the VDR via a restful API."
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-plugin-satip"
|
||||
PKG_VERSION="20240224"
|
||||
PKG_SHA256="0b288a5a7b05924dbf479e95aee83ada4ea640539a563564dab83193a3fa65c9"
|
||||
PKG_VERSION="20240720"
|
||||
PKG_SHA256="2a9709bfb31a3745c18c867a543d708eddbf4c41af898555e4a0daa63a2199a7"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://vdr-projects.github.io/"
|
||||
PKG_URL="https://github.com/wirbel-at-vdr-portal/vdr-plugin-satip/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-plugin-wirbelscan"
|
||||
PKG_VERSION="2023.10.15"
|
||||
PKG_SHA256="58ab069bf3719053f9601c129607785a89bcf13008ed5c70fa010e815134490f"
|
||||
PKG_VERSION="2024.09.15"
|
||||
PKG_SHA256="22317c5a919834d70aee309248e7fb8b9f458819dee0e5ccdbedee7fdada8913"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.gen2vdr.de/wirbel/wirbelscan/index2.html"
|
||||
PKG_URL="https://www.gen2vdr.de/wirbel/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz"
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 4ee9769b5746240247c3a01f4000afdf8fc56857 Mon Sep 17 00:00:00 2001
|
||||
From: joed74 <gh@dolze.de>
|
||||
Date: Tue, 10 Sep 2024 15:57:59 +0200
|
||||
Subject: [PATCH] Fixed import for vdr 2.7.1
|
||||
|
||||
---
|
||||
import.cpp | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/import.cpp b/import.cpp
|
||||
index 1bb1849..8c73024 100644
|
||||
--- a/import.cpp
|
||||
+++ b/import.cpp
|
||||
@@ -86,7 +86,11 @@ cEvent *cImport::SearchVDREventByTitle(cEPGSource *source, cSchedule* schedule,
|
||||
const char *cxTitle=conv->Convert(Title);
|
||||
|
||||
// 2nd with StartTime
|
||||
+#if VDRVERSNUM >= 20701
|
||||
+ cEvent *f=(cEvent *) schedule->GetEventByTime(StartTime+hint);
|
||||
+#else
|
||||
cEvent *f=(cEvent *) schedule->GetEvent((tEventID) 0,StartTime+hint);
|
||||
+#endif
|
||||
if (f)
|
||||
{
|
||||
if (!strcasecmp(f->Title(),cxTitle))
|
||||
@@ -188,10 +192,18 @@ cEvent *cImport::SearchVDREvent(cEPGSource *source, cSchedule* schedule, cXMLTVE
|
||||
|
||||
// try to find an event,
|
||||
// 1st with our own EventID
|
||||
+#if VDRVERSNUM >= 20701
|
||||
+ if (xevent->EITEventID()) f=(cEvent *) schedule->GetEventById(xevent->EITEventID());
|
||||
+#else
|
||||
if (xevent->EITEventID()) f=(cEvent *) schedule->GetEvent(xevent->EITEventID());
|
||||
+#endif
|
||||
if (f) return f;
|
||||
|
||||
+#if VDRVERSNUM >= 20701
|
||||
+ if (xevent->EventID() && append) f=(cEvent *) schedule->GetEventById(xevent->EITEventID());
|
||||
+#else
|
||||
if (xevent->EventID() && append) f=(cEvent *) schedule->GetEvent(xevent->EventID());
|
||||
+#endif
|
||||
if (f) return f;
|
||||
|
||||
f=SearchVDREventByTitle(source, schedule, xevent->Title(), xevent->StartTime(),
|
||||
@@ -4,8 +4,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr"
|
||||
PKG_VERSION="2.6.7"
|
||||
PKG_SHA256="b27addea2d1cd6919d03d865a14ae043cacc600b1e4670530ef3bbeb6b3083e1"
|
||||
PKG_VERSION="2.7.1"
|
||||
PKG_SHA256="ae3010a5297891f55b3d11b19fe15cd868f24250da8554e985ab163e19d98026"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvdr.de"
|
||||
PKG_URL="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PKG_VERSION};sf=tbz2"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="docker"
|
||||
PKG_REV="5"
|
||||
PKG_REV="7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="ASL"
|
||||
PKG_SITE="http://www.docker.com/"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
PKG_NAME="jellyfin"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_VERSION_NUMBER="10.9.8"
|
||||
PKG_REV="2"
|
||||
PKG_VERSION_NUMBER="10.10.1"
|
||||
PKG_REV="5"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://jellyfin.org/"
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="lcdd"
|
||||
PKG_VERSION="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
|
||||
PKG_SHA256="442f60fc7c26847508e7fb99d901e905016c136d0f6eb320e3262bef20f39452"
|
||||
PKG_VERSION_DATE="0.5dev+2020-07-21"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="71877ee059a238400b5f6b41cee7c43a3df00334"
|
||||
PKG_SHA256="e910c7d748b58cc57543dc8845f8b2bcd0592dddd58bd72a55a58e90e6bfd861"
|
||||
PKG_VERSION_DATE="0.5dev+2024-12-14"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://lcdproc.org/"
|
||||
PKG_URL="https://github.com/lcdproc/lcdproc/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb ncurses serdisplib"
|
||||
PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libgpiod libhid libugpio libusb ncurses serdisplib"
|
||||
PKG_SECTION="service"
|
||||
PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD"
|
||||
PKG_LONGDESC="LCDproc (${PKG_VERSION}) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more."
|
||||
@@ -21,13 +21,13 @@ PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_NAME="LCDproc"
|
||||
PKG_ADDON_TYPE="xbmc.service"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=${SYSROOT_PREFIX}/usr \
|
||||
--enable-libusb \
|
||||
--enable-libftdi \
|
||||
--disable-libX11 \
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-drivers=all \
|
||||
--enable-freetype \
|
||||
--enable-libhid \
|
||||
--enable-libftdi \
|
||||
--disable-libpng \
|
||||
--enable-drivers=all"
|
||||
--enable-libusb \
|
||||
--disable-libX11"
|
||||
|
||||
pre_configure_target() {
|
||||
CFLAGS+=" -O3"
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
diff --git a/server/drivers/hd44780-low.h b/server/drivers/hd44780-low.h
|
||||
index 47acf45..6faa830 100644
|
||||
--- a/server/drivers/hd44780-low.h
|
||||
+++ b/server/drivers/hd44780-low.h
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBFTDI
|
||||
-# include <ftdi.h>
|
||||
+# include <libftdi1/ftdi.h>
|
||||
#endif
|
||||
|
||||
/** \name Symbolic names for connection types
|
||||
diff --git a/server/drivers/i2500vfd.c b/server/drivers/i2500vfd.c
|
||||
index d896a69..7fe74f2 100644
|
||||
--- a/server/drivers/i2500vfd.c
|
||||
+++ b/server/drivers/i2500vfd.c
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
-#include <ftdi.h>
|
||||
+#include <libftdi1/ftdi.h>
|
||||
|
||||
#include "lcd.h"
|
||||
#include "i2500vfd.h"
|
||||
diff --git a/server/drivers/lis.c b/server/drivers/lis.c
|
||||
index 5d3e97a..6c26a19 100644
|
||||
--- a/server/drivers/lis.c
|
||||
+++ b/server/drivers/lis.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <errno.h>
|
||||
#include <pthread.h>
|
||||
|
||||
-#include <ftdi.h>
|
||||
+#include <libftdi1/ftdi.h>
|
||||
|
||||
#include "lcd.h"
|
||||
#include "lis.h"
|
||||
diff --git a/server/drivers/ula200.c b/server/drivers/ula200.c
|
||||
index cbdde40..a84eb49 100644
|
||||
--- a/server/drivers/ula200.c
|
||||
+++ b/server/drivers/ula200.c
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
-#include <ftdi.h>
|
||||
+#include <libftdi1/ftdi.h>
|
||||
|
||||
#include "lcd.h"
|
||||
#include "ula200.h"
|
||||
@@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mariadb"
|
||||
PKG_VERSION="11.4.2"
|
||||
PKG_REV="2"
|
||||
PKG_SHA256="8c600e38adb899316c1cb11c68b87979668f4fb9d858000e347e6d8b7abe51b0"
|
||||
PKG_VERSION="11.4.3"
|
||||
PKG_REV="3"
|
||||
PKG_SHA256="6f0017b9901bb1897de0eed21caef9ffa9d66ef559345a0d8a6f011308413ece"
|
||||
PKG_LICENSE="GPL2"
|
||||
PKG_SITE="https://mariadb.org"
|
||||
PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
PKG_NAME="minidlna"
|
||||
PKG_VERSION="1.3.3"
|
||||
PKG_SHA256="39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD-3c/GPLv2"
|
||||
PKG_SITE="https://sourceforge.net/projects/minidlna/"
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="minisatip"
|
||||
PKG_VERSION="1.3.15"
|
||||
PKG_SHA256="7407b48aa6521909e0e374a390065855a1c28381d4c74969d4dcc7d2541e9f96"
|
||||
PKG_REV="1"
|
||||
PKG_VERSION="1.3.35"
|
||||
PKG_SHA256="e0b9f97d57e1692629dbd5906fda59301805ed3e3d3a3d8311e9f2ce40a7cccf"
|
||||
PKG_REV="4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/catalinii/minisatip"
|
||||
@@ -22,11 +22,11 @@ PKG_ADDON_TYPE="xbmc.service"
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static \
|
||||
--disable-netcv \
|
||||
--enable-dvbca \
|
||||
--enable-dvbaes \
|
||||
--enable-dvbcsa \
|
||||
--with-xml2=$(get_install_dir libxml2)/usr/include/libxml2"
|
||||
|
||||
pre_configure_target() {
|
||||
TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
|
||||
cd ${PKG_BUILD}
|
||||
rm -rf .${TARGET_NAME}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
PKG_NAME="mpd"
|
||||
PKG_VERSION="0.23.15"
|
||||
PKG_SHA256="550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.musicpd.org"
|
||||
|
||||
@@ -1 +1,6 @@
|
||||
2
|
||||
- download NextPVR 7.0.1
|
||||
- install and configure, hdhomerun_config, comskip and libmediainfo
|
||||
- fix manual updates from NPVR.zip
|
||||
|
||||
initial release
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="nextpvr"
|
||||
PKG_VERSION="6.1.5~Omega"
|
||||
PKG_ADDON_VERSION="6.1.5~4"
|
||||
PKG_VERSION="7.0.1~Omega"
|
||||
PKG_ADDON_VERSION="7.0.1~2"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="NextPVR"
|
||||
PKG_SITE="https://nextpvr.com"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_TARGET="toolchain libhdhomerun libmediainfo comskip"
|
||||
PKG_SECTION="service"
|
||||
PKG_SHORTDESC="NextPVR Server"
|
||||
PKG_LONGDESC="NextPVR is a personal video recorder application. It allows to watch or record live TV, provides great features like series recordings and web scheduling."
|
||||
@@ -25,4 +25,13 @@ addon() {
|
||||
|
||||
post_install_addon() {
|
||||
sed -e "s/@NEXTPVR_VERSION@/${PKG_ADDON_VERSION}/g" -i "${INSTALL}/bin/nextpvr-downloader"
|
||||
|
||||
mkdir -p ${INSTALL}/{lbin,lib.private}
|
||||
cp $(get_build_dir libmediainfo)/Project/GNU/Library/.libs/libmediainfo.so ${INSTALL}/lib.private
|
||||
cp -P $(get_build_dir libhdhomerun)/hdhomerun_config ${INSTALL}/lbin
|
||||
cp -P $(get_install_dir comskip)/usr/bin/comskip ${INSTALL}/lbin
|
||||
if [ "${TARGET_ARCH}" = "x86_64" ]; then
|
||||
cp -P $(get_install_dir x265)/usr/lib/libx265.so.212 ${INSTALL}/lib.private
|
||||
patchelf --add-rpath '${ORIGIN}/../lib.private' ${INSTALL}/lbin/comskip
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -75,6 +75,8 @@ class Controller():
|
||||
xbmc.log('Running: %s' % command, xbmc.LOGDEBUG)
|
||||
os.system(command)
|
||||
os.remove(archive)
|
||||
command = 'find {0}/DeviceHost -name DeviceHostLinux -exec chmod 755 {{}} \;'.format(dest_folder)
|
||||
os.system(command)
|
||||
xbmcgui.Dialog().notification(ADDON_NAME, LS(30039), xbmcgui.NOTIFICATION_INFO)
|
||||
xbmc.log('NPVR.zip installed', xbmc.LOGDEBUG)
|
||||
if xbmcgui.Dialog().yesno("NextPVR Server", LS(30020)):
|
||||
|
||||
@@ -40,7 +40,7 @@ echo "Downloading NextPVR"
|
||||
# download NextPVR
|
||||
rm -f ${CONTROL_FILE} ${DATA_FILE}
|
||||
(
|
||||
curl -L -# -O -C - https://github.com/sub3/releases/releases/download/${NEXTPVR_VERSION%~*}/${NEXTPVR_FILE} 2>${DATA_FILE}
|
||||
curl -L -# -O -C - https://github.com/sub3/releases/releases/download/${NEXTPVR_VERSION%~*}/${NEXTPVR_FILE} 2>${DATA_FILE}
|
||||
touch ${CONTROL_FILE}
|
||||
) |
|
||||
while [ : ]; do
|
||||
@@ -61,6 +61,12 @@ fi
|
||||
# extract NextPVR
|
||||
kodi-send --action="Notification(Extracting NextPVR,starting,1000,${ICON})" >/dev/null
|
||||
mkdir -p ${ADDON_DIR}/nextpvr-bin
|
||||
|
||||
chmod +x ${ADDON_DIR}/lbin/hdhomerun_config
|
||||
chmod +x ${ADDON_DIR}/lbin/comskip
|
||||
ln -s ${ADDON_DIR}/lbin/hdhomerun_config ${ADDON_DIR}/nextpvr-bin
|
||||
ln -s ${ADDON_DIR}/lib.private/libmediainfo.so ${ADDON_DIR}/nextpvr-bin
|
||||
|
||||
unzip ${NEXTPVR_FILE} -d ${ADDON_DIR}/nextpvr-bin >/dev/null
|
||||
|
||||
if [ "$(uname -m)" != "x86_64" ]; then
|
||||
|
||||
29
packages/addons/service/nextpvr/source/sleep.d/nextpvr.power
Executable file
29
packages/addons/service/nextpvr/source/sleep.d/nextpvr.power
Executable file
@@ -0,0 +1,29 @@
|
||||
#!/bin/sh
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
. /etc/profile
|
||||
|
||||
oe_setup_addon service.nextpvr
|
||||
|
||||
SERVICE="service.nextpvr"
|
||||
|
||||
case "$1" in
|
||||
pre)
|
||||
if systemctl is-active "$SERVICE" &>/dev/null ; then
|
||||
systemctl stop "$SERVICE"
|
||||
for module in $REMOVE_MODULES ; do
|
||||
rmmod $module
|
||||
done
|
||||
fi
|
||||
;;
|
||||
post)
|
||||
if systemctl is-enabled "$SERVICE" &>/dev/null ; then
|
||||
for module in $REMOVE_MODULES ; do
|
||||
modprobe $module
|
||||
done
|
||||
systemctl start "$SERVICE"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
1
packages/addons/service/ntfs3g/changelog.txt
Normal file
1
packages/addons/service/ntfs3g/changelog.txt
Normal file
@@ -0,0 +1 @@
|
||||
initial release
|
||||
BIN
packages/addons/service/ntfs3g/icon/icon.png
Normal file
BIN
packages/addons/service/ntfs3g/icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
26
packages/addons/service/ntfs3g/package.mk
Normal file
26
packages/addons/service/ntfs3g/package.mk
Normal file
@@ -0,0 +1,26 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="ntfs3g"
|
||||
PKG_REV="1"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_DEPENDS_TARGET="toolchain fuse ntfs-3g_ntfsprogs"
|
||||
PKG_SECTION="service"
|
||||
PKG_SHORTDESC="NTFS-3G for udevil"
|
||||
PKG_LONGDESC="NTFS-3G for udevil overrides the NTFS3 kernel driver with the NTFS-3G userspace driver used in older LibreELEC releases."
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_NAME="NTFS-3G"
|
||||
PKG_ADDON_TYPE="xbmc.service"
|
||||
|
||||
addon() {
|
||||
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
|
||||
|
||||
cp -PL $(get_install_dir fuse)/usr/lib/libfuse.so.2 \
|
||||
${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
|
||||
cp $(get_install_dir ntfs-3g_ntfsprogs)/usr/bin/ntfs-3g \
|
||||
${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ntfs-3g
|
||||
}
|
||||
6
packages/addons/service/ntfs3g/source/bin/mount.ntfs3g
Executable file
6
packages/addons/service/ntfs3g/source/bin/mount.ntfs3g
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
exec /storage/.kodi/addons/service.ntfs3g/bin/ntfs-3g "$@"
|
||||
20
packages/addons/service/ntfs3g/source/default.py
Normal file
20
packages/addons/service/ntfs3g/source/default.py
Normal file
@@ -0,0 +1,20 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
import subprocess
|
||||
import xbmc
|
||||
import xbmcaddon
|
||||
|
||||
|
||||
class Monitor(xbmc.Monitor):
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
xbmc.Monitor.__init__(self)
|
||||
self.id = xbmcaddon.Addon().getAddonInfo('id')
|
||||
|
||||
def onSettingsChanged(self):
|
||||
subprocess.call(['systemctl', 'restart', self.id])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
Monitor().waitForAbort()
|
||||
@@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=ntfs3g for udevil
|
||||
Before=samba-config.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/mount -o bind /storage/.kodi/addons/service.ntfs3g/bin/mount.ntfs3g /usr/sbin/mount.ntfs
|
||||
ExecStop=/bin/sh -c 'grep -q " /usr/sbin/mount.ntfs " /proc/self/mounts && umount /usr/sbin/mount.ntfs || true'
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="podman"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Apache-2.0"
|
||||
PKG_SITE="https://podman.io"
|
||||
@@ -28,7 +28,7 @@ addon() {
|
||||
cp -L $(get_install_dir libseccomp)/usr/lib/libseccomp.so.2 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
|
||||
# netavark
|
||||
cp -P $(get_install_dir netavark)/usr/local/libexec/podman/netavark ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
cp -P $(get_install_dir netavark)/netavark ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
|
||||
# podman
|
||||
cp -P $(get_build_dir podman-bin)/bin/podman ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="rsyslog"
|
||||
PKG_VERSION="8.2406.0"
|
||||
PKG_SHA256="1343e0269dd32166ffde04d7ceebfa0e7146cf1dbc6962c56bf428c61f01a7df"
|
||||
PKG_REV="1"
|
||||
PKG_VERSION="8.2408.0"
|
||||
PKG_SHA256="8bb2f15f9bf9bb7e635182e3d3e370bfc39d08bf35a367dce9714e186f787206"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/rsyslog"
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="syncthing"
|
||||
PKG_VERSION="1.27.9"
|
||||
PKG_SHA256="82364794e5dfc912128dd47bd1da3304396bc8a0cae3d1fdb15d9a86a51085e9"
|
||||
PKG_REV="2"
|
||||
PKG_VERSION="1.27.12"
|
||||
PKG_SHA256="5531f0e1bb81b824a2ab62f070e745c142e1328a15229de47b0cb596b5bae417"
|
||||
PKG_REV="4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MPLv2"
|
||||
PKG_SITE="https://syncthing.net/"
|
||||
|
||||
@@ -5,12 +5,12 @@ PKG_NAME="tvheadend42"
|
||||
PKG_VERSION="5bdcfd8ac97b3337e1c7911ae24127df76fa693a"
|
||||
PKG_SHA256="b562a26248cdc02dc94cc62038deea172668fa4c079b2ea4e1b4220f3b1d34f5"
|
||||
PKG_VERSION_NUMBER="4.2.8-36"
|
||||
PKG_REV="0"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps libdvbcsa libhdhomerun \
|
||||
PKG_DEPENDS_TARGET="toolchain argtable2 avahi comskip curl dvb-apps libdvbcsa libhdhomerun \
|
||||
libiconv openssl pngquant:host Python3:host dtv-scan-tables"
|
||||
PKG_DEPENDS_CONFIG="ffmpegx"
|
||||
PKG_SECTION="service"
|
||||
@@ -125,8 +125,8 @@ addon() {
|
||||
|
||||
if [ "${TARGET_ARCH}" = "x86_64" ]; then
|
||||
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
cp -P $(get_install_dir x265)/usr/lib/libx265.so.209 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
|
||||
cp -P $(get_install_dir x265)/usr/lib/libx265.so.212 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
|
||||
fi
|
||||
|
||||
# dvb-scan files
|
||||
|
||||
@@ -5,12 +5,12 @@ PKG_NAME="tvheadend43"
|
||||
PKG_VERSION="3dcb7ecf36666dcb43211a84141b1b645c9ca757"
|
||||
PKG_SHA256="c7c8414bca5304276cc8f07aa291e36b50e1190d441f2af2ce256631b7c033c2"
|
||||
PKG_VERSION_NUMBER="4.3-2180"
|
||||
PKG_REV="1"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \
|
||||
PKG_DEPENDS_TARGET="toolchain argtable2 avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \
|
||||
libiconv openssl pcre2 pngquant:host Python3:host dtv-scan-tables"
|
||||
PKG_DEPENDS_CONFIG="ffmpegx"
|
||||
PKG_SECTION="service"
|
||||
@@ -125,8 +125,8 @@ addon() {
|
||||
|
||||
if [ "${TARGET_ARCH}" = "x86_64" ]; then
|
||||
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
cp -P $(get_install_dir x265)/usr/lib/libx265.so.209 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
|
||||
cp -P $(get_install_dir x265)/usr/lib/libx265.so.212 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
|
||||
fi
|
||||
|
||||
# dvb-scan files
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vdr-addon"
|
||||
PKG_VERSION="2.6.7"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="2.7.1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="btrfs-progs"
|
||||
PKG_VERSION="6.9.2"
|
||||
PKG_SHA256="2a6b7b87cc80c9c26bc775d2014510e9c05e59098234bee29f7158484bad2a73"
|
||||
PKG_REV="3"
|
||||
PKG_VERSION="6.10.1"
|
||||
PKG_SHA256="ce7f1d1c33bf5b3acd418466e7e412026e435b05f187e779a1c5303ebf1b1f96"
|
||||
PKG_REV="4"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://btrfs.readthedocs.io/"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="dotnet-runtime"
|
||||
PKG_REV="2"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://dotnet.microsoft.com/"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="ffmpeg-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="2"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
@@ -26,7 +26,7 @@ addon() {
|
||||
|
||||
# libs
|
||||
if [ "${TARGET_ARCH}" = "x86_64" ]; then
|
||||
cp -PL $(get_install_dir x265)/usr/lib/libx265.so.209 \
|
||||
cp -PL $(get_install_dir x265)/usr/lib/libx265.so.212 \
|
||||
${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="flirc_util"
|
||||
PKG_VERSION="653f706554b7dfa16c4b00859cfcccad8c5e02eb"
|
||||
PKG_SHA256="56c07170ede7fac1644b21af994b6e20fdbad37c9bc042d9a9d7906493d6bdbf"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="280cccbb333f5be30fc48ea958ca103d2fce6fec"
|
||||
PKG_SHA256="fc0a79e2e08b96d6cb8d69a7ee3a0cec6445f690ff432dbe62945f583213940e"
|
||||
PKG_REV="1"
|
||||
PKG_LICENSE="FLIRC"
|
||||
PKG_SITE="http://www.flirc.tv"
|
||||
PKG_URL="https://github.com/flirc/sdk/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="network-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
1
packages/addons/tools/ntfs-progs/changelog.txt
Normal file
1
packages/addons/tools/ntfs-progs/changelog.txt
Normal file
@@ -0,0 +1 @@
|
||||
initial release
|
||||
BIN
packages/addons/tools/ntfs-progs/icon/icon.png
Normal file
BIN
packages/addons/tools/ntfs-progs/icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 37 KiB |
23
packages/addons/tools/ntfs-progs/package.mk
Normal file
23
packages/addons/tools/ntfs-progs/package.mk
Normal file
@@ -0,0 +1,23 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="ntfs-progs"
|
||||
PKG_REV="0"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_DEPENDS_TARGET="toolchain fuse ntfs-3g_ntfsprogs"
|
||||
PKG_SECTION="tools"
|
||||
PKG_SHORTDESC="ntfs-3g tools for the NTFS filesystem"
|
||||
PKG_LONGDESC="ntfs-3g tools for the NTFS filesystem: mkntfs, ntfs-3g.probe, ntfsfix, ntfslabel and ntfsresize"
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_NAME="NTFS Tools"
|
||||
PKG_ADDON_TYPE="xbmc.python.script"
|
||||
|
||||
addon() {
|
||||
PKG_NTFS_INSTALL=$(get_install_dir ntfs-3g_ntfsprogs)
|
||||
mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
|
||||
cp -P ${PKG_NTFS_INSTALL}/usr/bin/{ntfs-3g.probe,ntfsfix} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
cp -P ${PKG_NTFS_INSTALL}/usr/sbin/{mkntfs,ntfslabel,ntfsresize} \
|
||||
${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
}
|
||||
7
packages/addons/tools/ntfs-progs/source/default.py
Normal file
7
packages/addons/tools/ntfs-progs/source/default.py
Normal file
@@ -0,0 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
import xbmcgui
|
||||
|
||||
dialog = xbmcgui.Dialog()
|
||||
dialog.ok('', 'This is a console-only addon')
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="rpi-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="0"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="arm aarch64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="system-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="4"
|
||||
PKG_REV="7"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
@@ -137,6 +137,7 @@ addon() {
|
||||
|
||||
# libgpiod
|
||||
cp -P $(get_install_dir libgpiod)/usr/bin/{gpiodetect,gpioget,gpioinfo,gpiomon,gpioset} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
|
||||
cp -PR $(get_build_dir libgpiod)/bindings/python/build/lib.linux*/* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
|
||||
|
||||
# lm_sensors
|
||||
cp -P $(get_install_dir lm_sensors)/usr/bin/sensors ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || :
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="fluidsynth"
|
||||
PKG_VERSION="2.3.5"
|
||||
PKG_SHA256="f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d"
|
||||
PKG_VERSION="2.3.6"
|
||||
PKG_SHA256="3340d73286b28fe6e5150fbe12648d4640e86c64c228878b572773bd08cac531"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://fluidsynth.org/"
|
||||
PKG_URL="https://github.com/FluidSynth/fluidsynth/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -7,7 +7,7 @@ PKG_VERSION="1.84.0"
|
||||
PKG_SHA256="cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="https://www.boost.org/"
|
||||
PKG_URL="https://boostorg.jfrog.io/artifactory/main/release/${PKG_VERSION}/source/${PKG_NAME}_${PKG_VERSION//./_}.tar.bz2"
|
||||
PKG_URL="https://archives.boost.io/release/${PKG_VERSION}/source/${PKG_NAME}_${PKG_VERSION//./_}.tar.bz2"
|
||||
PKG_DEPENDS_HOST="toolchain:host"
|
||||
PKG_DEPENDS_TARGET="toolchain boost:host Python3 zlib bzip2"
|
||||
PKG_LONGDESC="boost: Peer-reviewed STL style libraries for C++"
|
||||
|
||||
@@ -1,290 +0,0 @@
|
||||
From 6239ae1b092d85e54530e95bbefbdc4fa520dba1 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Karlman <jonas@kwiboo.se>
|
||||
Date: Thu, 16 Jul 2020 15:20:07 +0000
|
||||
Subject: [PATCH] WIP: support multiple /dev/cecX devices
|
||||
|
||||
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
||||
---
|
||||
include/cectypes.h | 10 --
|
||||
src/libcec/adapter/AdapterFactory.cpp | 14 +--
|
||||
.../Linux/LinuxCECAdapterCommunication.cpp | 11 +-
|
||||
.../Linux/LinuxCECAdapterCommunication.h | 3 +-
|
||||
.../Linux/LinuxCECAdapterDetection.cpp | 116 +++++++++++++++++-
|
||||
.../adapter/Linux/LinuxCECAdapterDetection.h | 7 +-
|
||||
6 files changed, 130 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/include/cectypes.h b/include/cectypes.h
|
||||
index e585f2f..c80a1ec 100644
|
||||
--- a/include/cectypes.h
|
||||
+++ b/include/cectypes.h
|
||||
@@ -281,16 +281,6 @@ namespace CEC {
|
||||
*/
|
||||
#define CEC_MAX_DATA_PACKET_SIZE (16 * 4)
|
||||
|
||||
-/*!
|
||||
- * the path to use for the Linux CEC device
|
||||
- */
|
||||
-#define CEC_LINUX_PATH "/dev/cec0"
|
||||
-
|
||||
-/*!
|
||||
- * the name of the virtual COM port to use for the Linux' CEC wire
|
||||
- */
|
||||
-#define CEC_LINUX_VIRTUAL_COM "Linux"
|
||||
-
|
||||
/*!
|
||||
* the path to use for the AOCEC HDMI CEC device
|
||||
*/
|
||||
diff --git a/src/libcec/adapter/AdapterFactory.cpp b/src/libcec/adapter/AdapterFactory.cpp
|
||||
index ede5f37..d784e5e 100644
|
||||
--- a/src/libcec/adapter/AdapterFactory.cpp
|
||||
+++ b/src/libcec/adapter/AdapterFactory.cpp
|
||||
@@ -142,15 +142,7 @@ int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_LINUX_API)
|
||||
- if (iAdaptersFound < iBufSize && CLinuxCECAdapterDetection::FindAdapter())
|
||||
- {
|
||||
- snprintf(deviceList[iAdaptersFound].strComPath, sizeof(deviceList[iAdaptersFound].strComPath), CEC_LINUX_PATH);
|
||||
- snprintf(deviceList[iAdaptersFound].strComName, sizeof(deviceList[iAdaptersFound].strComName), CEC_LINUX_VIRTUAL_COM);
|
||||
- deviceList[iAdaptersFound].iVendorId = 0;
|
||||
- deviceList[iAdaptersFound].iProductId = 0;
|
||||
- deviceList[iAdaptersFound].adapterType = ADAPTERTYPE_LINUX;
|
||||
- iAdaptersFound++;
|
||||
- }
|
||||
+ iAdaptersFound += CLinuxCECAdapterDetection::FindAdapters(deviceList, iBufSize, strDevicePath);
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_AOCEC_API)
|
||||
@@ -198,8 +190,8 @@ IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_LINUX_API)
|
||||
- if (!strcmp(strPort, CEC_LINUX_VIRTUAL_COM))
|
||||
- return new CLinuxCECAdapterCommunication(m_lib->m_cec);
|
||||
+ if (CLinuxCECAdapterDetection::IsAdapter(strPort))
|
||||
+ return new CLinuxCECAdapterCommunication(m_lib->m_cec, strPort);
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_AOCEC_API)
|
||||
diff --git a/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.cpp b/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.cpp
|
||||
index 6a28835..41e4cc6 100644
|
||||
--- a/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.cpp
|
||||
+++ b/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.cpp
|
||||
@@ -53,9 +53,10 @@ using namespace P8PLATFORM;
|
||||
// Required capabilities
|
||||
#define CEC_LINUX_CAPABILITIES (CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | CEC_CAP_PASSTHROUGH)
|
||||
|
||||
-CLinuxCECAdapterCommunication::CLinuxCECAdapterCommunication(IAdapterCommunicationCallback *callback)
|
||||
+CLinuxCECAdapterCommunication::CLinuxCECAdapterCommunication(IAdapterCommunicationCallback *callback, const char *strPort)
|
||||
: IAdapterCommunication(callback)
|
||||
{
|
||||
+ m_path = strPort;
|
||||
m_fd = INVALID_SOCKET_VALUE;
|
||||
}
|
||||
|
||||
@@ -69,9 +70,9 @@ bool CLinuxCECAdapterCommunication::Open(uint32_t UNUSED(iTimeoutMs), bool UNUSE
|
||||
if (IsOpen())
|
||||
Close();
|
||||
|
||||
- if ((m_fd = open(CEC_LINUX_PATH, O_RDWR)) >= 0)
|
||||
+ if ((m_fd = open(m_path, O_RDWR)) >= 0)
|
||||
{
|
||||
- LIB_CEC->AddLog(CEC_LOG_DEBUG, "CLinuxCECAdapterCommunication::Open - m_fd=%d bStartListening=%d", m_fd, bStartListening);
|
||||
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "CLinuxCECAdapterCommunication::Open - m_path=%s m_fd=%d bStartListening=%d", m_path, m_fd, bStartListening);
|
||||
|
||||
// Ensure the CEC device supports required capabilities
|
||||
struct cec_caps caps = {};
|
||||
@@ -153,7 +154,7 @@ void CLinuxCECAdapterCommunication::Close(void)
|
||||
{
|
||||
StopThread(0);
|
||||
|
||||
- LIB_CEC->AddLog(CEC_LOG_DEBUG, "CLinuxCECAdapterCommunication::Close - m_fd=%d", m_fd);
|
||||
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "CLinuxCECAdapterCommunication::Close - m_path=%s m_fd=%d", m_path, m_fd);
|
||||
|
||||
close(m_fd);
|
||||
m_fd = INVALID_SOCKET_VALUE;
|
||||
@@ -431,7 +432,7 @@ void *CLinuxCECAdapterCommunication::Process(void)
|
||||
Sleep(5);
|
||||
}
|
||||
|
||||
- LIB_CEC->AddLog(CEC_LOG_DEBUG, "CLinuxCECAdapterCommunication::Process - stopped - m_fd=%d", m_fd);
|
||||
+ LIB_CEC->AddLog(CEC_LOG_DEBUG, "CLinuxCECAdapterCommunication::Process - stopped - m_path=%s m_fd=%d", m_path, m_fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h b/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h
|
||||
index 57c5e26..ec1e98d 100644
|
||||
--- a/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h
|
||||
+++ b/src/libcec/adapter/Linux/LinuxCECAdapterCommunication.h
|
||||
@@ -50,7 +50,7 @@ namespace CEC
|
||||
* @brief Create a new Linux CEC communication handler.
|
||||
* @param callback The callback to use for incoming CEC commands.
|
||||
*/
|
||||
- CLinuxCECAdapterCommunication(IAdapterCommunicationCallback *callback);
|
||||
+ CLinuxCECAdapterCommunication(IAdapterCommunicationCallback *callback, const char *strPort);
|
||||
virtual ~CLinuxCECAdapterCommunication(void);
|
||||
|
||||
/** @name IAdapterCommunication implementation */
|
||||
@@ -92,6 +92,7 @@ namespace CEC
|
||||
|
||||
private:
|
||||
int m_fd;
|
||||
+ const char *m_path;
|
||||
};
|
||||
};
|
||||
|
||||
diff --git a/src/libcec/adapter/Linux/LinuxCECAdapterDetection.cpp b/src/libcec/adapter/Linux/LinuxCECAdapterDetection.cpp
|
||||
index 7b72238..0099367 100644
|
||||
--- a/src/libcec/adapter/Linux/LinuxCECAdapterDetection.cpp
|
||||
+++ b/src/libcec/adapter/Linux/LinuxCECAdapterDetection.cpp
|
||||
@@ -35,16 +35,126 @@
|
||||
*/
|
||||
|
||||
#include "env.h"
|
||||
-#include <stdio.h>
|
||||
|
||||
#if defined(HAVE_LINUX_API)
|
||||
#include "LinuxCECAdapterDetection.h"
|
||||
|
||||
+#include <dirent.h>
|
||||
+#include "p8-platform/util/StringUtils.h"
|
||||
+
|
||||
+#if defined(HAVE_LIBUDEV)
|
||||
+extern "C" {
|
||||
+#include <libudev.h>
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
using namespace CEC;
|
||||
|
||||
-bool CLinuxCECAdapterDetection::FindAdapter(void)
|
||||
+bool CLinuxCECAdapterDetection::IsAdapter(const char *strPort)
|
||||
+{
|
||||
+ return !strncmp(strPort, "/dev/cec", 8);
|
||||
+}
|
||||
+
|
||||
+uint8_t CLinuxCECAdapterDetection::FindAdaptersUdev(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
|
||||
+{
|
||||
+ uint8_t iFound(0);
|
||||
+
|
||||
+#if defined(HAVE_LIBUDEV)
|
||||
+ struct udev *udev;
|
||||
+ if (!(udev = udev_new()))
|
||||
+ return 0;
|
||||
+
|
||||
+ struct udev_enumerate *enumerate;
|
||||
+ struct udev_list_entry *devices, *dev_list_entry;
|
||||
+ struct udev_device *dev;
|
||||
+ enumerate = udev_enumerate_new(udev);
|
||||
+
|
||||
+ udev_enumerate_add_match_subsystem(enumerate, "cec");
|
||||
+ udev_enumerate_scan_devices(enumerate);
|
||||
+ devices = udev_enumerate_get_list_entry(enumerate);
|
||||
+ udev_list_entry_foreach(dev_list_entry, devices)
|
||||
+ {
|
||||
+ const char *strPath;
|
||||
+ strPath = udev_list_entry_get_name(dev_list_entry);
|
||||
+
|
||||
+ dev = udev_device_new_from_syspath(udev, strPath);
|
||||
+ if (!dev)
|
||||
+ continue;
|
||||
+
|
||||
+ const char *strPort;
|
||||
+ strPort = udev_device_get_devnode(dev);
|
||||
+
|
||||
+ if (!strDevicePath || !strcmp(strPath, strDevicePath))
|
||||
+ {
|
||||
+ snprintf(deviceList[iFound].strComPath, sizeof(deviceList[iFound].strComPath), "%s", strPath);
|
||||
+ snprintf(deviceList[iFound].strComName, sizeof(deviceList[iFound].strComName), "%s", strPort);
|
||||
+ deviceList[iFound].iVendorId = 0;
|
||||
+ deviceList[iFound].iProductId = 0;
|
||||
+ deviceList[iFound].adapterType = ADAPTERTYPE_LINUX;
|
||||
+ iFound++;
|
||||
+ }
|
||||
+ udev_device_unref(dev);
|
||||
+
|
||||
+ if (iFound >= iBufSize)
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ udev_enumerate_unref(enumerate);
|
||||
+ udev_unref(udev);
|
||||
+#else
|
||||
+ (void)deviceList;
|
||||
+ (void)iBufSize;
|
||||
+ (void)strDevicePath;
|
||||
+#endif
|
||||
+
|
||||
+ return iFound;
|
||||
+}
|
||||
+
|
||||
+uint8_t CLinuxCECAdapterDetection::FindAdaptersLinux(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
|
||||
+{
|
||||
+ uint8_t iFound(0);
|
||||
+
|
||||
+ std::string strSysfsPath("/sys/bus/cec/devices");
|
||||
+ DIR *dir;
|
||||
+
|
||||
+ if ((dir = opendir(strSysfsPath.c_str())) != NULL)
|
||||
+ {
|
||||
+ struct dirent *dent;
|
||||
+
|
||||
+ while ((dent = readdir(dir)) != NULL)
|
||||
+ {
|
||||
+ std::string strDevice = StringUtils::Format("%s/%s", strSysfsPath.c_str(), dent->d_name);
|
||||
+
|
||||
+ if (strncmp(dent->d_name, "cec", 3))
|
||||
+ continue;
|
||||
+
|
||||
+ if (strDevicePath && strcmp(strDevice.c_str(), strDevicePath))
|
||||
+ continue;
|
||||
+
|
||||
+ snprintf(deviceList[iFound].strComPath, sizeof(deviceList[iFound].strComPath), "%s", strDevice.c_str());
|
||||
+ snprintf(deviceList[iFound].strComName, sizeof(deviceList[iFound].strComName), "/dev/%s", dent->d_name);
|
||||
+ deviceList[iFound].iVendorId = 0;
|
||||
+ deviceList[iFound].iProductId = 0;
|
||||
+ deviceList[iFound].adapterType = ADAPTERTYPE_LINUX;
|
||||
+ iFound++;
|
||||
+
|
||||
+ if (iFound >= iBufSize)
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ closedir(dir);
|
||||
+ }
|
||||
+
|
||||
+ return iFound;
|
||||
+}
|
||||
+
|
||||
+uint8_t CLinuxCECAdapterDetection::FindAdapters(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
|
||||
{
|
||||
- return access(CEC_LINUX_PATH, 0) == 0;
|
||||
+ uint8_t iFound(0);
|
||||
+ iFound = FindAdaptersUdev(deviceList, iBufSize, strDevicePath);
|
||||
+ if (iFound == 0)
|
||||
+ iFound = FindAdaptersLinux(deviceList, iBufSize, strDevicePath);
|
||||
+ return iFound;
|
||||
}
|
||||
|
||||
#endif
|
||||
diff --git a/src/libcec/adapter/Linux/LinuxCECAdapterDetection.h b/src/libcec/adapter/Linux/LinuxCECAdapterDetection.h
|
||||
index f5ea2c4..d3a5314 100644
|
||||
--- a/src/libcec/adapter/Linux/LinuxCECAdapterDetection.h
|
||||
+++ b/src/libcec/adapter/Linux/LinuxCECAdapterDetection.h
|
||||
@@ -44,7 +44,12 @@ namespace CEC
|
||||
class CLinuxCECAdapterDetection
|
||||
{
|
||||
public:
|
||||
- static bool FindAdapter(void);
|
||||
+ static uint8_t FindAdapters(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL);
|
||||
+ static bool IsAdapter(const char *strPort);
|
||||
+
|
||||
+ private:
|
||||
+ static uint8_t FindAdaptersUdev(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL);
|
||||
+ static uint8_t FindAdaptersLinux(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath = NULL);
|
||||
};
|
||||
};
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-2048"
|
||||
PKG_VERSION="331c1de588ed8f8c370dcbc488e5434a3c09f0f2"
|
||||
PKG_SHA256="9b30278e61b8dfe067d8f7cc9cb0d467e16a3d2de995e950b712570d7e4aa195"
|
||||
PKG_VERSION="5474ed1ab880b3296c9860d0943d7de1970c79dd"
|
||||
PKG_SHA256="d0dc119024c4b3283a85c88896009b917a4350f90fd783fd73bf3788c9d8a199"
|
||||
PKG_LICENSE="Public domain"
|
||||
PKG_SITE="https://github.com/libretro/libretro-2048"
|
||||
PKG_URL="https://github.com/libretro/libretro-2048/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-81"
|
||||
PKG_VERSION="525d5c18f1ff3fc54c37e083a475225d9179d59d"
|
||||
PKG_SHA256="e4611e88159e3a77efe3b029f9edfa40127e98cb8af0e1a9d320cc4d3d137708"
|
||||
PKG_VERSION="ffc99f27f092addc9ddd34dd0e3a3d4d1c053cbf"
|
||||
PKG_SHA256="3db0e494cbd2afcc511cd7ba0e5eda104871301e26a74254bf4a08356d567181"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE="https://github.com/libretro/81-libretro"
|
||||
PKG_URL="https://github.com/libretro/81-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-a5200"
|
||||
PKG_VERSION="0942c88d64cad6853b539f51b39060a9de0cbcab"
|
||||
PKG_SHA256="cb84b9f158510f0b2e5f687f249f103ab26c322f4b3971935b08af70c426464b"
|
||||
PKG_VERSION="526404072821bb2021fab16f8c5dbbca300512c8"
|
||||
PKG_SHA256="920d6072d58456a05a80e09efa8b8780a1c7d67ec29500e873c3095321fe799a"
|
||||
PKG_LICENSE="GPL2"
|
||||
PKG_SITE="https://github.com/libretro/a5200"
|
||||
PKG_URL="https://github.com/libretro/a5200/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-atari800"
|
||||
PKG_VERSION="8bfa3b80f6a2db365dfd1e8a6c06b7b0844327cf"
|
||||
PKG_SHA256="c1fee7ff0a87ff2ca1dc1d9ace1bb3a66615a299c0f4e796e75ba97c680852bb"
|
||||
PKG_VERSION="6a18cb23cc4a7cecabd9b16143d2d7332ae8d44b"
|
||||
PKG_SHA256="0fa8456f611975f80e0edba37a9cb4935918a94d30f6d42f8fa0679e76a9971a"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/libretro/libretro-atari800"
|
||||
PKG_URL="https://github.com/libretro/libretro-atari800/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-bsnes"
|
||||
PKG_VERSION="d770563fc3c4bd9abb522952cefb4aa923ba0b91"
|
||||
PKG_SHA256="838693257f9c8924c62ec6d88891fbeca310ac2fd7b8efa3d96775c3b34d4040"
|
||||
PKG_VERSION="f7bfa217cf7150779902c3a998f7624d92a5f17d"
|
||||
PKG_SHA256="a299383932e35d5030145e14c7fbab57ba6e1fa81e00c866b1bdcbc70bfac1c6"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-bsnes-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-bsnes-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-gba"
|
||||
PKG_VERSION="38182572571a48cb58057cde64b915237c4e2d58"
|
||||
PKG_SHA256="e4eaf64e9160b501cadf983a46b8a2a98c8b590a13ca9082793d9a11e17fdcaf"
|
||||
PKG_VERSION="6cee80685f735ea6c2373db2622a1f1ee9f39d39"
|
||||
PKG_SHA256="33ef14eb0141e98323cc8c3e997f668df348fea7b7bf5a97766c2c91af075fa7"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-gba-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-gba-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-lynx"
|
||||
PKG_VERSION="48909ddd1aba4de034d9c1da70c460b1724daa3b"
|
||||
PKG_SHA256="f6b02e047f6cd978134da64f84a6cb75d03f93744f0fb2de90655806f6c93156"
|
||||
PKG_VERSION="7fead71b49e0f08be5c4d4224fea73c6174763bf"
|
||||
PKG_SHA256="ea2a0fe2a5061835a7c8d692e4f6b965f2a82660e027af759e3e963e2508cc43"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-lynx-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-lynx-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-ngp"
|
||||
PKG_VERSION="673c3d924ff33d71c6a342b170eff5359244df1f"
|
||||
PKG_SHA256="0026c53bfa3a689be293ef228b83e108049c5952435344a921a353c946092638"
|
||||
PKG_VERSION="139fe34c8dfc5585d6ee1793a7902bca79d544de"
|
||||
PKG_SHA256="5f0122405b18e0a95f4a5da2ef2f57b4bf1895a691370e65cc19fd5854a50412"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-ngp-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-ngp-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-pce-fast"
|
||||
PKG_VERSION="087f70453a23185796c67440d4143442a857b3ff"
|
||||
PKG_SHA256="674b1e8a7c3a8bb08ce6f913020e4281cc2b78417870a17100c96a90dd4c5b58"
|
||||
PKG_VERSION="931586f0512663f625a6e981d3047a6620281ab5"
|
||||
PKG_SHA256="f3fe8e4a4130fe12ddd8b01526b724b8c0fd97e0036f0a50e3d2a0336c13356f"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-pce-fast-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-pce-fast-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-pce"
|
||||
PKG_VERSION="981ba264da3b6d67ea519e93dd231e5738d8b0f5"
|
||||
PKG_SHA256="68a1b54fd3b1efc02f9219caba5ebf11c74c41908860c377c0a425acc86a0ea8"
|
||||
PKG_VERSION="af28fb0385d00e0292c4703b3aa7e72762b564d2"
|
||||
PKG_SHA256="23c7f6524c18409aba60610db39f7b35b3af2cac1359c23b08901575da6bb154"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-pce-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-pce-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-pcfx"
|
||||
PKG_VERSION="47c355b6a515aef6dc57f57df1535570108a0e21"
|
||||
PKG_SHA256="15f5395778c9ce03e99c3a7cf0e0303dd58e5eba93f2b95c8ee6366fd8c25cba"
|
||||
PKG_VERSION="dd04cef9355286488a1d78ff18c4c848a1575540"
|
||||
PKG_SHA256="8f1153206479a25e925981076758698e0c5f6e7f826213b2b3598dc33a7d8ea0"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-pcfx-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-pcfx-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-psx"
|
||||
PKG_VERSION="f18de4ce29b7222f7209546173768fc4f6958256"
|
||||
PKG_SHA256="eeded15cfe72094df875078eafc1db0e449c97258a4f187bfa5aec656df630f5"
|
||||
PKG_VERSION="80d3eba272cf6efab6b76e4dc44ea2834c6f910d"
|
||||
PKG_SHA256="9dcd9c5c1f5321e6e6f77fe1f20b4830b2e558569e8d264299c627920324d4f2"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-psx-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-psx-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-saturn"
|
||||
PKG_VERSION="cd395e9e3ee407608450ebc565e871b24e7ffed6"
|
||||
PKG_SHA256="b8a7a359c490607187f2dd2ca49af3463731d3816a0b4411aab49dbc2abdc71e"
|
||||
PKG_VERSION="0a78a9a5ab0088ba19f21e028dda9f4b4d7c9e48"
|
||||
PKG_SHA256="3d342a7b29640042af7e245b97375f4e287925c0f5b7f95144ae57b12f96bef8"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-saturn-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-saturn-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-supergrafx"
|
||||
PKG_VERSION="460205fc7209a8397e215e2fb3fc13766f7c4316"
|
||||
PKG_SHA256="f7541fc895a480d626e136f1a57d54f3c9861a4f3f88b5e99e5a234708ac055d"
|
||||
PKG_VERSION="a776133c34ae8da5daf7d9ccb43e3e292e2b07b0"
|
||||
PKG_SHA256="f6a2d1cfeb170510eed437f939ae05d717a20b6e23626cff6ebd47f0c84f13ce"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-supergrafx-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-supergrafx-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-vb"
|
||||
PKG_VERSION="9d1bd03f21dac7897f65269e1095496331efce8b"
|
||||
PKG_SHA256="7c3d8fd2f8535be7de6f76be010ec6d34837d7c30caeb0096cae6e5c1e07c442"
|
||||
PKG_VERSION="8f837ebc077afdd6652efb2827fd8308a07113ca"
|
||||
PKG_SHA256="d2733026bde2b8049b8258f68d49954687ab43e2639d6a879c79cca68e91dea6"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-vb-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-vb-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-beetle-wswan"
|
||||
PKG_VERSION="32bf70a3032a138baa969c22445f4b7821632c30"
|
||||
PKG_SHA256="457028d9ec6e76e0ec3e2e69a40b1bac392dae4fa4aca724c8a1500dbc54fc8c"
|
||||
PKG_VERSION="2aeb47d3a58bf0360c686f842d9bb5bd201306fe"
|
||||
PKG_SHA256="035c0ebdad6740511cc395199db134d20c29611b830cf11831d6ec8744a33d42"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/beetle-wswan-libretro"
|
||||
PKG_URL="https://github.com/libretro/beetle-wswan-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-bk"
|
||||
PKG_VERSION="31af5ca5f307991eb596ed411d4d0e955c833421"
|
||||
PKG_SHA256="f90a9ecc31db054afd0f29690faf88ea6e695025e23526ec110df53b46ef08bc"
|
||||
PKG_VERSION="f95d929c8eca6c85075cd5c56a08aac9c58f3802"
|
||||
PKG_SHA256="7ed9976abe5c235061a44884346426509231d1237c9b7ff23e8a7aa6894fcf5d"
|
||||
PKG_LICENSE="NTP"
|
||||
PKG_SITE="https://github.com/libretro/bk-emulator"
|
||||
PKG_URL="https://github.com/libretro/bk-emulator/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libretro-bluemsx"
|
||||
PKG_VERSION="1f6b5b393df17e746bec118902b1d1f6ed3e4109"
|
||||
PKG_SHA256="2de09c4b4bdcc5d9c9076940624151ae5fb47e39259a0367f8030cb51f842a35"
|
||||
PKG_VERSION="572c91856a5288b7433c619af651e31f00f3ce7e"
|
||||
PKG_SHA256="86625bb7f6d1a5abb22d4eaf4691906aa985352519ad8193e63995b010ed214d"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/libretro/blueMSX-libretro"
|
||||
PKG_URL="https://github.com/libretro/blueMSX-libretro/archive/${PKG_VERSION}.tar.gz"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user