diff --git a/packages/addons/addon-depends/ccid/package.mk b/packages/addons/addon-depends/ccid/package.mk index 6a792138d1..60ea0654cb 100644 --- a/packages/addons/addon-depends/ccid/package.mk +++ b/packages/addons/addon-depends/ccid/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ccid" -PKG_VERSION="1.6.0" -PKG_SHA256="cdca7c22c45169cfc300d65d5362b7644ee195289f4fb8bf475a6cd321752c2c" +PKG_VERSION="1.6.2" +PKG_SHA256="41958410950157e622f9d91c9e78c7b708db74e22f71190c581d24d20564d449" PKG_LICENSE="LGPL" PKG_SITE="https://ccid.apdu.fr" PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk index 428142012e..75947a25c4 100644 --- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk +++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="at-spi2-core" -PKG_VERSION="2.52.0" -PKG_SHA256="0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab" +PKG_VERSION="2.57.0" +PKG_SHA256="942070eff19155b7d6ce5557f1a020015287b840048536e9ef9a28c4e9ce428c" PKG_LICENSE="OSS" PKG_SITE="https://www.gnome.org/" PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk index dc908c7c92..47188670a6 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk @@ -11,5 +11,5 @@ PKG_BUILD_FLAGS="-sysroot" unpack() { mkdir -p ${PKG_BUILD} - tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.gz -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/cups/package.mk b/packages/addons/addon-depends/chrome-depends/cups/package.mk index b991c7c09d..e94eda9f79 100644 --- a/packages/addons/addon-depends/chrome-depends/cups/package.mk +++ b/packages/addons/addon-depends/chrome-depends/cups/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cups" -PKG_VERSION="2.4.10" -PKG_SHA256="f51b9edd631db1830b967101b51f0045c8c239ae799dff89f0399f3e47a95c02" +PKG_VERSION="2.4.12" +PKG_SHA256="7a4d32822b320aa2999b18fdfc4ce5ca9ad204fe6302ff69e6c24b21f8d0eaa0" PKG_LICENSE="GPL" PKG_SITE="http://www.cups.org" PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index 731ea38284..963ff0d2ff 100644 --- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gtk3" -PKG_VERSION="3.24.42" -PKG_SHA256="50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2" +PKG_VERSION="3.24.49" +PKG_SHA256="5ea52c6a28f0e5ecf2e9a3c2facbb30d040b73871fcd5f33cd1317e9018a146e" PKG_LICENSE="LGPL" PKG_SITE="https://www.gtk.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz" +PKG_URL="https://download.gnome.org/sources/gtk/${PKG_VERSION:0:4}/gtk-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain at-spi2-core atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon" PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info" PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System." diff --git a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk index e441f9c386..84c5ee3965 100644 --- a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXcursor" -PKG_VERSION="1.2.2" -PKG_SHA256="53d071bd2cc56e517a30998d5e685c8a74556ddada43c6985d14da9a023a88ee" +PKG_VERSION="1.2.3" +PKG_SHA256="fde9402dd4cfe79da71e2d96bb980afc5e6ff4f8a7d74c159e1966afb2b2c2c0" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk index 552fbc7e1f..ac6be38966 100644 --- a/packages/addons/addon-depends/cxxtools/package.mk +++ b/packages/addons/addon-depends/cxxtools/package.mk @@ -13,8 +13,8 @@ PKG_DEPENDS_TARGET="toolchain cxxtools:host openssl" PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes." PKG_BUILD_FLAGS="+pic" -PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-unittest" -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest" +PKG_CONFIGURE_OPTS_HOST="--disable-demos --disable-unittest" +PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --disable-unittest" post_makeinstall_host() { rm -rf ${TOOLCHAIN}/bin/cxxtools-config diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index 47d1c9b5bc..509a4b5730 100644 --- a/packages/addons/addon-depends/docker/cli/package.mk +++ b/packages/addons/addon-depends/docker/cli/package.mk @@ -3,7 +3,7 @@ PKG_NAME="cli" PKG_VERSION="$(get_pkg_version moby)" -PKG_SHA256="abd16e3911bc7bbd00596ebe4f58baf3d577160d99eefd749a908507ddfc587b" +PKG_SHA256="b65cd415e63be23fcaa63107bc47a762173a06c84fb78b1575edc5443bb39867" 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="9f9e4058019a37304dc6572ffcbb409d529b59d8" +export PKG_GIT_COMMIT="578ccf607d24abc5270e9a4cbd5ba9b5355b042f" configure_target() { go_configure diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index d9acbd5ebd..46d0729a5f 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -1,10 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="containerd" -PKG_VERSION="1.7.23" -PKG_SHA256="393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c" +PKG_VERSION="2.1.3" +PKG_SHA256="f5fd43b9eefd71ddef100e7070016f9e40a1d689251bc885a2d2a87750da26b5" PKG_LICENSE="APL" PKG_SITE="https://containerd.io" PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" @@ -13,7 +12,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="57f17b0a6295a39009d861b89e3b3b87b005ca27" +export PKG_GIT_COMMIT="c787fb98911740dd3ff2d0e45ce88cdf01410486" pre_make_target() { @@ -21,7 +20,7 @@ pre_make_target() { export CONTAINERD_VERSION="${PKG_VERSION}" export CONTAINERD_REVISION="${PKG_GIT_COMMIT}" - export CONTAINERD_PKG="github.com/containerd/containerd" + export CONTAINERD_PKG="github.com/containerd/containerd/v2" export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}" export GO111MODULE=off @@ -31,13 +30,12 @@ pre_make_target() { fi mv ${GOPATH}/src/github.com/containerd/containerd/api ${PKG_BUILD}/api-vendor-duplicate - rmdir ${GOPATH}/src/github.com/containerd/containerd - ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd + ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd/v2 + ln -fs ${PKG_BUILD}/api ${GOPATH}/src/github.com/containerd/containerd/api } make_target() { mkdir -p bin ${GOLANG} build -v -o bin/containerd -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd - ${GOLANG} build -v -o bin/containerd-shim -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim ${GOLANG} build -v -o bin/containerd-shim-runc-v2 -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim-runc-v2 } diff --git a/packages/addons/addon-depends/docker/docker-compose/package.mk b/packages/addons/addon-depends/docker/docker-compose/package.mk new file mode 100644 index 0000000000..2ce735db6e --- /dev/null +++ b/packages/addons/addon-depends/docker/docker-compose/package.mk @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="docker-compose" +PKG_VERSION="2.39.1" +PKG_LICENSE="Apache-2.0" +PKG_SITE="https://github.com/docker/compose" +PKG_LONGDESC="Define and run multi-container applications with Docker." +PKG_TOOLCHAIN="manual" + +case "${ARCH}" in + "aarch64") + PKG_SHA256="7b2627ed76f7dcb0d93f649f185af912372229b4c09762a3cd1db5be5255632b" + PKG_URL="${PKG_SITE}/releases/download/v${PKG_VERSION}/docker-compose-linux-aarch64" + ;; + "arm") + PKG_SHA256="a97c785b148cf744e4f91835fa981dc93d6ced5132d42dab934947e33032af98" + PKG_URL="${PKG_SITE}/releases/download/v${PKG_VERSION}/docker-compose-linux-armv7" + ;; + "x86_64") + PKG_SHA256="a5ea28722d5da628b59226626f7d6c33c89a7ed19e39f750645925242044c9d2" + PKG_URL="${PKG_SITE}/releases/download/v${PKG_VERSION}/docker-compose-linux-x86_64" + ;; +esac + +PKG_SOURCE_NAME="docker-compose-linux-${ARCH}-${PKG_VERSION}" + +unpack() { + mkdir -p ${PKG_BUILD} + cp -P ${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME} ${PKG_BUILD}/docker-compose + chmod +x ${PKG_BUILD}/docker-compose +} diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index b9f2bfe792..71b99c3d4b 100644 --- a/packages/addons/addon-depends/docker/moby/package.mk +++ b/packages/addons/addon-depends/docker/moby/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="moby" -PKG_VERSION="27.5.1" -PKG_SHA256="0d071c1773c855778d85590e01b924c1857000fd786485f4b674a3be2d3b893c" +PKG_VERSION="28.3.2" +PKG_SHA256="e4828e32e474cef1b78f40278211648300071399c7498252dfe0b96e789b8a31" 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="4c9b3b011ae4c30145a7b344c870bdda01b454e2" +export PKG_GIT_COMMIT="e77ff99ede5ee5952b3a9227863552ae6e5b6fb1" PKG_MOBY_BUILDTAGS="daemon \ autogen \ diff --git a/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch b/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch index 1aacb2c50f..b9af801466 100644 --- a/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch +++ b/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch @@ -4,20 +4,20 @@ # # diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go ---- 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 @@ +--- a/cmd/dockerd/daemon_unix.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/cmd/dockerd/daemon_unix.go 2025-06-25 12:49:40.558287815 +0000 +@@ -21,7 +21,7 @@ - func getDefaultDaemonConfigDir() (string, error) { + func getDefaultDaemonConfigDir() string { if !honorXDG { -- return "/etc/docker", nil -+ return "/storage/.kodi/userdata/addon_data/service.system.docker/config", nil +- return "/etc/docker" ++ return "/storage/.kodi/userdata/addon_data/service.system.docker/config" } // 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-09-06 09:57:40.000000000 +0000 -+++ b/cmd/dockerd/options.go 2024-09-10 06:47:41.951753985 +0000 +--- a/cmd/dockerd/options.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/cmd/dockerd/options.go 2025-06-25 12:49:40.557989909 +0000 @@ -39,7 +39,7 @@ // // - DOCKER_CONFIG only affects TLS certificates, but does not change the @@ -36,10 +36,22 @@ diff -Naur a/cmd/dockerd/options.go b/cmd/dockerd/options.go // - look at "when" (and when _not_) XDG_CONFIG_HOME should be used. Its // needed for rootless, but perhaps could be used for non-rootless(?) // - When changing the location for TLS config, (ideally) they should +diff -Naur a/daemon/config/config_linux_test.go b/daemon/config/config_linux_test.go +--- a/daemon/config/config_linux_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/daemon/config/config_linux_test.go 2025-06-25 12:49:40.538939276 +0000 +@@ -377,7 +377,7 @@ + }{ + { + name: "deprecated-key-path", +- configJSON: `{"deprecated-key-path": "/etc/docker/key.json"}`, ++ configJSON: `{"deprecated-key-path": "/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json"}`, + }, + { + name: "allow-nondistributable-artifacts", 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-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 @@ +--- a/integration/plugin/authz/authz_plugin_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/integration/plugin/authz/authz_plugin_test.go 2025-06-25 12:49:40.521643361 +0000 +@@ -57,15 +57,15 @@ ctrl = &authorizationController{} @@ -58,57 +70,32 @@ diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/ assert.NilError(t, err) 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-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() -- err := os.RemoveAll("/etc/docker/plugins") -+ err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins") - assert.NilError(t, err) - } - -@@ -352,10 +352,10 @@ - respond(w, &graphDriverResponse{Size: size}) - }) - -- err = os.MkdirAll("/etc/docker/plugins", 0o755) -+ err = os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755) - assert.NilError(t, err) - -- specFile := "/etc/docker/plugins/" + name + "." + ext -+ specFile := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/" + name + "." + ext - err = os.WriteFile(specFile, b, 0o644) - 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-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 @@ +--- a/integration-cli/docker_cli_external_volume_driver_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/integration-cli/docker_cli_external_volume_driver_test.go 2025-06-25 12:49:40.867460226 +0000 +@@ -266,10 +266,10 @@ send(w, `{"Capabilities": { "Scope": "global" }}`) }) - 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) - err = os.WriteFile("/etc/docker/plugins/"+name+".spec", []byte(s.Server.URL), 0o644) + err = os.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/"+name+".spec", []byte(s.Server.URL), 0o644) - assert.NilError(c, err) + assert.NilError(t, err) return s } -@@ -273,7 +273,7 @@ - func (s *DockerExternalVolumeSuite) TearDownSuite(ctx context.Context, c *testing.T) { +@@ -277,7 +277,7 @@ + func (s *DockerExternalVolumeSuite) TearDownSuite(ctx context.Context, t *testing.T) { s.volumePlugin.Close() - err := os.RemoveAll("/etc/docker/plugins") + err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins") - assert.NilError(c, err) + assert.NilError(t, err) } -@@ -367,7 +367,7 @@ +@@ -371,7 +371,7 @@ // Make sure a request to use a down driver doesn't block other requests func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *testing.T) { @@ -118,9 +105,9 @@ 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-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 @@ +--- a/integration-cli/docker_cli_network_unix_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/integration-cli/docker_cli_network_unix_test.go 2025-06-25 12:49:40.867898684 +0000 +@@ -226,14 +226,14 @@ } }) @@ -138,19 +125,19 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d err = os.WriteFile(ipamFileName, []byte(url), 0o644) assert.NilError(t, err) } -@@ -244,7 +244,7 @@ +@@ -245,7 +245,7 @@ s.server.Close() - err := os.RemoveAll("/etc/docker/plugins") + err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins") - assert.NilError(c, err) + assert.NilError(t, err) } 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-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 @@ +--- a/integration-cli/docker_cli_swarm_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/integration-cli/docker_cli_swarm_test.go 2025-06-25 12:49:40.871279027 +0000 +@@ -843,14 +843,14 @@ } }) @@ -168,7 +155,7 @@ diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_c err = os.WriteFile(ipamFileName, []byte(url), 0o644) assert.NilError(t, err) } -@@ -843,7 +843,7 @@ +@@ -863,7 +863,7 @@ setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin) defer func() { s.server.Close() @@ -178,9 +165,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-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 @@ +--- a/libnetwork/drivers/remote/driver_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/libnetwork/drivers/remote/driver_test.go 2025-06-25 12:49:40.861763019 +0000 +@@ -40,7 +40,7 @@ } func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() { @@ -190,9 +177,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-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 @@ +--- a/libnetwork/ipams/remote/remote_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/libnetwork/ipams/remote/remote_test.go 2025-06-25 12:49:40.854121508 +0000 +@@ -35,7 +35,7 @@ } func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() { @@ -202,8 +189,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-09-06 09:57:40.000000000 +0000 -+++ b/libnetwork/libnetwork_unix_test.go 2024-09-10 06:47:42.271756623 +0000 +--- a/libnetwork/libnetwork_unix_test.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/libnetwork/libnetwork_unix_test.go 2025-06-25 12:49:40.864001829 +0000 @@ -2,4 +2,4 @@ package libnetwork_test @@ -211,8 +198,8 @@ 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-09-06 09:57:40.000000000 +0000 -+++ b/pkg/plugins/discovery.go 2024-09-10 06:47:41.915087017 +0000 +--- a/pkg/plugins/discovery.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/pkg/plugins/discovery.go 2025-06-25 12:49:40.525984485 +0000 @@ -128,12 +128,12 @@ // // On Unix in non-rootless mode: @@ -229,9 +216,9 @@ 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-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 @@ +--- a/pkg/plugins/discovery_unix.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/pkg/plugins/discovery_unix.go 2025-06-25 12:49:40.525803226 +0000 +@@ -13,7 +13,7 @@ if configHome, err := homedir.GetConfigHome(); err != nil { return filepath.Join(configHome, "docker/plugins") } @@ -240,7 +227,7 @@ diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go } func rootlessLibPluginsPath() string { -@@ -27,5 +27,5 @@ +@@ -28,5 +28,5 @@ if rootless.RunningWithRootlessKit() { return []string{rootlessConfigPluginsPath(), rootlessLibPluginsPath()} } @@ -248,8 +235,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-09-06 09:57:40.000000000 +0000 -+++ b/pkg/plugins/plugins.go 2024-09-10 06:47:41.915087017 +0000 +--- a/pkg/plugins/plugins.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/pkg/plugins/plugins.go 2025-06-25 12:49:40.526271398 +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 +247,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-09-06 09:57:40.000000000 +0000 -+++ b/registry/config_unix.go 2024-09-10 06:47:42.275089984 +0000 +--- a/registry/config_unix.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/registry/config_unix.go 2025-06-25 12:49:40.866806097 +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,9 +259,9 @@ 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-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 @@ +--- a/registry/search_endpoint_v1.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/registry/search_endpoint_v1.go 2025-06-25 12:49:40.867087851 +0000 +@@ -58,7 +58,7 @@ if endpoint.IsSecure { // If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry` // in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fall back to HTTP. @@ -283,3 +270,15 @@ diff -Naur a/registry/search_endpoint_v1.go b/registry/search_endpoint_v1.go } // registry is insecure and HTTPS failed, fallback to HTTP. +diff -Naur a/vendor/github.com/containerd/containerd/v2/core/remotes/docker/config/hosts.go b/vendor/github.com/containerd/containerd/v2/core/remotes/docker/config/hosts.go +--- a/vendor/github.com/containerd/containerd/v2/core/remotes/docker/config/hosts.go 2025-06-20 16:22:35.000000000 +0000 ++++ b/vendor/github.com/containerd/containerd/v2/core/remotes/docker/config/hosts.go 2025-06-25 12:49:40.820074314 +0000 +@@ -607,7 +607,7 @@ + return filepath.Join(base, p) + } + +-// loadCertsDir loads certs from certsDir like "/etc/docker/certs.d" . ++// loadCertsDir loads certs from certsDir like "/storage/.kodi/userdata/addon_data/service.system.docker/config/certs.d" . + // Compatible with Docker file layout + // - files ending with ".crt" are treated as CA certificate files + // - files ending with ".cert" are treated as client certificates, and diff --git a/packages/addons/addon-depends/docker/tini/package.mk b/packages/addons/addon-depends/docker/tini/package.mk index ec5520e4dd..0b9594d1ff 100644 --- a/packages/addons/addon-depends/docker/tini/package.mk +++ b/packages/addons/addon-depends/docker/tini/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tini" diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk index 4b88380465..1d5f6b5dcc 100644 --- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk +++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="aspnet6-runtime" -PKG_VERSION="6.0.33" +PKG_VERSION="6.0.36" 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="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" + PKG_SHA256="a82e7ff766ab961b581971eaa7358b6d13ce1132451eebf85d25a1e4599446a2" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/19bb2019-9acc-4c85-a397-5c84aad3e79e/094076519c27db7d2619aee8744c9eaf/aspnetcore-runtime-6.0.36-linux-arm64.tar.gz" ;; "arm") - 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" + PKG_SHA256="3ba06e73e3e78186be7db2d636039c33726b467c1775a541eb53d8dcd12717d8" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/5a1d54ad-f01e-4407-a413-493a5e81f802/9773a2ed4499d6d8c2a89714aa3d9c4c/aspnetcore-runtime-6.0.36-linux-arm.tar.gz" ;; "x86_64") - 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" + PKG_SHA256="e269fa26930f08c6df920969a4e6c36138372115e193db3cccbbaa06f61e15be" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/6f4d628c-903a-4c54-8e78-584ac3fad3e9/35c386c099e48775ba50df7bb3dfd93a/aspnetcore-runtime-6.0.36-linux-x64.tar.gz" ;; esac PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk index 8506f060b5..7c48317d94 100644 --- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk +++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet8-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="aspnet8-runtime" -PKG_VERSION="8.0.8" +PKG_VERSION="8.0.18" 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="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" + PKG_SHA256="74b20f12c7e48f47d90e150a646f05bf1b6db34659f28d34ac25fa7be35dd66f" + PKG_URL="https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm64.tar.gz" ;; "arm") - 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" + PKG_SHA256="28899322ab8af69708202f7797abe747a17566da84e6fd3747a49af95cc19bff" + PKG_URL="https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-arm.tar.gz" ;; "x86_64") - 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" + PKG_SHA256="3902cd2a0742e6f59b72e031bc46a6f39cdf070ec2ee20174ebd373dd496a652" + PKG_URL="https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.18/aspnetcore-runtime-8.0.18-linux-x64.tar.gz" ;; esac PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" diff --git a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk index 58f93d98b9..ef4b3a4dfc 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="e904348a36c10a3930384b55a4a31250780456306c9c98cedbdcee277afea3e9" PKG_LICENSE="GPL" PKG_SITE="http://mumudvb.net/" PKG_URL="https://github.com/braice/MuMuDVB/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain libdvbcsa" +PKG_DEPENDS_TARGET="toolchain libdvbcsa gettext" PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast" PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/enet/package.mk b/packages/addons/addon-depends/enet/package.mk deleted file mode 100644 index d758662045..0000000000 --- a/packages/addons/addon-depends/enet/package.mk +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="enet" -PKG_VERSION="8d69c5abe4b699e7077395e01927bd102b3ba597" # 12 Jun 2021 -PKG_SHA256="4da28dc923828f2241f9086009c87d9679cb52bb3085305754cbcac33a06f312" -PKG_LICENSE="MIT" -PKG_SITE="https://github.com/cgutman/enet/" -PKG_URL="https://github.com/cgutman/enet/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="A network communication layer on top of UDP (User Datagram Protocol)." -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared" - -post_makeinstall_target() { - rm -r ${INSTALL} -} diff --git a/packages/addons/addon-depends/faad2/package.mk b/packages/addons/addon-depends/faad2/package.mk index dc8d4f7f03..eceb47976c 100644 --- a/packages/addons/addon-depends/faad2/package.mk +++ b/packages/addons/addon-depends/faad2/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="faad2" -PKG_VERSION="2.11.1" -PKG_SHA256="72dbc0494de9ee38d240f670eccf2b10ef715fd0508c305532ca3def3225bb06" +PKG_VERSION="2.11.2" +PKG_SHA256="3fcbd305e4abd34768c62050e18ca0986f7d9c5eca343fb98275418013065c0e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/knik0/faad2/" PKG_URL="https://github.com/knik0/faad2/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk index 15dcddafb9..2d2c5d816f 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="x264" -PKG_VERSION="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1" -PKG_SHA256="2a1b197fd1fbc85045794f18c9353648a9ae3cbe194b7b92d523d096f9445464" +PKG_VERSION="ff620d0c3c4f717ab393892983d43458d27e4bed" +PKG_SHA256="c6945fe9c3cdd7b0d2f89250ae696a51db59e3506af4d28d03616c9edd1e519b" 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" diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk index 8278c95bd7..129a7973b0 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="x265" -PKG_VERSION="4.0" -PKG_SHA256="a5b6b1176a6cbf6905cdc3fcc464d6bc626cb72ea886751e8fe445f85aa5e386" +PKG_VERSION="4.1" +PKG_SHA256="53c9363dba429eab3123ffcfda28065c5e7a8b5e21efa0a5f23bc5b89340d390" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://www.videolan.org/developers/x265.html" @@ -14,5 +14,5 @@ PKG_TOOLCHAIN="make" pre_configure_target() { LDFLAGS+=" -ldl" - ${CMAKE} -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" ./source + ${CMAKE} -G "Unix Makefiles" ./source } diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 162470d7a8..c6bc801c38 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -1,10 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="go" -PKG_VERSION="1.23.6" -PKG_SHA256="06ca9da2305302a7ca1593afadf012494debf658a11e4e41119ee1ee160f77c7" +PKG_VERSION="1.23.11" +PKG_SHA256="876e1152108981523324f0cedb3fe7681eb99dc0176675f62e5e0e45a29fe47b" PKG_LICENSE="BSD" PKG_SITE="https://golang.org" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/hidapi/package.mk b/packages/addons/addon-depends/hidapi/package.mk index bee13ef94b..fa03c4b281 100644 --- a/packages/addons/addon-depends/hidapi/package.mk +++ b/packages/addons/addon-depends/hidapi/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="hidapi" -PKG_VERSION="0.14.0" -PKG_SHA256="a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd" +PKG_VERSION="0.15.0" +PKG_SHA256="5d84dec684c27b97b921d2f3b73218cb773cf4ea915caee317ac8fc73cef8136" PKG_LICENSE="HIDAPI-orig" PKG_SITE="http://libusb.info/" PKG_URL="https://github.com/libusb/hidapi/archive/refs/tags/hidapi-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/icu/package.mk b/packages/addons/addon-depends/icu/package.mk index fd75014c29..8c389c2ef2 100644 --- a/packages/addons/addon-depends/icu/package.mk +++ b/packages/addons/addon-depends/icu/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="icu" -PKG_VERSION="75-1" -PKG_SHA256="925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e" +PKG_VERSION="77-1" +PKG_SHA256="ded3a96f6b7236d160df30af46593165b9c78a4ec72a414aa63cf50614e4c14e" PKG_LICENSE="Custom" PKG_SITE="https://icu.unicode.org" PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/chrome-depends/libXft/package.mk b/packages/addons/addon-depends/libXft/package.mk similarity index 71% rename from packages/addons/addon-depends/chrome-depends/libXft/package.mk rename to packages/addons/addon-depends/libXft/package.mk index fba442697a..da9e8a02b1 100644 --- a/packages/addons/addon-depends/chrome-depends/libXft/package.mk +++ b/packages/addons/addon-depends/libXft/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXft" -PKG_VERSION="2.3.8" -PKG_SHA256="5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49" +PKG_VERSION="2.3.9" +PKG_SHA256="60a25b78945ed6932635b3bb1899a517d31df7456e69867ffba27f89ff3976f5" PKG_LICENSE="OSS" PKG_SITE="https://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.xz" @@ -12,5 +12,4 @@ PKG_DEPENDS_TARGET="toolchain fontconfig freetype libXrender util-macros xorgpro PKG_LONGDESC="X FreeType library." PKG_BUILD_FLAGS="+pic -sysroot" -PKG_CONFIGURE_OPTS_TARGET="--enable-static \ - --disable-shared" +PKG_MESON_OPTS_TARGET="-Ddefault_library=static" diff --git a/packages/addons/addon-depends/libconfig/package.mk b/packages/addons/addon-depends/libconfig/package.mk index 56c0a80ffc..5bd756a6f7 100644 --- a/packages/addons/addon-depends/libconfig/package.mk +++ b/packages/addons/addon-depends/libconfig/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libconfig" -PKG_VERSION="1.7.3" -PKG_SHA256="68757e37c567fd026330c8a8449aa5f9cac08a642f213f2687186b903bd7e94e" +PKG_VERSION="1.8.1" +PKG_SHA256="e95798d2992a66ecd547ce3651d7e10642ff2211427c43a7238186ff4c372627" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/hyperrealm/libconfig" PKG_URL="https://github.com/hyperrealm/libconfig/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/libexif/package.mk b/packages/addons/addon-depends/libexif/package.mk index 691dc37062..caa432029d 100644 --- a/packages/addons/addon-depends/libexif/package.mk +++ b/packages/addons/addon-depends/libexif/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libexif" -PKG_VERSION="0.6.24" -PKG_SHA256="d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae" +PKG_VERSION="0.6.25" +PKG_SHA256="7c9eba99aed3e6594d8c3e85861f1c6aaf450c218621528bc989d3b3e7a26307" PKG_LICENSE="LGPL" PKG_SITE="https://libexif.github.io" PKG_URL="https://github.com/libexif/libexif/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" diff --git a/packages/addons/addon-depends/libgpiod/package.mk b/packages/addons/addon-depends/libgpiod/package.mk index ed70b4fe03..0488c08676 100644 --- a/packages/addons/addon-depends/libgpiod/package.mk +++ b/packages/addons/addon-depends/libgpiod/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libgpiod" -PKG_VERSION="2.2" -PKG_SHA256="ae35329db7027c740e90c883baf27c26311f0614e6a7b115771b28188b992aec" +PKG_VERSION="2.2.2" +PKG_SHA256="d0b1380c3cbabbb49b82f709b3288376d98347d4436613407d19cc4cbbfc45a6" 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" diff --git a/packages/addons/addon-depends/libimobiledevice-glue/package.mk b/packages/addons/addon-depends/libimobiledevice-glue/package.mk index 6454fd5406..7def0fab04 100644 --- a/packages/addons/addon-depends/libimobiledevice-glue/package.mk +++ b/packages/addons/addon-depends/libimobiledevice-glue/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libimobiledevice-glue" -PKG_VERSION="1.2.0" -PKG_SHA256="ff9cbc240c9780edfa43914a057b86362054053721b65fb04f54a25023b92b62" +PKG_VERSION="1.3.2" +PKG_SHA256="6489a3411b874ecd81c87815d863603f518b264a976319725e0ed59935546774" PKG_LICENSE="LGPL-2.1" PKG_SITE="http://www.libimobiledevice.org" PKG_URL="https://github.com/libimobiledevice/libimobiledevice-glue/releases/download/${PKG_VERSION}/libimobiledevice-glue-${PKG_VERSION}.tar.bz2" diff --git a/packages/addons/addon-depends/libmpdclient/package.mk b/packages/addons/addon-depends/libmpdclient/package.mk index ea4c8a91ba..f92a1337c0 100644 --- a/packages/addons/addon-depends/libmpdclient/package.mk +++ b/packages/addons/addon-depends/libmpdclient/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmpdclient" -PKG_VERSION="2.22" -PKG_SHA256="eac15b82b5ba5ed0648af580221eb74657394f7fe768e966d9e9ebb27435429f" +PKG_VERSION="2.23" +PKG_SHA256="4a1b6c7f783d8cac3d3b8e4cbe9ad021c45491e383de3b893ea4eedefbc71607" PKG_LICENSE="BSD-3c" PKG_SITE="https://www.musicpd.org" PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/libusbmuxd/package.mk b/packages/addons/addon-depends/libusbmuxd/package.mk index bd35979f36..f380ff1dca 100644 --- a/packages/addons/addon-depends/libusbmuxd/package.mk +++ b/packages/addons/addon-depends/libusbmuxd/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libusbmuxd" -PKG_VERSION="2.1.0" -PKG_SHA256="3bda6abb2167e7818bd449aa03c5cfe175c6f965bab3979fda6d58e698df19af" +PKG_VERSION="2.1.1" +PKG_SHA256="bcc185615a0f4ba80b617696235a084c64b68a1bf546a1dedd85da6b62b8cfbe" PKG_LICENSE="GPL" PKG_SITE="http://www.libimobiledevice.org" PKG_URL="https://github.com/libimobiledevice/libusbmuxd/archive/${PKG_VERSION}.tar.gz" @@ -18,7 +18,9 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ configure_package() { # if using a git hash as a package version - set RELEASE_VERSION - export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}" + if [ -f ${PKG_BUILD}/NEWS ]; then + export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}" + fi } post_configure_target() { diff --git a/packages/addons/addon-depends/libvncserver/package.mk b/packages/addons/addon-depends/libvncserver/package.mk index 2bee27ed2c..9ed2a8dc6a 100644 --- a/packages/addons/addon-depends/libvncserver/package.mk +++ b/packages/addons/addon-depends/libvncserver/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libvncserver" -PKG_VERSION="0.9.14" -PKG_SHA256="83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5" +PKG_VERSION="0.9.15" +PKG_SHA256="62352c7795e231dfce044beb96156065a05a05c974e5de9e023d688d8ff675d7" PKG_LICENSE="GPL" PKG_SITE="https://libvnc.github.io/" PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PKG_VERSION}.tar.gz" @@ -14,4 +14,7 @@ PKG_CMAKE_OPTS_TARGET="-DWITH_GCRYPT=0 \ -DWITH_GNUTLS=0 \ -DWITH_GTK=0 \ -DWITH_SDL=0 \ - -DWITH_TIGHTVNC_FILETRANSFER=0" + -DWITH_TIGHTVNC_FILETRANSFER=0 \ + -DWITH_EXAMPLES=OFF \ + -DWITH_TESTS=OFF \ + -DWITH_QT=OFF" diff --git a/packages/addons/addon-depends/libvpx/package.mk b/packages/addons/addon-depends/libvpx/package.mk index 1c277f8b3f..56820535d9 100644 --- a/packages/addons/addon-depends/libvpx/package.mk +++ b/packages/addons/addon-depends/libvpx/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libvpx" -PKG_VERSION="1.14.1" -PKG_SHA256="901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977" +PKG_VERSION="1.15.2" +PKG_SHA256="26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa" PKG_LICENSE="BSD" PKG_SITE="https://www.webmproject.org" PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/libzip/package.mk b/packages/addons/addon-depends/libzip/package.mk index 4feedd9b7b..c6782c7288 100644 --- a/packages/addons/addon-depends/libzip/package.mk +++ b/packages/addons/addon-depends/libzip/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libzip" -PKG_VERSION="1.10.1" -PKG_SHA256="dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318" +PKG_VERSION="1.11.4" +PKG_SHA256="8a247f57d1e3e6f6d11413b12a6f28a9d388de110adc0ec608d893180ed7097b" PKG_LICENSE="GPL" PKG_SITE="https://libzip.org/" PKG_URL="https://libzip.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk index 09686bf4f1..08683c7d46 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmediainfo" -PKG_VERSION="24.06" -PKG_SHA256="0683f28a2475dc2417205ba528debccc407da4d9fa6516eb4b75b3ff7244e96e" +PKG_VERSION="25.04" +PKG_SHA256="ad45ed7c9db7807aa803845ca88bad9526aa8da883a58127e5390aaa2d81bbb1" PKG_LICENSE="GPL" PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source" PKG_URL="https://mediaarea.net/download/source/libmediainfo/${PKG_VERSION}/libmediainfo_${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/libplacebo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/libplacebo/package.mk index 33fa45998d..1dc9d4cc9c 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/libplacebo/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/libplacebo/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libplacebo" -PKG_VERSION="6.338.2" -PKG_SHA256="2f1e624e09d72a8c9db70f910f7560e764a1c126dae42acc5b3bcef836a7aec6" +PKG_VERSION="7.351.0" +PKG_SHA256="716954501d9b76e6906fddda66febc5886493d0673dd265ec1e6e52f4e5cd7c6" PKG_LICENSE="LGPLv2.1" PKG_SITE="https://code.videolan.org/videolan/libplacebo" PKG_URL="https://github.com/haasn/libplacebo/archive/refs/tags/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk index 8c551483fa..f1b7f5dc18 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mediainfo" -PKG_VERSION="24.06" -PKG_SHA256="32f4a82a31e386e177fdf6e4c237053e475b501089269ab2c729452a09313520" +PKG_VERSION="25.04" +PKG_SHA256="4b2553fe9104332d3baca5fe61b6b87af4d493108c5b863801cdb0a4826a33ae" PKG_LICENSE="GPL" PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source" PKG_URL="https://mediaarea.net/download/source/mediainfo/${PKG_VERSION}/mediainfo_${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk index 352ab3a337..cc8346ffaf 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpg123" -PKG_VERSION="1.32.6" -PKG_SHA256="ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6" +PKG_VERSION="1.33.0" +PKG_SHA256="2290e3aede6f4d163e1a17452165af33caad4b5f0948f99429cfa2d8385faa9d" PKG_LICENSE="LGPLv2" PKG_SITE="https://www.mpg123.org/" PKG_URL="https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk index ee7a6ff967..6460610668 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpv-drmprime" -PKG_VERSION="0.38.0" -PKG_SHA256="86d9ef40b6058732f67b46d0bbda24a074fae860b3eaae05bab3145041303066" +PKG_VERSION="0.40.0" +PKG_SHA256="10a0f4654f62140a6dd4d380dcf0bbdbdcf6e697556863dc499c296182f081a3" PKG_LICENSE="GPL" PKG_SITE="https://mpv.io/" PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk index 3910683bf6..a152b8c66b 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="squeezelite" -PKG_VERSION="c751ef146265c243cdbd7c0353dd0b70ab51730c" -PKG_SHA256="19fd23ca52039b4e216ff74e7d93b7fd8079ab8bfd63d5fb2286bfb743e334ed" +PKG_VERSION="0e5514efcb6366b74d7144626f1e9b4da7e81bf8" +PKG_SHA256="9d17b46aa3eee53141549758e874d259d8b20a0120d57a395b6a3ad8da5a1dae" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/ralph-irving/squeezelite" PKG_URL="https://github.com/ralph-irving/squeezelite/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk index f9e0938938..0b4e27cab9 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk @@ -17,10 +17,8 @@ PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \ --disable-shared \ --with-pcap=linux \ --disable-bluetooth \ - --disable-can \ --without-libnl \ - --disable-dbus \ - --disable-canusb" + --disable-dbus" pre_configure_target() { # When cross-compiling, configure can't set linux version diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk index 27e52f51ac..5c8d7b164b 100644 --- a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iftop" -PKG_VERSION="77901c8c53e01359d83b8090aacfe62214658183" -PKG_SHA256="f2728741f1bd2099d325271b4b2564a696dbce7c23401360ac6c9841cbda1108" +PKG_VERSION="75d1818129cbb8ff1bb7ca4915b95046f3ed0666" +PKG_SHA256="a4b507ba5ad1ec3e41263bee38f202267644adc05d150322f0d8f85c3e2d3f43" PKG_LICENSE="GPL" PKG_SITE="http://www.ex-parrot.com/pdw/iftop/" PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk index 447ba57a25..80e19e8183 100644 --- a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iperf" -PKG_VERSION="3.17.1" -PKG_SHA256="105b4fe7fbce31c9b94a3fec10c46e3b4b298adc076e1e3af52b990e1faf2db9" +PKG_VERSION="3.19.1" +PKG_SHA256="85e480d7fffdcb1368888aaee9d76bcfc211e17c2a6dcb2060b281498f82c97b" PKG_LICENSE="BSD" PKG_SITE="http://software.es.net/iperf/" PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk index 395dfc5a9a..a35874f5d4 100644 --- a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ncftp" -PKG_VERSION="3.2.7" -PKG_SHA256="d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" +PKG_VERSION="3.3.0" +PKG_SHA256="7920f884c2adafc82c8e41c46d6f3d22698785c7b3f56f5677a8d5c866396386" PKG_LICENSE="GPLv3" PKG_SITE="http://www.ncftp.com/ncftp/" -PKG_URL="https://www.ncftp.com/public_ftp/ncftp/ncftp-${PKG_VERSION}-src.tar.xz" +PKG_URL="https://www.ncftp.com/public_ftp/ncftp/ncftp-${PKG_VERSION}-src.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="NcFTP is a set of application programs implementing the File Transfer Protocol." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk index 003cab18dc..87c83f4619 100644 --- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ngrep" -PKG_VERSION="2a9603bc67dface9606a658da45e1f5c65170444" # 2019-01-29 -PKG_SHA256="500c29914dd26f5aa6df07446388d49b60249622c9b0fd1f266f62a5706f056c" +PKG_VERSION="b2e3ba3c5a593abf203e65a407c3a9de0f998d4a" +PKG_SHA256="daeb3e0473120541ebfa0d16b9cf4829d797d04cf30348d6c02b9b9a37fc9f05" PKG_LICENSE="GPL" PKG_SITE="https://github.com/jpr5/ngrep" PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk index 32a2bd5b59..54f88553f2 100644 --- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nmap" -PKG_VERSION="7.95" -PKG_SHA256="e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778" +PKG_VERSION="7.97" +PKG_SHA256="af98f27925c670c257dd96a9ddf2724e06cb79b2fd1e0d08c9206316be1645c0" PKG_LICENSE="GPL" PKG_SITE="https://nmap.org/" PKG_URL="https://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain openssl" +PKG_DEPENDS_TARGET="toolchain openssl dbus libnl" PKG_LONGDESC="Free Security Scanned for Network." PKG_BUILD_FLAGS="-sysroot" @@ -28,4 +28,5 @@ pre_configure_target() { rm -rf .${TARGET_NAME} export CPPFLAGS="${CPPFLAGS} -Iliblua" + export LIBS="${LIBS} -ldbus-1 -lnl-3 -lnl-genl-3" } diff --git a/packages/addons/addon-depends/pcsc-lite/package.mk b/packages/addons/addon-depends/pcsc-lite/package.mk index 4c79cf829c..a5b22a4fe8 100644 --- a/packages/addons/addon-depends/pcsc-lite/package.mk +++ b/packages/addons/addon-depends/pcsc-lite/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pcsc-lite" -PKG_VERSION="2.2.3" -PKG_SHA256="cab1e62755713f62ce1b567954dbb0e9a7e668ffbc3bbad3ce85c53f8f4e00a4" +PKG_VERSION="2.3.3" +PKG_SHA256="cdff7d7153a0b37aa74e26dfec89ec7dc5c5286aa21b91b903e38739d227e8e7" PKG_LICENSE="GPL" PKG_SITE="https://pcsclite.apdu.fr" PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/podman/conmon/package.mk b/packages/addons/addon-depends/podman/conmon/package.mk index 016874233d..ca73fabf60 100644 --- a/packages/addons/addon-depends/podman/conmon/package.mk +++ b/packages/addons/addon-depends/podman/conmon/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="conmon" -PKG_VERSION="2.1.12" -PKG_SHA256="842f0b5614281f7e35eec2a4e35f9f7b9834819aa58ecdad8d0ff6a84f6796a6" +PKG_VERSION="2.1.13" +PKG_SHA256="350992cb2fe4a69c0caddcade67be20462b21b4078dae00750e8da1774926d60" 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="e8896631295ccb0bfdda4284f1751be19b483264" +export PKG_GIT_COMMIT="82de887596ed8ee6d9b2ee85e4f167f307bb569b" pre_configure_target() { export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/packages/addons/addon-depends/podman/gpgme/package.mk b/packages/addons/addon-depends/podman/gpgme/package.mk index cdc9612442..79e8948ff0 100644 --- a/packages/addons/addon-depends/podman/gpgme/package.mk +++ b/packages/addons/addon-depends/podman/gpgme/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gpgme" -PKG_VERSION="1.24.2" -PKG_SHA256="e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581" +PKG_VERSION="2.0.0" +PKG_SHA256="ddf161d3c41ff6a3fcbaf4be6c6e305ca4ef1cc3f1ecdfce0c8c2a167c0cc36d" PKG_LICENSE="gpgme" PKG_SITE="https://gnupg.org/software/gpgme/index.html" PKG_URL="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKG_VERSION}.tar.bz2" diff --git a/packages/addons/addon-depends/podman/libassuan/package.mk b/packages/addons/addon-depends/podman/libassuan/package.mk index 0cbc5d741b..1a41ac1e8a 100644 --- a/packages/addons/addon-depends/podman/libassuan/package.mk +++ b/packages/addons/addon-depends/podman/libassuan/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libassuan" -PKG_VERSION="3.0.1" -PKG_SHA256="c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1" +PKG_VERSION="3.0.2" +PKG_SHA256="d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6" 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" diff --git a/packages/addons/addon-depends/podman/netavark/package.mk b/packages/addons/addon-depends/podman/netavark/package.mk index aaf8b2ad9d..ca07745f8b 100644 --- a/packages/addons/addon-depends/podman/netavark/package.mk +++ b/packages/addons/addon-depends/podman/netavark/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="netavark" -PKG_VERSION="1.14.0" -PKG_SHA256="d2ded5412e5037e84f79a28c774378c864aa6f6e43023dd88891c70cfaf963ef" +PKG_VERSION="1.15.2" +PKG_SHA256="84325e03aa0a2818aef9fb57b62cda8e9472584744d91ce5e5b191098f9e6d6a" 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" diff --git a/packages/addons/addon-depends/podman/podman-bin/package.mk b/packages/addons/addon-depends/podman/podman-bin/package.mk index b2fd8c311a..4cf90a459d 100644 --- a/packages/addons/addon-depends/podman/podman-bin/package.mk +++ b/packages/addons/addon-depends/podman/podman-bin/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="podman-bin" -PKG_VERSION="5.4.0" -PKG_SHA256="e5efb825558624d0539dac94847c39aafec68e6d4dd712435ff4ec1b17044b69" +PKG_VERSION="5.5.2" +PKG_SHA256="a2dbd8280cd92d4741f32f5a99d385d7fc6f0dd36bc9cc90a7273767e26d43d9" 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="f9f7d48b24b1ca4403f189caaeab1cb8ff4a9aa2" +export PKG_GIT_COMMIT="e7d8226745ba07a64b7176a7f128e4ef53225a0e" PKG_PODMAN_BUILDTAGS="exclude_graphdriver_devicemapper \ exclude_graphdriver_btrfs \ diff --git a/packages/addons/addon-depends/polkit/package.mk b/packages/addons/addon-depends/polkit/package.mk index 6c0e618c97..3ac6e078a5 100644 --- a/packages/addons/addon-depends/polkit/package.mk +++ b/packages/addons/addon-depends/polkit/package.mk @@ -2,15 +2,16 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="polkit" -PKG_VERSION="124" -PKG_SHA256="a4693bb00a8eaa6fbf766b9771dd9e1e11343678dee7e14539b9d6a808f00166" +PKG_VERSION="126" +PKG_SHA256="2814a7281989f6baa9e57bd33bbc5e148827e2721ccef22aaf28ab2b376068e8" PKG_LICENSE="GPL" -PKG_SITE="https://www.freedesktop.org/software/polkit/docs/latest/" -PKG_URL="https://gitlab.freedesktop.org/polkit/polkit/-/archive/${PKG_VERSION}/polkit-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain expat glib" +PKG_SITE="https://polkit.pages.freedesktop.org/polkit" +PKG_URL="https://github.com/polkit-org/polkit/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain expat glib systemd" PKG_LONGDESC="polkit provides an authorization API intended to be used by privileged programs offering service to unprivileged programs" PKG_BUILD_FLAGS="-sysroot" PKG_MESON_OPTS_TARGET="-Dauthfw=shadow \ + -Dsession_tracking=logind \ -Dlibs-only=true \ -Dintrospection=false" diff --git a/packages/addons/addon-depends/qt5/package.mk b/packages/addons/addon-depends/qt5/package.mk index b980aa3a5b..d3c970ed4d 100644 --- a/packages/addons/addon-depends/qt5/package.mk +++ b/packages/addons/addon-depends/qt5/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="qt5" diff --git a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk index 9d6ebfe57d..6a3a2774cd 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="27d607d3c5c7b142681dcd9fd0afecb7fcb052abfaffc330b28906f782e602f3" PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://familie-radermacher.ch/dominic/computer/raspberry-pi/lan951x-led-ctl/" -PKG_URL="https://mockmoon-cybernetics.ch/cgi/cgit/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-${PKG_VERSION}.tar.xz" +PKG_URL="https://git.familie-radermacher.ch/linux/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libusb" PKG_LONGDESC="Control LEDs connected to LAN9512/LAN9514 ethernet USB controllers." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index 10c9e2ab3b..c5602a8c21 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -1,10 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="runc" -PKG_VERSION="1.2.0" -PKG_SHA256="25072beb84f4adae316a968241dc74ac30982d38e4459635074aa9e9d87d3de7" +PKG_VERSION="1.3.0" +PKG_SHA256="3262492ce42bea0919ee1a2d000b6f303fd14877295bc38d094876b55fdd448b" 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 +12,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="0b9fa21be2bcba45f6d9d748b4bcf70cfbffbc19" +export PKG_GIT_COMMIT="4ca628d1d4c974f92d24daccb901aa078aad748e" pre_make_target() { go_configure diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index fef7ad147d..282a3b667b 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="asio" -PKG_VERSION="1.28.1" -PKG_SHA256="8c6adab3a94690773668ded084d3b0dc01d7231ec1edf1ad862f8db0e275ee56" +PKG_VERSION="1.34.2" +PKG_SHA256="688869a4447bd564bcee3d43137d52d972112cb05c7ec4665945affdd01eea75" PKG_LICENSE="BSL" PKG_SITE="http://think-async.com/Asio" PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip" diff --git a/packages/addons/addon-depends/snapcast-depends/libsodium/package.mk b/packages/addons/addon-depends/snapcast-depends/libsodium/package.mk index f6f43c2131..85b742b956 100644 --- a/packages/addons/addon-depends/snapcast-depends/libsodium/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/libsodium/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libsodium" -PKG_VERSION="e2bd4024008c73f1c0402e1c2f4db9a2300e9c95" # 1.0.18-stable 2022-09-24 -PKG_SHA256="b5035fcc061e410291baded4098a3ab56da90eb7d47d82ba2d0e05e3d105b8f6" +PKG_VERSION="1.0.20" +PKG_SHA256="ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19" PKG_LICENSE="ISC" PKG_SITE="https://libsodium.org/" -PKG_URL="https://github.com/jedisct1/libsodium/archive/${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/jedisct1/libsodium/releases/download/${PKG_VERSION}-RELEASE/libsodium-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A modern, portable, easy to use crypto library" diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk index bf506c9fe0..8842d52e13 100644 --- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="shairport-sync" -PKG_VERSION="4.2" -PKG_SHA256="649d95eede8b9284b2e8b9c97d18c1c64cffae0a6c75bc4f03e3ae494a3e25b6" +PKG_VERSION="4.3.7" +PKG_SHA256="a1242d100b61fe1fffbbf706e919ed51d6a341c9fb8293fb42046e32ae2b3338" PKG_LICENSE="OSS" PKG_SITE="https://github.com/mikebrady/shairport-sync" PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk index 8595a20a4f..2e29eadfd6 100644 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="snapcast" -PKG_VERSION="0.28.0" -PKG_SHA256="7911037dd4b06fe98166db1d49a7cd83ccf131210d5aaad47507bfa0cfc31407" +PKG_VERSION="8b7ac6986f2b37efba8087c05e35248649489d9e" +PKG_SHA256="e09760bcfd09ca25041dd1f259862493d7c97426183b9f42d72d0fa2835b8be3" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/badaix/snapcast" -PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/badaix/snapcast/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl pulseaudio boost opus" PKG_LONGDESC="Synchronous multi-room audio player." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk index 806c1d07ff..5e5cd2ad93 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk @@ -2,20 +2,32 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmtp" -PKG_VERSION="1.1.21" -PKG_SHA256="c4ffa5ab8c8f48c91b0047f2e253c101c418d5696a5ed65c839922a4280872a7" +PKG_VERSION="1.1.22" +PKG_SHA256="c3fcf411aea9cb9643590cbc9df99fa5fe30adcac695024442973d76fa5f87bc" PKG_LICENSE="GPL" PKG_SITE="http://libmtp.sourceforge.net/" PKG_URL="${SOURCEFORGE_SRC}/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain libusb" +PKG_DEPENDS_TARGET="toolchain libusb gettext" PKG_LONGDESC="An Initiator implementation of the Media Transfer Protocol (MTP)." PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-shared \ --enable-static \ + --enable-crossbuilddir \ --disable-mtpz" +pre_configure_target() { + # override mtp-hotplug with true as the built files are not used. + # the generated udev files are deleted is the post_makeinstall_target. + export HOST_MTP_HOTPLUG="/usr/bin/true" +} + post_configure_target() { libtool_remove_rpath libtool } + +post_makeinstall_target() { + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d + safe_remove ${INSTALL}/usr/lib/udev/rules.d +} diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-build-doc-and-examples.patch similarity index 66% rename from packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch rename to packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-build-doc-and-examples.patch index 3bb6db9653..1f2fbf9e23 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch +++ b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/patches/libmtp-0001-dont-build-doc-and-examples.patch @@ -7,28 +7,6 @@ diff -Naur a/Makefile.am b/Makefile.am ACLOCAL_AMFLAGS=-I m4 pkgconfigdir=$(libdir)/pkgconfig -@@ -11,21 +11,6 @@ - if USE_LINUX - udevrulesdir=@UDEV@/rules.d - hwdbdir=@UDEV@/hwdb.d --udevrules_DATA=@UDEV_RULES@ --hwdb_DATA=69-libmtp.hwdb --noinst_DATA=libmtp.usermap libmtp.fdi -- --libmtp.usermap: util/mtp-hotplug -- util/mtp-hotplug > libmtp.usermap -- --@UDEV_RULES@: util/mtp-hotplug -- util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@ -- --libmtp.fdi: util/mtp-hotplug -- util/mtp-hotplug -H > libmtp.fdi -- --$(hwdb_DATA): util/mtp-hotplug -- util/mtp-hotplug -w > $(hwdb_DATA) - - CLEANFILES = libmtp.usermap @UDEV_RULES@ libmtp.fdi libmtp.hwdb - endif diff -Naur a/Makefile.in b/Makefile.in --- a/Makefile.in 2016-02-10 12:17:34.000000000 -0800 +++ b/Makefile.in 2016-04-22 14:14:22.638794537 -0700 @@ -92,23 +70,3 @@ diff -Naur a/Makefile.in b/Makefile.in install-pdf install-pdf-am install-pkgconfigDATA install-ps \ install-ps-am install-strip install-udevrulesDATA installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ -@@ -944,19 +931,6 @@ - - .PRECIOUS: Makefile - -- --@USE_LINUX_TRUE@libmtp.usermap: util/mtp-hotplug --@USE_LINUX_TRUE@ util/mtp-hotplug > libmtp.usermap -- --@USE_LINUX_TRUE@@UDEV_RULES@: util/mtp-hotplug --@USE_LINUX_TRUE@ util/mtp-hotplug -u -p"@UDEV@" @UDEV_GROUP@ @UDEV_MODE@ > @UDEV_RULES@ -- --@USE_LINUX_TRUE@libmtp.fdi: util/mtp-hotplug --@USE_LINUX_TRUE@ util/mtp-hotplug -H > libmtp.fdi -- --@USE_LINUX_TRUE@$(hwdb_DATA): util/mtp-hotplug --@USE_LINUX_TRUE@ util/mtp-hotplug -w > $(hwdb_DATA) -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk index df40ed5d9e..a48e42cc1b 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libssh2" -PKG_VERSION="1.11.0" -PKG_SHA256="3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" +PKG_VERSION="1.11.1" +PKG_SHA256="d9ec76cbe34db98eec3539fe2c899d26b0c837cb3eb466a56b0f109cabf658f7" PKG_LICENSE="BSD" PKG_SITE="https://www.libssh2.org" PKG_URL="https://www.libssh2.org/download/libssh2-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk index d2b3725b6e..9810f94583 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="oniguruma" -PKG_VERSION="6.9.9" -PKG_SHA256="60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" +PKG_VERSION="6.9.10" +PKG_SHA256="2a5cfc5ae259e4e97f86b68dfffc152cdaffe94e2060b770cb827238d769fc05" PKG_LICENSE="BSD" PKG_SITE="https://github.com/kkos/oniguruma" PKG_URL="https://github.com/kkos/oniguruma/releases/download/v${PKG_VERSION}/onig-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk index 0717419456..36027c917f 100644 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk @@ -2,14 +2,13 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="diffutils" -PKG_VERSION="3.10" -PKG_SHA256="90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" +PKG_VERSION="3.11" +PKG_SHA256="a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/diffutils/" -PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A package of several programs related to finding differences between files." -PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch b/packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch deleted file mode 100644 index b922db7397..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-001-no-man-or-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- diffutils-3.5/Makefile.am.org 2017-05-24 18:54:09.404508347 +0200 -+++ diffutils-3.5/Makefile.am 2017-05-24 18:46:25.238456499 +0200 -@@ -19,7 +19,7 @@ - ALL_RECURSIVE_TARGETS = - - EXTRA_DIST = bootstrap exgettext ChangeLog-2008 cfg.mk dist-check.mk --SUBDIRS = lib src tests doc man po gnulib-tests -+SUBDIRS = lib src tests po gnulib-tests - - ACLOCAL_AMFLAGS = -I m4 - AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) diff --git a/packages/addons/addon-depends/system-tools-depends/dool/package.mk b/packages/addons/addon-depends/system-tools-depends/dool/package.mk index b9d673377d..e096f9549b 100644 --- a/packages/addons/addon-depends/system-tools-depends/dool/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dool/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dool" -PKG_VERSION="1.3.2" -PKG_SHA256="171afc1a43c82a592a3a07d48b62475aca22239dbe5c295d5903caadbe82ba51" +PKG_VERSION="1.3.4" +PKG_SHA256="286a5c4f5677ea04752f310360244b25d5e35cac8a2137144ba047276ed41f38" PKG_LICENSE="GPL-3.0-or-later" PKG_SITE="https://github.com/scottchiefbaker/dool" PKG_URL="https://github.com/scottchiefbaker/dool/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk index 4bdb8c8d74..ef982bfdd1 100644 --- a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dtach" -PKG_VERSION="0.9" -PKG_SHA256="5f7e8c835ee49a9e6dcf89f4e8ccbe724b061c0fc8565b504dd8b3e67ab79f82" +PKG_VERSION="b027c27b2439081064d07a86883c8e0b20a183c9" +PKG_SHA256="2ec8db52ed99700cf80258b52e77461068abf24a2798cb91f9c0b2bc6e6ee8f4" PKG_LICENSE="GPL" PKG_SITE="http://dtach.sourceforge.net" -PKG_URL="https://github.com/crigler/dtach/archive/v${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/crigler/dtach/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A program that emulates the detach feature of screen." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/encfs/package.mk b/packages/addons/addon-depends/system-tools-depends/encfs/package.mk index 538bf78ebc..c923a213c5 100644 --- a/packages/addons/addon-depends/system-tools-depends/encfs/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/encfs/package.mk @@ -7,11 +7,12 @@ PKG_SHA256="4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63" PKG_LICENSE="LGPL" PKG_SITE="https://vgough.github.io/encfs/" PKG_URL="https://github.com/vgough/encfs/releases/download/v${PKG_VERSION}/encfs-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain fuse openssl" +PKG_DEPENDS_TARGET="toolchain fuse openssl tinyxml2" PKG_LONGDESC="A Encrypted Filesystem for FUSE." PKG_BUILD_FLAGS="-sysroot" PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${SYSROOT_PREFIX}/usr/include \ -DBUILD_UNIT_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON" + -DCMAKE_SKIP_RPATH=ON \ + -DUSE_INTERNAL_TINYXML=OFF" diff --git a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk index 9a70cc1b7c..d3bda217d2 100644 --- a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fdupes" -PKG_VERSION="2.3.2" -PKG_SHA256="808d8decbe7fa41cab407ae4b7c14bfc27b8cb62227540c3dcb6caf980592ac7" +PKG_VERSION="2.4.0" +PKG_SHA256="527b27a39d031dcbe1d29a220b3423228c28366c2412887eb72c25473d7b1736" PKG_LICENSE="GPL" PKG_SITE="https://github.com/adrianlopezroche/fdupes" PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/v${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/file/package.mk b/packages/addons/addon-depends/system-tools-depends/file/package.mk index deffca9ce1..b9c0834625 100644 --- a/packages/addons/addon-depends/system-tools-depends/file/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/file/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="file" -PKG_VERSION="5.45" -PKG_SHA256="28c01a5ef1a127ef71758222ca019ba6c6bfa4a8fe20c2b525ce75943ee9da3c" +PKG_VERSION="5.46" +PKG_SHA256="908d74bd8751e35e65611788f58f8b6f5c6d487d437fbd2f845daf0e051818a1" PKG_LICENSE="BSD" PKG_SITE="http://www.darwinsys.com/file/" PKG_URL="https://github.com/file/file/archive/FILE${PKG_VERSION/./_}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-01_crosscompile.patch b/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-01_crosscompile.patch index 9843d7b94c..18a620d280 100644 --- a/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-01_crosscompile.patch +++ b/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-01_crosscompile.patch @@ -2,8 +2,8 @@ diff --git a/Makefile b/Makefile index f98abbd..9d1d524 100755 --- a/Makefile +++ b/Makefile -@@ -9,13 +9,13 @@ EXEC=hid_mapper - VERSION=1.0 +@@ -38,13 +38,13 @@ EXEC=hid_mapper + VERSION=2.1.0 all: $(OBJS) - g++ $(LDFLAGS) $(OBJS) -o $(EXEC) @@ -17,5 +17,5 @@ index f98abbd..9d1d524 100755 - gcc -c $(CFLAGS) $< + ${CC} -c $(CFLAGS) $< - deb: - cp $(EXEC) package/usr/bin + deb: all + rm -rf package/ diff --git a/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-02_Fix-key-code-reading.patch b/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-02_Fix-key-code-reading.patch new file mode 100644 index 0000000000..6fd657eef2 --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-02_Fix-key-code-reading.patch @@ -0,0 +1,160 @@ +From 79bd13b1a56746d3a848444b5d95bb1739e3c3e2 Mon Sep 17 00:00:00 2001 +From: Diomidis Spinellis +Date: Fri, 1 Nov 2019 22:32:17 +0200 +Subject: [PATCH 1/4] Include required header file for fd_set + +--- + hid.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hid.c b/hid.c +index 42829ee..cf07c9b 100644 +--- a/hid.c ++++ b/hid.c +@@ -17,6 +17,7 @@ + * Author: Thibault Kummer + */ + ++#include + #include + #include + #include + +From 53b4b1f8570510bd158676957469b2fa05088218 Mon Sep 17 00:00:00 2001 +From: Diomidis Spinellis +Date: Fri, 1 Nov 2019 22:37:12 +0200 +Subject: [PATCH 2/4] Fix clash with built-in log function + +--- + include/log.h | 4 ++-- + log.cpp | 12 ++++++------ + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/include/log.h b/include/log.h +index 39c58e4..3358e74 100644 +--- a/include/log.h ++++ b/include/log.h +@@ -33,8 +33,8 @@ typedef enum LogLevel { + + extern int currentLogLevel; + +-void log(LogLevel severity, const char* fmt, va_list args); +-//void log(LogLevel severity, const char* fmt, ...); ++void logmsg(LogLevel severity, const char* fmt, va_list args); ++//void logmsg(LogLevel severity, const char* fmt, ...); + + void info(const char* fmt, ...); + void warn(const char* fmt, ...); +diff --git a/log.cpp b/log.cpp +index 8325447..a834abc 100644 +--- a/log.cpp ++++ b/log.cpp +@@ -28,18 +28,18 @@ const char* headers[] = { + "ERRO", + }; + +-void log(LogLevel severity, const char* fmt, va_list args) { ++void logmsg(LogLevel severity, const char* fmt, va_list args) { + if (severity < currentLogLevel) { + vfprintf(stderr, fmt, args); + putc('\n', stderr); + } + } + +-void log(LogLevel severity, const char* fmt, ...) ++void logmsg(LogLevel severity, const char* fmt, ...) + { + va_list args; + va_start(args, fmt); +- log(severity, fmt, args); ++ logmsg(severity, fmt, args); + va_end(args); + + } +@@ -48,7 +48,7 @@ void info(const char* fmt, ...) + { + va_list args; + va_start(args, fmt); +- log(LOG_INFO, fmt, args); ++ logmsg(LOG_INFO, fmt, args); + va_end(args); + } + +@@ -56,7 +56,7 @@ void warn(const char* fmt, ...) + { + va_list args; + va_start(args, fmt); +- log(LOG_WARN, fmt, args); ++ logmsg(LOG_WARN, fmt, args); + va_end(args); + } + +@@ -64,7 +64,7 @@ void error(const char* fmt, ...) + { + va_list args; + va_start(args, fmt); +- log(LOG_ERROR, fmt, args); ++ logmsg(LOG_ERROR, fmt, args); + va_end(args); + } + + +From f6ca23e74bf493e379ca63b0be1a20ee3a21572d Mon Sep 17 00:00:00 2001 +From: Diomidis Spinellis +Date: Fri, 1 Nov 2019 22:38:07 +0200 +Subject: [PATCH 3/4] Add header required for strcmp + +--- + hid.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hid.c b/hid.c +index cf07c9b..563b548 100644 +--- a/hid.c ++++ b/hid.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #define SYSFS_HIDRAW_CLASS_PATH "/sys/class/hidraw" + + +From a38e46cf4907ef47b86bd039c430b2abd1af5712 Mon Sep 17 00:00:00 2001 +From: Diomidis Spinellis +Date: Fri, 1 Nov 2019 23:17:38 +0200 +Subject: [PATCH 4/4] Fix key code reading + +- Rewrite statement with undefined behavior +- Show unknown keys +--- + MapReader.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/MapReader.cpp b/MapReader.cpp +index aa86f32..02e9715 100644 +--- a/MapReader.cpp ++++ b/MapReader.cpp +@@ -105,8 +105,10 @@ void MapReader::LoadMap(const char *filename,EventMapping *map) + + i = 0; + +- while(i #include #include +#include + #include #define SYSFS_HIDRAW_CLASS_PATH "/sys/class/hidraw" - diff --git a/packages/addons/addon-depends/system-tools-depends/htop/package.mk b/packages/addons/addon-depends/system-tools-depends/htop/package.mk index 20e973d4c7..7222067f34 100644 --- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="htop" -PKG_VERSION="3.3.0" -PKG_SHA256="1e5cc328eee2bd1acff89f860e3179ea24b85df3ac483433f92a29977b14b045" +PKG_VERSION="3.4.1" +PKG_SHA256="af9ec878f831b7c27d33e775c668ec79d569aa781861c995a0fbadc1bdb666cf" PKG_LICENSE="GPL" PKG_SITE="https://hisham.hm/htop" PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/jq/package.mk b/packages/addons/addon-depends/system-tools-depends/jq/package.mk index afcfbeced7..18718ff860 100644 --- a/packages/addons/addon-depends/system-tools-depends/jq/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/jq/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="jq" -PKG_VERSION="1.7.1" -PKG_SHA256="478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2" +PKG_VERSION="1.8.1" +PKG_SHA256="2be64e7129cecb11d5906290eba10af694fb9e3e7f9fc208a311dc33ca837eb0" PKG_LICENSE="MIT" PKG_SITE="https://jqlang.github.io/jq/" PKG_URL="https://github.com/jqlang/jq/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/mc/package.mk b/packages/addons/addon-depends/system-tools-depends/mc/package.mk index a405897ac5..c868fa8c0a 100644 --- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mc" -PKG_VERSION="4.8.32" -PKG_SHA256="4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe" +PKG_VERSION="4.8.33" +PKG_SHA256="cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c" PKG_LICENSE="GPL" PKG_SITE="http://www.midnight-commander.org" PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk index 15eb9d5c4c..c12ee3f31d 100644 --- a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mtpfs" -PKG_VERSION="2bd9b5a33ad70a2238e086ffb07907f20a1e0101" -PKG_SHA256="732d5d450cfefd9df0e53ed6b188e1428298d8f81aaa8b5bf24ad31b9fddbe8f" +PKG_VERSION="1177d6cfd8916915f5db7d9b5c6fc9e6eafae6e6" +PKG_SHA256="ed8101e05d668ba7fa13517ab5d6e4cee1097cf68206ff1c84d13433ca4192a5" PKG_LICENSE="GPL" PKG_SITE="https://www.adebenham.com/mtpfs/" PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/patch/package.mk b/packages/addons/addon-depends/system-tools-depends/patch/package.mk index e06545a118..32922384ce 100644 --- a/packages/addons/addon-depends/system-tools-depends/patch/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/patch/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="patch" -PKG_VERSION="2.7.6" -PKG_SHA256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd" +PKG_VERSION="2.8" +PKG_SHA256="f87cee69eec2b4fcbf60a396b030ad6aa3415f192aa5f7ee84cad5e11f7f5ae3" PKG_LICENSE="GPL" -PKG_SITE="http://savannah.gnu.org/projects/patch/" -PKG_URL="http://ftpmirror.gnu.org/patch/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_SITE="https://savannah.gnu.org/projects/patch" +PKG_URL="https://ftpmirror.gnu.org/patch/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/pv/package.mk b/packages/addons/addon-depends/system-tools-depends/pv/package.mk index 249f8dfbfb..5f23242946 100644 --- a/packages/addons/addon-depends/system-tools-depends/pv/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/pv/package.mk @@ -2,13 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pv" -PKG_VERSION="1.8.14" -PKG_SHA256="0cc18811a4809a587d4b11d47691bbc0ad83a5d95d2c2606af74ea7b4a674756" +PKG_VERSION="1.9.34" +PKG_SHA256="c0626bed6cbef5006b53d3281e8e3ae4b2838729462b21eccf28140eefef6bb1" 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" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Pipe Viewer can be inserted into any normal pipeline between two processes." PKG_BUILD_FLAGS="-sysroot" - -PKG_CONFIGURE_OPTS_TARGET="--enable-static-nls" diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk index a439794abc..36cdcf95ad 100644 --- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="screen" -PKG_VERSION="5.0.0" -PKG_SHA256="f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971" +PKG_VERSION="5.0.1" +PKG_SHA256="2dae36f4db379ffcd14b691596ba6ec18ac3a9e22bc47ac239789ab58409869d" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/software/screen/" PKG_URL="https://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/st/package.mk b/packages/addons/addon-depends/system-tools-depends/st/package.mk index 9631d03066..c9f0f0264a 100644 --- a/packages/addons/addon-depends/system-tools-depends/st/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/st/package.mk @@ -12,8 +12,8 @@ PKG_DEPENDS_TARGET="toolchain libX11 libXft libXrender fontconfig freetype ncurs PKG_LONGDESC="A simple terminal implementation for X" PKG_BUILD_FLAGS="-sysroot" -PKG_MAKE_OPTS_TARGET="X11INC=$(get_build_dir libXft)/include \ - X11LIB=$(get_build_dir libXft)/.${TARGET_NAME}/src/.libs" +PKG_MAKE_OPTS_TARGET="X11INC=$(get_install_dir libXft)/usr/include \ + X11LIB=$(get_install_dir libXft)/usr/lib" pre_configure_target() { LDFLAGS="-lXrender ${LDFLAGS}" diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk index 9a46442a07..01fd13bb61 100644 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="stress-ng" -PKG_VERSION="0.18.04" -PKG_SHA256="c76cf067e582fb8a066d47207bbccc6d0d4175ba700b5d122909132d79e7f6ea" +PKG_VERSION="0.19.02" +PKG_SHA256="15a07030a14bbfd5991e9ba3fbfbc24ed3ae72a2c946b033c06b820bc16f41c4" 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" diff --git a/packages/addons/addon-depends/system-tools-depends/tmux/package.mk b/packages/addons/addon-depends/system-tools-depends/tmux/package.mk new file mode 100644 index 0000000000..f25283f345 --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/tmux/package.mk @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="tmux" +PKG_VERSION="3.5a" +PKG_SHA256="16216bd0877170dfcc64157085ba9013610b12b082548c7c9542cc0103198951" +PKG_LICENSE="ISC" +PKG_SITE="https://github.com/tmux/tmux/wiki" +PKG_URL="https://github.com/tmux/tmux/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain libevent ncurses" +PKG_LONGDESC="tmux is a terminal multiplexer" +PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/tree/package.mk b/packages/addons/addon-depends/system-tools-depends/tree/package.mk index 62fed640ab..f81da46b8c 100644 --- a/packages/addons/addon-depends/system-tools-depends/tree/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/tree/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tree" -PKG_VERSION="2.1.1" -PKG_SHA256="1b70253994dca48a59d6ed99390132f4d55c486bf0658468f8520e7e63666a06" +PKG_VERSION="2.2.1" +PKG_SHA256="5caddcbca805131ff590b126d3218019882e4ca10bc9eb490bba51c05b9b3b75" PKG_LICENSE="GPL" PKG_SITE="https://github.com/Old-Man-Programmer/tree" PKG_URL="https://github.com/Old-Man-Programmer/tree/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index 6821e6c6f9..6234be5db1 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="unrar" -PKG_VERSION="7.0.9" -PKG_SHA256="505c13f9e4c54c01546f2e29b2fcc2d7fabc856a060b81e5cdfe6012a9198326" +PKG_VERSION="7.1.9" +PKG_SHA256="cbb5c7b65b720e59ffa47b2d00b8d1022a961da7ae1db27b6986c43671719483" PKG_LICENSE="free" PKG_SITE="https://www.rarlab.com/rar_add.htm" PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk b/packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk index 7df7de822f..284a310a21 100644 --- a/packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="usb-modeswitch" -PKG_VERSION="2.6.1" -PKG_SHA256="5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34" +PKG_VERSION="2.6.2" +PKG_SHA256="f7abd337784a9d1bd39cb8a587518aff6f2a43d916145eafd80b1b8b7146db66" PKG_LICENSE="GPL" PKG_SITE="http://www.draisberghof.de/usb_modeswitch/" PKG_URL="http://www.draisberghof.de/usb_modeswitch/${PKG_NAME}-${PKG_VERSION}.tar.bz2" diff --git a/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk b/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk index eafacf0633..50d667340d 100644 --- a/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk +++ b/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="miniupnpc" -PKG_VERSION="2.2.7" -PKG_SHA256="b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1" +PKG_VERSION="2.3.3" +PKG_SHA256="d52a0afa614ad6c088cc9ddff1ae7d29c8c595ac5fdd321170a05f41e634bd1a" PKG_LICENSE="BSD" PKG_SITE="http://miniupnp.free.fr" PKG_URL="http://miniupnp.free.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/tntnet/package.mk b/packages/addons/addon-depends/tntnet/package.mk index 5b94fceb0a..013a8040c7 100644 --- a/packages/addons/addon-depends/tntnet/package.mk +++ b/packages/addons/addon-depends/tntnet/package.mk @@ -13,21 +13,15 @@ PKG_DEPENDS_TARGET="toolchain tntnet:host libtool cxxtools zlib" PKG_LONGDESC="A web application server for C++." PKG_CONFIGURE_OPTS_HOST="--disable-unittest \ - --with-server=no \ - --with-sdk=yes \ - --with-demos=no \ - --with-epoll=yes \ - --with-ssl=no \ - --with-stressjob=no" + --disable-server \ + --enable-sdk \ + --disable-demos" PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \ --with-sysroot=${SYSROOT_PREFIX} \ - --with-server=no \ - --with-sdk=no \ - --with-demos=no \ - --with-epoll=yes \ - --with-ssl=no \ - --with-stressjob=no" + --disable-server \ + --disable-sdk \ + --disable-demos" post_configure_target() { libtool_remove_rpath libtool diff --git a/packages/addons/addon-depends/tslib/package.mk b/packages/addons/addon-depends/tslib/package.mk deleted file mode 100644 index 36f74ff91c..0000000000 --- a/packages/addons/addon-depends/tslib/package.mk +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="tslib" -PKG_VERSION="1.1" -PKG_SHA256="fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/kergoth/tslib" -PKG_URL="https://github.com/kergoth/tslib/releases/download/1.1/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain evtest" -PKG_LONGDESC="Touchscreen access library with ts_uinput_touch daemon." -PKG_TOOLCHAIN="autotools" - -TSLIB_MODULES_ENABLED="linear dejitter variance pthres ucb1x00 tatung input galax dmc touchkit st1232 waveshare" -TSLIB_MODULES_DISABLED="arctic2 corgi collie h3600 linear_h2200 mk712 cy8mrln_palmpre" -TSLIB_BUILD_STATIC="yes" # no .so files (easy to manage) - -pre_configure_target() { - local OPTS_MODULES="" - - if [ "${TSLIB_BUILD_STATIC}" = "yes" ]; then - OPTS_MODULES="--enable-static --disable-shared" - for module in ${TSLIB_MODULES_ENABLED}; do - OPTS_MODULES+=" --enable-${module}=static" - done - fi - - for module in ${TSLIB_MODULES_DISABLED}; do - OPTS_MODULES+=" --disable-${module}" - done - - PKG_CONFIGURE_OPTS_TARGET="${OPTS_MODULES} \ - --sysconfdir=/storage/.kodi/userdata/addon_data/service.touchscreen" -} - -post_makeinstall_target() { - rm -fr ${INSTALL}/etc - rm -fr ${INSTALL}/storage - - debug_strip ${INSTALL}/usr/bin -} diff --git a/packages/addons/addon-depends/tslib/patches/tslib-02-add-additional-eGalax-touchscreens.patch b/packages/addons/addon-depends/tslib/patches/tslib-02-add-additional-eGalax-touchscreens.patch deleted file mode 100644 index b2c78d061a..0000000000 --- a/packages/addons/addon-depends/tslib/patches/tslib-02-add-additional-eGalax-touchscreens.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f60540a1e0c120dfb6a7452470b3e56bee91c7d7 Mon Sep 17 00:00:00 2001 -From: Dirk Gerdes -Date: Mon, 22 Dec 2014 11:07:13 +0100 -Subject: [PATCH] Added support for additional model of eGalax Touchscreen - ---- - plugins/galax-raw.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/plugins/galax-raw.c b/plugins/galax-raw.c -index c8689e2..6cacc56 100644 ---- a/plugins/galax-raw.c -+++ b/plugins/galax-raw.c -@@ -93,8 +93,9 @@ static int ts_galax_check_fd (struct tslib_galax *i) - - if ((ioctl(ts->fd, EVIOCGID, &infos) < 0)) { - fprintf (stderr, "tslib: warning, can not read device identifier\n"); -- } else if (infos.bustype != 3 || infos.vendor != 0x0EEF || infos.product != 0x0001) { -- fprintf (stderr, "tslib: this is not an eGalax touchscreen (3,0x0EEF,1,0x0112)\n" -+ } else if (infos.bustype != 3 || infos.vendor != 0x0EEF -+ || (infos.product != 0x0001 && infos.product != 0x7200 && infos.product != 0x7201 && infos.product != 0xC000)) { -+ fprintf (stderr, "tslib: this is not an eGalax touchscreen (3,0x0EEF,1/7200/7201/C000,0x0112)\n" - "Your device: bus=%d, vendor=0x%X, product=0x%X, version=0x%X\n",infos.bustype, infos.vendor, infos.product, infos.version); - return -1; - } diff --git a/packages/addons/addon-depends/tslib/patches/tslib-06-linear-print-coordinates.patch b/packages/addons/addon-depends/tslib/patches/tslib-06-linear-print-coordinates.patch deleted file mode 100644 index bdda5856e1..0000000000 --- a/packages/addons/addon-depends/tslib/patches/tslib-06-linear-print-coordinates.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -aurN a/plugins/linear.c b/plugins/linear.c ---- a/plugins/linear.c 2013-08-08 02:23:04.000000000 +0200 -+++ b/plugins/linear.c 2015-09-04 20:21:50.376205701 +0200 -@@ -187,11 +187,11 @@ - for (index = 0; index < 7; index++) - if (fscanf(pcal_fd, "%d", &lin->a[index]) != 1) break; - fscanf(pcal_fd, "%d %d", &lin->cal_res_x, &lin->cal_res_y); --#ifdef DEBUG -+/*#ifdef DEBUG*/ - printf("Linear calibration constants: "); - for(index=0;index<7;index++) printf("%d ",lin->a[index]); - printf("\n"); --#endif /*DEBUG*/ -+/*#endif*/ /*DEBUG*/ - fclose(pcal_fd); - } - diff --git a/packages/addons/addon-depends/tslib/patches/tslib-10-ts_uinput_touch-daemon.patch b/packages/addons/addon-depends/tslib/patches/tslib-10-ts_uinput_touch-daemon.patch deleted file mode 100644 index 21b586e5ae..0000000000 --- a/packages/addons/addon-depends/tslib/patches/tslib-10-ts_uinput_touch-daemon.patch +++ /dev/null @@ -1,2411 +0,0 @@ -From 2ae91258548c3682ad5df16ee22bdf28d9769bfe Mon Sep 17 00:00:00 2001 -From: vpeter4 -Date: Mon, 29 Jun 2015 17:08:17 +0200 -Subject: [PATCH 01/11] ts_uinput_touch: daemon translates tslib events to - uinput - -On one side it gets events from touchscreen using tslib library. On the other end it creates one new virtual device using uinput kernel module that allows to handle the input subsystem from user land. Inside application data from tslib is translated to uinput events. For now only ABS_X, ABS_Y, ABS_PRESSURE and BTN_TOUCH. It behaves in a similar way than touchpad. Short tap sends button press event and long slide sends only xy coordinates. Currently using it in OpenELEC distribution and Kodi application. - -I think something like this was proposed in TODO. - -Also ST1232 raw input plugin is included for "st1232-touchscreen" (found on 7" display for Udoo board with i.MX6 SoC). ---- - configure.ac | 1 + - plugins/Makefile.am | 13 +- - plugins/plugins.h | 1 + - plugins/st1232-raw.c | 303 +++++++++++++++++++++++ - src/Makefile.am | 4 + - src/ts_load_module.c | 3 + - tests/Makefile.am | 5 +- - tests/testutils.c | 7 + - tests/ts_calibrate.c | 4 + - tests/ts_uinput_touch.c | 624 ++++++++++++++++++++++++++++++++++++++++++++++++ - 10 files changed, 963 insertions(+), 2 deletions(-) - create mode 100644 plugins/st1232-raw.c - create mode 100644 tests/ts_uinput_touch.c - -diff --git a/configure.ac b/configure.ac -index dfdf269..6984002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,6 +69,7 @@ TSLIB_CHECK_MODULE([dmc], [yes], [Enable building of dmc raw module (HP iPaq DMC - TSLIB_CHECK_MODULE([input], [yes], [Enable building of generic input raw module (Linux /dev/input/eventN support)]) - TSLIB_CHECK_MODULE([touchkit], [yes], [Enable building of serial TouchKit raw module (Linux /dev/ttySX support)]) - TSLIB_CHECK_MODULE([galax], [yes], [Enable building of HID USB eGalax raw module (Linux /dev/hiddevN support)]) -+TSLIB_CHECK_MODULE([st1232], [yes], [Enable building of ST1232 raw module (Linux /dev/input/eventN support)]) - - - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index e938e17..e8e89e0 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -121,6 +121,12 @@ else - CY8MRLN_PALMPRE_MODULE = - endif - -+if ENABLE_ST1232_MODULE -+ST1232_MODULE = st1232.la -+else -+ST1232_MODULE = -+endif -+ - pluginexec_LTLIBRARIES = \ - $(LINEAR_MODULE) \ - $(DEJITTER_MODULE) \ -@@ -138,7 +144,8 @@ pluginexec_LTLIBRARIES = \ - $(INPUT_MODULE) \ - $(GALAX_MODULE) \ - $(TOUCHKIT_MODULE) \ -- $(CY8MRLN_PALMPRE_MODULE) -+ $(CY8MRLN_PALMPRE_MODULE) \ -+ $(ST1232_MODULE) - - variance_la_SOURCES = variance.c - variance_la_LDFLAGS = -module $(LTVSN) -@@ -197,3 +204,7 @@ linear_h2200_la_LDFLAGS = -module $(LTVSN) - - cy8mrln_palmpre_la_SOURCES = cy8mrln-palmpre.c - cy8mrln_palmpre_la_LDFLAGS = -module $(LTVSN) -+ -+st1232_la_SOURCES = st1232-raw.c -+st1232_la_LDFLAGS = -module $(LTVSN) -+st1232_la_LIBADD = $(top_builddir)/src/libts.la -diff --git a/plugins/plugins.h b/plugins/plugins.h -index 873aba5..d78877e 100644 ---- a/plugins/plugins.h -+++ b/plugins/plugins.h -@@ -16,3 +16,4 @@ TSLIB_DECLARE_MODULE(arctic2); - TSLIB_DECLARE_MODULE(tatung); - TSLIB_DECLARE_MODULE(input); - TSLIB_DECLARE_MODULE(cy8mrln_palmpre); -+TSLIB_DECLARE_MODULE(st1232); -diff --git a/plugins/st1232-raw.c b/plugins/st1232-raw.c -new file mode 100644 -index 0000000..f05d21d ---- /dev/null -+++ b/plugins/st1232-raw.c -@@ -0,0 +1,303 @@ -+/* -+ * tslib/plugins/st1232-raw.c -+ * -+ * based on input-raw.c -+ * 2015.06 Peter Vicman -+ * -+ * Original version: -+ * Copyright (C) 2001 Russell King. -+ * -+ * Rewritten for the Linux input device API: -+ * Copyright (C) 2002 Nicolas Pitre -+ * -+ * This file is placed under the LGPL. Please see the file -+ * COPYING for more details. -+ * -+ * -+ * Plugin for "st1232-touchscreen" (found on 7" display for Udoo board with i.MX6 SoC) -+ * -+ * Read raw x, y, and timestamp from a touchscreen device. -+ * Only first mt report is taken and send upstream. -+ * ST1232 driver doesn't report ABS_X/Y events - only MT - and -+ * doesn't report BTN_TOUCH event. -+ * -+ * In memory of my mom and dad ... -+ */ -+#include "config.h" -+ -+#include -+#include -+#include -+ -+#include -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+#include -+#include -+ -+#include -+#ifndef EV_SYN /* 2.4 kernel headers */ -+# define EV_SYN 0x00 -+#endif -+#ifndef EV_CNT -+# define EV_CNT (EV_MAX+1) -+#endif -+#ifndef ABS_CNT -+# define ABS_CNT (ABS_MAX+1) -+#endif -+#ifndef KEY_CNT -+# define KEY_CNT (KEY_MAX+1) -+#endif -+ -+#ifndef ABS_MT_POSITION_X -+# define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */ -+# define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */ -+#endif -+ -+#define SYN_MT_REPORT 2 -+ -+#include "tslib-private.h" -+ -+#define GRAB_EVENTS_WANTED 1 -+#define GRAB_EVENTS_ACTIVE 2 -+ -+struct tslib_input { -+ struct tslib_module_info module; -+ -+ int current_x; -+ int current_y; -+ int current_p; -+ -+ int sane_fd; -+ int using_syn; -+ int grab_events; -+ int invert_y; -+}; -+ -+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) -+#define BIT(nr) (1UL << (nr)) -+#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) -+#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) -+#define BITS_PER_BYTE 8 -+#define BITS_PER_LONG (sizeof(long) * BITS_PER_BYTE) -+#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) -+ -+static int check_fd(struct tslib_input *i) -+{ -+ struct tsdev *ts = i->module.dev; -+ int version; -+ long evbit[BITS_TO_LONGS(EV_CNT)]; -+ long absbit[BITS_TO_LONGS(ABS_CNT)]; -+ -+ if (ioctl(ts->fd, EVIOCGVERSION, &version) < 0) { -+ fprintf(stderr, "tslib: Selected device is not a Linux input event device\n"); -+ return -1; -+ } -+ -+ if (version < EV_VERSION) { -+ fprintf(stderr, "tslib: Selected device uses a different version of the event protocol than tslib was compiled for\n"); -+ return -1; -+ } -+ -+ if ( (ioctl(ts->fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) || -+ !(evbit[BIT_WORD(EV_ABS)] & BIT_MASK(EV_ABS)) || -+ !(evbit[BIT_WORD(EV_KEY)] & BIT_MASK(EV_KEY)) ) { -+ fprintf(stderr, "tslib: Selected device is not a touchscreen (must support ABS and KEY event types)\n"); -+ return -1; -+ } -+ -+ if ((ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit)) < 0 || -+ !(absbit[BIT_WORD(ABS_MT_POSITION_X)] & BIT_MASK(ABS_MT_POSITION_X)) || -+ !(absbit[BIT_WORD(ABS_MT_POSITION_Y)] & BIT_MASK(ABS_MT_POSITION_Y))) { -+ fprintf(stderr, "tslib: Selected device is not a touchscreen (must support ABS_MT_POSITION_X and ABS_MT_POSITION_Y events)\n"); -+ return -1; -+ } -+ -+ if (evbit[BIT_WORD(EV_SYN)] & BIT_MASK(EV_SYN)) -+ i->using_syn = 1; -+ -+ if (i->grab_events == GRAB_EVENTS_WANTED) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) { -+ fprintf(stderr, "tslib: Unable to grab selected input device\n"); -+ return -1; -+ } -+ i->grab_events = GRAB_EVENTS_ACTIVE; -+ } -+ -+ return 0; -+} -+ -+static int ts_st1232_read(struct tslib_module_info *inf, -+ struct ts_sample *samp, int nr) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ struct tsdev *ts = inf->dev; -+ struct input_event ev; -+ int ret = nr; -+ int total = 0; -+ int mt_cnt = 0; /* data for first finger */ -+ -+ if (i->sane_fd == -1) -+ i->sane_fd = check_fd(i); -+ -+ if (i->sane_fd == -1) -+ return 0; -+ -+ if (i->using_syn) { -+ while (total < nr) { -+ ret = read(ts->fd, &ev, sizeof(struct input_event)); -+ if (ret < (int) sizeof(struct input_event)) { -+ total = -1; -+ break; -+ } -+ -+ switch (ev.type) { -+ case EV_SYN: -+ if (ev.code == SYN_MT_REPORT) { -+ mt_cnt++; /* data for next finger will come */ -+ } else if (ev.code == SYN_REPORT) { -+ /* fill out a new complete event */ -+ /* always send coordinate (last one on finger released) */ -+ samp->x = i->current_x; -+ samp->y = i->current_y; -+ samp->pressure = i->current_p; /* is 0 on finger released */ -+ samp->tv = ev.time; -+ -+ i->current_p = 0; /* will be set again when getting xy cordinate */ -+ samp++; -+ total++; -+ mt_cnt = 0; -+ } -+ break; -+ case EV_ABS: -+ if (mt_cnt > 0) -+ break; /* save data only for first finger */ -+ -+ switch (ev.code) { -+ case ABS_MT_POSITION_X: -+ i->current_x = ev.value; -+ i->current_p = 255; /* touched */ -+ break; -+ case ABS_MT_POSITION_Y: -+ i->current_y = ev.value; -+ i->current_p = 255; /* touched */ -+ -+ if (i->invert_y > 0) -+ i->current_y = i->invert_y - i->current_y; -+ break; -+ } -+ break; -+ } -+ } -+ -+ ret = total; -+ } else { -+ fprintf(stderr, "tslib: st1232 and not using syn\n"); -+ sleep(1); -+ } -+ -+ return ret; -+} -+ -+static int ts_st1232_fini(struct tslib_module_info *inf) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ struct tsdev *ts = inf->dev; -+ -+ if (i->grab_events == GRAB_EVENTS_ACTIVE) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) { -+ fprintf(stderr, "tslib: Unable to un-grab selected input device\n"); -+ } -+ } -+ -+ free(inf); -+ return 0; -+} -+ -+static const struct tslib_ops __ts_st1232_ops = { -+ .read = ts_st1232_read, -+ .fini = ts_st1232_fini, -+}; -+ -+static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ unsigned long v; -+ int err = errno; -+ -+ v = strtoul(str, NULL, 0); -+ -+ if (v == ULONG_MAX && errno == ERANGE) -+ return -1; -+ -+ errno = err; -+ switch ((int)data) { -+ case 1: -+ if (v) -+ i->grab_events = GRAB_EVENTS_WANTED; -+ break; -+ default: -+ return -1; -+ } -+ return 0; -+} -+ -+static int parse_invert_y(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ int v; -+ int err = errno; -+ -+ v = atoi(str); -+ -+ if (v < 0) -+ return -1; -+ -+ errno = err; -+ switch ((int)data) { -+ case 1: -+ i->invert_y = v; -+ break; -+ default: -+ return -1; -+ } -+ return 0; -+} -+ -+static const struct tslib_vars raw_vars[] = -+{ -+ { "grab_events", (void *)1, parse_raw_grab }, -+ { "invert_y", (void *)1, parse_invert_y }, -+}; -+ -+#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0])) -+ -+TSAPI struct tslib_module_info *st1232_mod_init(struct tsdev *dev, const char *params) -+{ -+ struct tslib_input *i; -+ -+ i = malloc(sizeof(struct tslib_input)); -+ if (i == NULL) -+ return NULL; -+ -+ i->module.ops = &__ts_st1232_ops; -+ i->current_x = 0; -+ i->current_y = 0; -+ i->current_p = 0; -+ i->sane_fd = -1; -+ i->using_syn = 0; -+ i->grab_events = 0; -+ i->invert_y = 0; -+ -+ if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { -+ free(i); -+ return NULL; -+ } -+ -+ return &(i->module); -+} -+ -+#ifndef TSLIB_STATIC_ST1232_MODULE -+ TSLIB_MODULE_INIT(st1232_mod_init); -+#endif -diff --git a/src/Makefile.am b/src/Makefile.am -index 5278d82..b561aa8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -71,6 +71,10 @@ if ENABLE_STATIC_INPUT_MODULE - libts_la_SOURCES += $(top_srcdir)/plugins/input-raw.c - endif - -+if ENABLE_STATIC_ST1232_MODULE -+libts_la_SOURCES += $(top_srcdir)/plugins/st1232-raw.c -+endif -+ - libts_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -export-dynamic - libts_la_LIBADD = -ldl -diff --git a/src/ts_load_module.c b/src/ts_load_module.c -index 00486be..886ca0a 100644 ---- a/src/ts_load_module.c -+++ b/src/ts_load_module.c -@@ -73,6 +73,9 @@ static const struct { - #ifdef TSLIB_STATIC_VARIANCE_MODULE - { "variance", variance_mod_init }, - #endif -+#ifdef TSLIB_STATIC_ST1232_MODULE -+ { "st1232", st1232_mod_init }, -+#endif - }; - - #define countof(arr) (sizeof(arr) / sizeof((arr)[0])) -diff --git a/tests/Makefile.am b/tests/Makefile.am -index b76522d..2e80c18 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -11,7 +11,7 @@ - AM_CFLAGS = -DTS_POINTERCAL=\"@TS_POINTERCAL@\" $(DEBUGFLAGS) - INCLUDES = -I$(top_srcdir)/src - --bin_PROGRAMS = ts_test ts_calibrate ts_print ts_print_raw ts_harvest -+bin_PROGRAMS = ts_test ts_calibrate ts_print ts_print_raw ts_harvest ts_uinput_touch - - ts_test_SOURCES = ts_test.c fbutils.c fbutils.h font_8x8.c font_8x16.c font.h - ts_test_LDADD = $(top_builddir)/src/libts.la -@@ -27,3 +27,6 @@ ts_calibrate_LDADD = $(top_builddir)/src/libts.la - - ts_harvest_SOURCES = ts_harvest.c fbutils.c fbutils.h testutils.c testutils.h font_8x8.c font_8x16.c font.h - ts_harvest_LDADD = $(top_builddir)/src/libts.la -+ -+ts_uinput_touch_SOURCES = ts_uinput_touch.c testutils.c testutils.h -+ts_uinput_touch_LDADD = $(top_builddir)/src/libts.la -diff --git a/tests/testutils.c b/tests/testutils.c -index dbd5b41..bc3756f 100644 ---- a/tests/testutils.c -+++ b/tests/testutils.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include "tslib.h" - #include "fbutils.h" -@@ -37,6 +38,9 @@ void getxy(struct tsdev *ts, int *x, int *y) - - do { - if (ts_read_raw(ts, &samp[0], 1) < 0) { -+ if (errno == EINTR) -+ return; -+ - perror("ts_read"); - close_framebuffer (); - exit(1); -@@ -50,6 +54,9 @@ void getxy(struct tsdev *ts, int *x, int *y) - if (index < MAX_SAMPLES-1) - index++; - if (ts_read_raw(ts, &samp[index], 1) < 0) { -+ if (errno == EINTR) -+ return; -+ - perror("ts_read"); - close_framebuffer (); - exit(1); -diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c -index eb0aca3..522fa7c 100644 ---- a/tests/ts_calibrate.c -+++ b/tests/ts_calibrate.c -@@ -237,12 +237,16 @@ int main() - - get_sample (ts, &cal, 0, 50, 50, "Top left"); - clearbuf(ts); -+ usleep(500000); - get_sample (ts, &cal, 1, xres - 50, 50, "Top right"); - clearbuf(ts); -+ usleep(500000); - get_sample (ts, &cal, 2, xres - 50, yres - 50, "Bot right"); - clearbuf(ts); -+ usleep(500000); - get_sample (ts, &cal, 3, 50, yres - 50, "Bot left"); - clearbuf(ts); -+ usleep(500000); - get_sample (ts, &cal, 4, xres / 2, yres / 2, "Center"); - - if (perform_calibration (&cal)) { -diff --git a/tests/ts_uinput_touch.c b/tests/ts_uinput_touch.c -new file mode 100644 -index 0000000..60efc46 ---- /dev/null -+++ b/tests/ts_uinput_touch.c -@@ -0,0 +1,624 @@ -+/* -+ * tslib/src/ts_uinput_touch.c -+ * -+ * Copyright (C) 2001 Russell King. -+ * Copyright (C) 2015 Peter Vicman. -+ * -+ * This file is placed under the GPL. Please see the file -+ * COPYING for more details. -+ * -+ * -+ * Takes tslib events and send them to uinput as -+ * BTN_TOUCH, ABS_X, ABS_Y and ABS_PRESSURE values. -+ * Short tap send button event and longer tap send only coordinates. -+ * Tested only with Kodi application. -+ * -+ * code based on -+ * tslib/src/ts_test.c -+ * tslib/src/ts_calibrate.c -+ * http://thiemonge.org/getting-started-with-uinput -+ * http://lkcl.net/software/uinput/ -+ * -+ * In memory of my mom and dad ... -+ */ -+ -+#include "config.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "tslib.h" -+#include "testutils.h" -+ -+#define die(str, args...) do { \ -+ perror(str); \ -+ exit(EXIT_FAILURE); \ -+ } while(0); -+ -+#define SET_ABS_MINMAX(dev, arg, min, max) do { \ -+ (dev).absmin[arg] = min; \ -+ (dev).absmax[arg] = max; \ -+ } while(0); -+ -+#define CANCEL_CALIBRATION if (! calibration_mode) return; else {} -+ -+#define SOCK_PATH "/tmp/ts_calibrate.socket" -+ -+#define CROSSHAIR_STR1 "Top left" -+#define CROSSHAIR_STR2 "Top right" -+#define CROSSHAIR_STR3 "Bottom right" -+#define CROSSHAIR_STR4 "Bottom left" -+#define CROSSHAIR_STR5 "Center" -+ -+typedef struct { -+ int x[5], xfb[5]; -+ int y[5], yfb[5]; -+ int a[7]; -+} calibration; -+ -+char *uinput_names[] = {"/dev/uinput", "/dev/input/uinput", "/dev/misc/uinput"}; -+#define UINPUT_NAMES_NUM ((int) (sizeof(uinput_names)/sizeof(char *))) -+ -+__u32 xres = 0, yres = 0; -+struct timeval tv_short_tap = {0, 300}; /* sec, msec */ -+bool calibration_mode = false; -+int sock = -1; -+ -+static void daemonize() { -+ pid_t pid; -+ -+ pid = fork(); -+ if (pid == -1) { -+ die("failed to fork while daemonising (errno=%d)", errno) -+ } else if (pid != 0) { -+ exit(0); -+ } -+ -+ umask(0); -+ -+ if (setsid() == -1) { -+ die("failed to become a session leader while daemonising(errno=%d)", errno) -+ } -+ -+ signal(SIGHUP,SIG_IGN); -+ pid=fork(); -+ if (pid == -1) { -+ die("failed to fork while daemonizing (errno=%d)", errno) -+ } else if (pid != 0) { -+ exit(0); -+ } -+ -+ if (chdir("/") == -1) { -+ die("failed to change working directory while daemonizing (errno=%d)", errno) -+ } -+ -+ umask(0); -+ close(STDIN_FILENO); -+ close(STDOUT_FILENO); -+ close(STDERR_FILENO); -+ -+ if (open("/dev/null", O_RDONLY) == -1) { -+ die("failed to reopen stdin while daemonizing (errno=%d)", errno) -+ } -+ -+ if (open("/dev/null", O_WRONLY) == -1) { -+ die("failed to reopen stdout while daemonizing (errno=%d)", errno) -+ } -+ -+ if (open("/dev/null", O_RDWR) == -1) { -+ die("failed to reopen stderr while daemonizing (errno=%d)", errno) -+ } -+} -+ -+static void sig(int sig) -+{ -+ fflush(stderr); -+ printf("signal %d caught\n", sig); -+ fflush(stdout); -+ exit(1); -+} -+ -+static void set_ioctl(int fd, unsigned int cmd, __u16 value) -+{ -+ if (ioctl(fd, cmd, value) < 0) -+ die("error: ioctl") -+} -+ -+static int send_event(int fd, __u16 type, __u16 code, __s32 value) -+{ -+ struct input_event event; -+ int ret; -+ -+ memset(&event, 0, sizeof(event)); -+ event.type = type; -+ event.code = code; -+ event.value = value; -+ -+ ret = write(fd, &event, sizeof(event)); -+ if (ret != sizeof(event)) { -+ fprintf(stderr, "Error on send_event"); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static void signal_handler(int signal_number) { -+ if (signal_number == SIGUSR1) -+ calibration_mode = true; -+ else if (signal_number == SIGUSR2) -+ calibration_mode = false; -+ else -+ return; -+ -+ printf("signal handler %d, current calibration_mode=%d\n", signal_number, calibration_mode == true ? 1 : 0); -+ if (calibration_mode) { -+ tv_short_tap.tv_sec += 600; /* little more time */ -+ } else { -+ tv_short_tap.tv_sec -= 600; -+ } -+} -+ -+static int perform_calibration(calibration *cal) { -+ int j; -+ float n, x, y, x2, y2, xy, z, zx, zy; -+ float det, a, b, c, e, f, i; -+ float scaling = 65536.0; -+ -+// Get sums for matrix -+ n = x = y = x2 = y2 = xy = 0; -+ for(j=0;j<5;j++) { -+ n += 1.0; -+ x += (float)cal->x[j]; -+ y += (float)cal->y[j]; -+ x2 += (float)(cal->x[j]*cal->x[j]); -+ y2 += (float)(cal->y[j]*cal->y[j]); -+ xy += (float)(cal->x[j]*cal->y[j]); -+ } -+ -+// Get determinant of matrix -- check if determinant is too small -+ det = n*(x2*y2 - xy*xy) + x*(xy*y - x*y2) + y*(x*xy - y*x2); -+ if(det < 0.1 && det > -0.1) { -+ printf("ts_calibrate: determinant is too small -- %f\n",det); -+ return 0; -+ } -+ -+// Get elements of inverse matrix -+ a = (x2*y2 - xy*xy)/det; -+ b = (xy*y - x*y2)/det; -+ c = (x*xy - y*x2)/det; -+ e = (n*y2 - y*y)/det; -+ f = (x*y - n*xy)/det; -+ i = (n*x2 - x*x)/det; -+ -+// Get sums for x calibration -+ z = zx = zy = 0; -+ for(j=0;j<5;j++) { -+ z += (float)cal->xfb[j]; -+ zx += (float)(cal->xfb[j]*cal->x[j]); -+ zy += (float)(cal->xfb[j]*cal->y[j]); -+ } -+ -+// Now multiply out to get the calibration for framebuffer x coord -+ cal->a[0] = (int)((a*z + b*zx + c*zy)*(scaling)); -+ cal->a[1] = (int)((b*z + e*zx + f*zy)*(scaling)); -+ cal->a[2] = (int)((c*z + f*zx + i*zy)*(scaling)); -+ -+ printf("%f %f %f\n",(a*z + b*zx + c*zy), -+ (b*z + e*zx + f*zy), -+ (c*z + f*zx + i*zy)); -+ -+// Get sums for y calibration -+ z = zx = zy = 0; -+ for(j=0;j<5;j++) { -+ z += (float)cal->yfb[j]; -+ zx += (float)(cal->yfb[j]*cal->x[j]); -+ zy += (float)(cal->yfb[j]*cal->y[j]); -+ } -+ -+// Now multiply out to get the calibration for framebuffer y coord -+ cal->a[3] = (int)((a*z + b*zx + c*zy)*(scaling)); -+ cal->a[4] = (int)((b*z + e*zx + f*zy)*(scaling)); -+ cal->a[5] = (int)((c*z + f*zx + i*zy)*(scaling)); -+ -+ printf("%f %f %f\n",(a*z + b*zx + c*zy), -+ (b*z + e*zx + f*zy), -+ (c*z + f*zx + i*zy)); -+ -+// If we got here, we're OK, so assign scaling to a[6] and return -+ cal->a[6] = (int)scaling; -+ return 1; -+/* -+// This code was here originally to just insert default values -+ for(j=0;j<7;j++) { -+ c->a[j]=0; -+ } -+ c->a[1] = c->a[5] = c->a[6] = 1; -+ return 1; -+*/ -+} -+ -+static void get_sample(struct tsdev *ts, calibration *cal, -+ int index, int x, int y, char *name) -+{ -+ printf("getting sample for: %s\n", name); -+ getxy(ts, &cal->x[index], &cal->y[index]); -+ cal->xfb[index] = x; -+ cal->yfb[index] = y; -+ printf("%s: X = %4d Y = %4d\n", name, cal->x[index], cal->y[index]); -+} -+ -+static void clearbuf(struct tsdev *ts) -+{ -+ int fd = ts_fd(ts); -+ fd_set fdset; -+ struct timeval tv; -+ int nfds; -+ struct ts_sample sample; -+ -+ while (1) { -+ FD_ZERO(&fdset); -+ FD_SET(fd, &fdset); -+ -+ tv.tv_sec = 0; -+ tv.tv_usec = 0; -+ -+ nfds = select(fd + 1, &fdset, NULL, NULL, &tv); -+ if (nfds == 0) break; -+ -+ if (ts_read_raw(ts, &sample, 1) < 0) { -+ perror("ts_read"); -+ exit(1); -+ } -+ } -+} -+ -+/* we don't use fb but this function is called in case of an error */ -+void close_framebuffer(void) {} -+ -+static void send_socket_crosshair_str(char *str) -+{ -+ if (send(sock, str, strlen(str), 0) == -1) { -+ printf("send error\n"); -+ } -+} -+ -+static void run_calibration(struct tsdev *ts) -+{ -+ calibration cal; -+ int cal_fd; -+ char cal_buffer[256]; -+ char *calfile; -+ unsigned int i, len; -+ -+ send_socket_crosshair_str(CROSSHAIR_STR1); /* show first touch point */ -+ clearbuf(ts); -+ get_sample(ts, &cal, 0, 50, 50, CROSSHAIR_STR1); -+ CANCEL_CALIBRATION -+ send_socket_crosshair_str(CROSSHAIR_STR2); -+ clearbuf(ts); -+ get_sample(ts, &cal, 1, xres - 50, 50, CROSSHAIR_STR2); -+ CANCEL_CALIBRATION -+ send_socket_crosshair_str(CROSSHAIR_STR3); -+ clearbuf(ts); -+ get_sample(ts, &cal, 2, xres - 50, yres - 50, CROSSHAIR_STR3); -+ CANCEL_CALIBRATION -+ send_socket_crosshair_str(CROSSHAIR_STR4); -+ clearbuf(ts); -+ get_sample(ts, &cal, 3, 50, yres - 50, CROSSHAIR_STR4); -+ CANCEL_CALIBRATION -+ send_socket_crosshair_str(CROSSHAIR_STR5); -+ clearbuf(ts); -+ get_sample(ts, &cal, 4, xres / 2, yres / 2, CROSSHAIR_STR5); -+ CANCEL_CALIBRATION -+ send_socket_crosshair_str("done"); -+ clearbuf(ts); -+ -+ if (perform_calibration(&cal)) { -+ printf ("Calibration constants: "); -+ for (i = 0; i < 7; i++) -+ printf("%d ", cal.a[i]); -+ -+ printf("\n"); -+ calfile = getenv("TSLIB_CALIBFILE"); -+ if (calfile != NULL) { -+ cal_fd = open(calfile, O_CREAT | O_TRUNC | O_RDWR, -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); -+ -+ if (cal_fd == -1) { -+ printf("Calibration failed - can't open calibration file %s.\n", calfile); -+ return; -+ } -+ } else { -+ cal_fd = open(TS_POINTERCAL, O_CREAT | O_TRUNC | O_RDWR, -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); -+ -+ if (cal_fd == -1) { -+ printf("Calibration failed - can't open calibration file %s.\n", TS_POINTERCAL); -+ return; -+ } -+ } -+ -+ len = sprintf(cal_buffer, "%d %d %d %d %d %d %d %d %d", -+ cal.a[1], cal.a[2], cal.a[0], -+ cal.a[4], cal.a[5], cal.a[3], cal.a[6], -+ xres, yres); -+ write(cal_fd, cal_buffer, len); -+ close(cal_fd); -+ } else { -+ printf("Calibration failed - wrong data.\n"); -+ } -+} -+ -+int get_resolution(void) -+{ -+ static char *fbdevice; -+ int fd; -+ static struct fb_var_screeninfo var; -+ -+ fbdevice = getenv("TSLIB_FBDEVICE"); -+ if (fbdevice == NULL) -+ return -1; -+ -+ printf("using fb device: %s\n", fbdevice); -+ fd = open(fbdevice, O_RDWR); -+ if (fd == -1) { -+ perror("open fbdevice"); -+ return -1; -+ } -+ -+ if (ioctl(fd, FBIOGET_VSCREENINFO, &var) < 0) { -+ perror("ioctl FBIOGET_VSCREENINFO"); -+ close(fd); -+ return -1; -+ } -+ -+ xres = var.xres; -+ yres = var.yres; -+ -+ close(fd); -+ return 0; -+} -+ -+int main(int argc, char *argv[]) -+{ -+ int c; -+ char *tsdevice; -+ struct tsdev *ts; -+ int ret; -+ struct ts_sample samp; -+ int uinput_fd; -+ struct uinput_user_dev uidev; -+ int daemon = 0; -+ struct timeval tv_last; -+ struct timeval tv_sub; -+ char *touch_str; -+ int val; -+ struct sigaction sa; -+ struct sockaddr_un remote_addr; -+ -+ touch_str = getenv("TSLIB_TAP_TIME"); -+ if (touch_str != NULL) { -+ val = atoi(touch_str); -+ if (val < 1000) { -+ tv_short_tap.tv_sec = 0; -+ tv_short_tap.tv_usec = val; -+ } else { -+ tv_short_tap.tv_sec = val / 1000; -+ tv_short_tap.tv_usec = val % 1000; -+ } -+ } -+ -+ get_resolution(); -+ -+ while ((c = getopt(argc, argv, "?dt:x:y:")) != -1) { -+ switch (c) { -+ case 'd': -+ daemon = 1; -+ break; -+ case 't': -+ val = atoi(optarg); -+ if (val < 1000) { -+ tv_short_tap.tv_sec = 0; -+ tv_short_tap.tv_usec = val; -+ } else { -+ tv_short_tap.tv_sec = val / 1000; -+ tv_short_tap.tv_usec = val % 1000; -+ } -+ -+ break; -+ case 'x': -+ xres = atoi(optarg); -+ break; -+ case 'y': -+ yres = atoi(optarg); -+ break; -+ case '?': -+ if (isprint(optopt)) -+ fprintf (stderr, "Unknown option '-%c'.\n", optopt); -+ else -+ fprintf (stderr, "Unknown option character '\\x%x'.\n", optopt); -+ return 1; -+ default: -+ die("getopt") -+ } -+ } -+ -+ printf("resolution: %dx%d\n", xres, yres); -+ -+ signal(SIGSEGV, sig); -+ signal(SIGINT, sig); -+ signal(SIGTERM, sig); -+ -+ tsdevice = getenv("TSLIB_TSDEVICE"); -+ -+ if (tsdevice == NULL) { -+ errno = ENOENT; -+ die("error: TSLIB_TSDEVICE") -+ } -+ -+ printf("using touch device: %s\n", tsdevice); -+ -+ ts = ts_open(tsdevice, 0); // 0 nonblock -+ if (!ts) { -+ die("ts_open") -+ } -+ -+ if (ts_config(ts)) { -+ die("ts_config") -+ } -+ -+ system("modprobe uinput"); -+ -+ for (c=0; c < UINPUT_NAMES_NUM; c++) { -+ uinput_fd = open(uinput_names[c], O_WRONLY | O_NONBLOCK); -+ if (uinput_fd >= 0) -+ break; -+ } -+ -+ if (uinput_fd < 0) -+ die("error: opening uinput") -+ -+ if (tv_short_tap.tv_sec == 0) -+ printf("Short tap time: %li msec\n", tv_short_tap.tv_usec); -+ else -+ printf("Short tap time: %li.%li sec\n", tv_short_tap.tv_sec, tv_short_tap.tv_usec); -+ -+ memset (&sa, 0, sizeof (sa)); -+ sa.sa_handler = &signal_handler; -+ sigaction(SIGUSR1, &sa, NULL); -+ sigaction(SIGUSR2, &sa, NULL); -+ -+ if (daemon == 1) { -+ printf("daemonizing...\n"); -+ daemonize(); -+ } -+ -+ set_ioctl(uinput_fd, UI_SET_EVBIT, EV_SYN); -+ set_ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY); -+ set_ioctl(uinput_fd, UI_SET_KEYBIT, BTN_TOUCH); -+ set_ioctl(uinput_fd, UI_SET_EVBIT, EV_ABS); -+ set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_X); -+ set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_Y); -+ set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_PRESSURE); -+ -+ memset(&uidev, 0, sizeof(uidev)); -+ -+ snprintf(uidev.name, UINPUT_MAX_NAME_SIZE, "tslib to uinput daemon"); -+ SET_ABS_MINMAX(uidev, ABS_X, 0, xres) -+ SET_ABS_MINMAX(uidev, ABS_Y, 0, yres) -+ SET_ABS_MINMAX(uidev, ABS_PRESSURE, 0, 255) -+ -+ uidev.id.bustype = BUS_USB; -+ uidev.id.vendor = 0x34a5; -+ uidev.id.product = 0x67b8; -+ uidev.id.version = 1; -+ -+ if (write(uinput_fd, &uidev, sizeof(uidev)) < 0) -+ die("error: write") -+ -+ if (ioctl(uinput_fd, UI_DEV_CREATE) < 0) -+ die("error: ioctl UI_DEV_CREATE") -+ -+ tv_short_tap.tv_usec *= 1000; /* msec to usec */ -+ timerclear(&tv_last); -+ while (1) { -+ touch_str = ""; -+ if (calibration_mode) { -+ usleep(250000); /* app become ready */ -+ printf("calibration mode started\n"); -+ -+ sock = socket(AF_UNIX, SOCK_STREAM, 0); -+ if (sock == -1) { -+ die("socket"); -+ } -+ -+ printf("trying to connect\n"); -+ -+ remote_addr.sun_family = AF_UNIX; -+ strcpy(remote_addr.sun_path, SOCK_PATH); -+ val = strlen(remote_addr.sun_path) + sizeof(remote_addr.sun_family); -+ if (connect(sock, (struct sockaddr *) &remote_addr, val) == -1) { -+ calibration_mode = false; -+ close(sock); -+ printf("connect error, skip calibration\n"); -+ usleep(200000); -+ continue; -+ } -+ -+ printf("connected\n"); -+ run_calibration(ts); -+ calibration_mode = false; -+ close(sock); -+ printf("calibration mode finished\n"); -+ } -+ -+ ret = ts_read(ts, &samp, 1); -+ if (ret < 0) { -+ usleep(200000); -+ continue; -+ } else if (ret == 0) { -+ /* can't grab ts device */ -+ usleep(400000); -+ } else if (ret != 1) -+ continue; -+ -+ send_event(uinput_fd, EV_ABS, ABS_X, samp.x); -+ send_event(uinput_fd, EV_ABS, ABS_Y, samp.y); -+ -+ if (samp.pressure > 0) { /* touched */ -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 255); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ -+ if (timerisset(&tv_last) == false) { -+ memcpy(&tv_last, &samp.tv, sizeof(struct timeval)); /* touched first time */ -+ touch_str = "touched first"; -+ } -+ } else { /* released */ -+ timersub(&samp.tv, &tv_last, &tv_sub); -+ if (timercmp(&tv_sub, &tv_short_tap, <=)) { -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 255); -+ send_event(uinput_fd, EV_KEY, BTN_TOUCH, 1); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -+ send_event(uinput_fd, EV_KEY, BTN_TOUCH, 0); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ -+ touch_str = "released and send button"; -+ } else { -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ touch_str = "released"; -+ } -+ -+ timerclear(&tv_last); -+ } -+ -+ printf("%ld.%06ld: %6d %6d %6d %s\n", samp.tv.tv_sec, samp.tv.tv_usec, -+ samp.x, samp.y, samp.pressure, touch_str); -+ } -+ -+ if (ioctl(uinput_fd, UI_DEV_DESTROY) < 0) -+ die("error: ioctl UI_DEV_DESTROY") -+ -+ close(uinput_fd); -+ -+ return 0; -+} - -From b64b63ac2fc791cad6e79cf9236c47b928960c2e Mon Sep 17 00:00:00 2001 -From: vpeter4 -Date: Sat, 4 Jul 2015 13:46:56 +0200 -Subject: [PATCH 03/11] ts_uinput_touch: add BTN_RIGHT event if tapped for more - than 300 ms and less than a second BTN_RIGHT event is send - ---- - tests/ts_uinput_touch.c | 38 ++++++++++++++++++++++++++------------ - 1 file changed, 26 insertions(+), 12 deletions(-) - mode change 100644 => 100755 tests/ts_uinput_touch.c - -diff --git a/tests/ts_uinput_touch.c b/tests/ts_uinput_touch.c -old mode 100644 -new mode 100755 -index 60efc46..489a22f ---- a/tests/ts_uinput_touch.c -+++ b/tests/ts_uinput_touch.c -@@ -9,8 +9,9 @@ - * - * - * Takes tslib events and send them to uinput as -- * BTN_TOUCH, ABS_X, ABS_Y and ABS_PRESSURE values. -- * Short tap send button event and longer tap send only coordinates. -+ * BTN_TOUCH, BTN_RIGHT, ABS_X, ABS_Y and ABS_PRESSURE values. -+ * Short tap send button touch event, little longer tap send button right event -+ * and longer tap send only coordinates. - * Tested only with Kodi application. - * - * code based on -@@ -77,7 +78,8 @@ char *uinput_names[] = {"/dev/uinput", "/dev/input/uinput", "/dev/misc/uinput"}; - #define UINPUT_NAMES_NUM ((int) (sizeof(uinput_names)/sizeof(char *))) - - __u32 xres = 0, yres = 0; --struct timeval tv_short_tap = {0, 300}; /* sec, msec */ -+struct timeval tv_short_tap = {0, 300}; /* sec, msec, short tap sends BTN_TOUCH */ -+struct timeval tv_right_tap = {1, 0}; /* sec, msec, longer tap sends BTN_RIGHT */ - bool calibration_mode = false; - int sock = -1; - -@@ -169,11 +171,6 @@ static void signal_handler(int signal_number) { - return; - - printf("signal handler %d, current calibration_mode=%d\n", signal_number, calibration_mode == true ? 1 : 0); -- if (calibration_mode) { -- tv_short_tap.tv_sec += 600; /* little more time */ -- } else { -- tv_short_tap.tv_sec -= 600; -- } - } - - static int perform_calibration(calibration *cal) { -@@ -501,6 +498,11 @@ int main(int argc, char *argv[]) - else - printf("Short tap time: %li.%li sec\n", tv_short_tap.tv_sec, tv_short_tap.tv_usec); - -+ if (tv_right_tap.tv_sec == 0) -+ printf("Right tap time: %li msec\n", tv_right_tap.tv_usec); -+ else -+ printf("Right tap time: %li.%li sec\n", tv_right_tap.tv_sec, tv_right_tap.tv_usec); -+ - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = &signal_handler; - sigaction(SIGUSR1, &sa, NULL); -@@ -511,10 +513,11 @@ int main(int argc, char *argv[]) - daemonize(); - } - -- set_ioctl(uinput_fd, UI_SET_EVBIT, EV_SYN); -- set_ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY); -+ set_ioctl(uinput_fd, UI_SET_EVBIT, EV_SYN); -+ set_ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY); - set_ioctl(uinput_fd, UI_SET_KEYBIT, BTN_TOUCH); -- set_ioctl(uinput_fd, UI_SET_EVBIT, EV_ABS); -+ set_ioctl(uinput_fd, UI_SET_KEYBIT, BTN_RIGHT); -+ set_ioctl(uinput_fd, UI_SET_EVBIT, EV_ABS); - set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_X); - set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_Y); - set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_PRESSURE); -@@ -538,6 +541,8 @@ int main(int argc, char *argv[]) - die("error: ioctl UI_DEV_CREATE") - - tv_short_tap.tv_usec *= 1000; /* msec to usec */ -+ tv_right_tap.tv_usec *= 1000; /* msec to usec */ -+ - timerclear(&tv_last); - while (1) { - touch_str = ""; -@@ -601,7 +606,16 @@ int main(int argc, char *argv[]) - send_event(uinput_fd, EV_KEY, BTN_TOUCH, 0); - send_event(uinput_fd, EV_SYN, 0, 0); - -- touch_str = "released and send button"; -+ touch_str = "released and send tap"; -+ } else if (timercmp(&tv_sub, &tv_right_tap, <=)) { -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 255); -+ send_event(uinput_fd, EV_KEY, BTN_RIGHT, 1); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -+ send_event(uinput_fd, EV_KEY, BTN_RIGHT, 0); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ -+ touch_str = "released and send right"; - } else { - send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); - send_event(uinput_fd, EV_SYN, 0, 0); - -From 0c95545167711eb2e906c8ef885956f3395e945a Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Mon, 31 Aug 2015 10:52:51 +0200 -Subject: [PATCH 04/11] Add Waveshare touchscreen raw module inspiration from - derekhe: https://github.com/derekhe/wavesahre-7inch-touchscreen-driver - ---- - configure.ac | 1 + - plugins/Makefile.am | 13 +++- - plugins/plugins.h | 1 + - plugins/waveshare-raw.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 4 + - 5 files changed, 220 insertions(+), 1 deletion(-) - create mode 100644 plugins/waveshare-raw.c - -diff --git a/configure.ac b/configure.ac -index 6984002..598ede7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,6 +70,7 @@ TSLIB_CHECK_MODULE([input], [yes], [Enable building of generic input raw module - TSLIB_CHECK_MODULE([touchkit], [yes], [Enable building of serial TouchKit raw module (Linux /dev/ttySX support)]) - TSLIB_CHECK_MODULE([galax], [yes], [Enable building of HID USB eGalax raw module (Linux /dev/hiddevN support)]) - TSLIB_CHECK_MODULE([st1232], [yes], [Enable building of ST1232 raw module (Linux /dev/input/eventN support)]) -+TSLIB_CHECK_MODULE([waveshare], [yes], [Enable building of WaveShare raw module (Linux /dev/hidrawN support)]) - - - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index e8e89e0..98881b3 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -127,6 +127,12 @@ else - ST1232_MODULE = - endif - -+if ENABLE_WAVESHARE_MODULE -+WAVESHARE_MODULE = waveshare.la -+else -+WAVESHARE_MODULE = -+endif -+ - pluginexec_LTLIBRARIES = \ - $(LINEAR_MODULE) \ - $(DEJITTER_MODULE) \ -@@ -145,7 +151,8 @@ pluginexec_LTLIBRARIES = \ - $(GALAX_MODULE) \ - $(TOUCHKIT_MODULE) \ - $(CY8MRLN_PALMPRE_MODULE) \ -- $(ST1232_MODULE) -+ $(ST1232_MODULE) \ -+ $(WAVESHARE_MODULE) - - variance_la_SOURCES = variance.c - variance_la_LDFLAGS = -module $(LTVSN) -@@ -208,3 +215,7 @@ cy8mrln_palmpre_la_LDFLAGS = -module $(LTVSN) - st1232_la_SOURCES = st1232-raw.c - st1232_la_LDFLAGS = -module $(LTVSN) - st1232_la_LIBADD = $(top_builddir)/src/libts.la -+ -+waveshare_la_SOURCES = waveshare-raw.c -+waveshare_la_LDFLAGS = -module $(LTVSN) -+waveshare_la_LIBADD = $(top_builddir)/src/libts.la -diff --git a/plugins/plugins.h b/plugins/plugins.h -index d78877e..f347e25 100644 ---- a/plugins/plugins.h -+++ b/plugins/plugins.h -@@ -17,3 +17,4 @@ TSLIB_DECLARE_MODULE(tatung); - TSLIB_DECLARE_MODULE(input); - TSLIB_DECLARE_MODULE(cy8mrln_palmpre); - TSLIB_DECLARE_MODULE(st1232); -+TSLIB_DECLARE_MODULE(waveshare); -diff --git a/plugins/waveshare-raw.c b/plugins/waveshare-raw.c -new file mode 100644 -index 0000000..ff13055 ---- /dev/null -+++ b/plugins/waveshare-raw.c -@@ -0,0 +1,202 @@ -+/* -+ * tslib driver for WaveShare touchscreens -+ * Copyright (C) 2015 Peter Vicman -+ * inspiration from derekhe: https://github.com/derekhe/wavesahre-7inch-touchscreen-driver -+ * -+ * This file is placed under the LGPL. Please see the file COPYING for more -+ * details. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "config.h" -+#include "tslib-private.h" -+ -+struct tslib_input { -+ struct tslib_module_info module; -+ int vendor; -+ int product; -+ int len; -+}; -+ -+static int waveshare_read(struct tslib_module_info *inf, struct ts_sample *samp, int nr) -+{ -+ static bool reopen = true; -+ struct stat devstat; -+ struct hidraw_devinfo info; -+ char name_buf[512]; -+ int cnt; -+ bool found = false; -+ struct tslib_input *i = (struct tslib_input *) inf; -+ struct tsdev *ts = inf->dev; -+ struct tsdev *ts_tmp; -+ char *buf; -+ int ret; -+ -+ if (reopen == true) { -+ reopen = false; -+ -+ if (i->vendor > 0 && i->product > 0) { -+ fprintf(stderr, "waveshare: searching for device using hidraw....\n"); -+ for (cnt=0; cntfd, HIDIOCGRAWINFO, &info); -+ if (ret < 0) { -+ ts_close(ts_tmp); -+ continue; -+ } -+ -+ info.vendor &= 0xFFFF; -+ info.product &= 0xFFFF; -+ fprintf(stderr, " vid=%04X, pid=%04X\n", info.vendor, info.product); -+ -+ if (i->vendor == info.vendor && i->product == info.product) { -+ if (ts->fd > 0) -+ close(ts->fd); -+ -+ ts->fd = ts_tmp->fd; -+ free(ts_tmp); -+ found = true; -+ fprintf(stderr, " correct device\n"); -+ break; -+ } -+ -+ ts_close(ts_tmp); -+ } /* for HIDRAW_MAX_DEVICES */ -+ -+ if (found == false) { -+ return -1; -+ } -+ } /* vid/pid set */ -+ } /* reopen */ -+ -+ buf = alloca(i->len * nr); -+ -+ ret = read(ts->fd, buf, i->len * nr); -+ if(ret > 0) { -+ while(ret >= (int) i->len) { -+ /* -+ 0000271: aa01 00e4 0139 bb01 01e0 0320 01e0 0320 01e0 0320 01e0 0320 cc .....9..... ... ... ... . -+ -+ "aa" is start of the command, "01" means clicked while "00" means unclicked. -+ "00e4" and "0139" is the X,Y position (HEX). -+ "bb" is start of multi-touch, and the following bytes are the position of each point. -+ */ -+ samp->pressure = buf[1] & 0xff; -+ samp->x = ((buf[2] & 0xff) << 8) | (buf[3] & 0xff); -+ samp->y = ((buf[4] & 0xff) << 8) | (buf[5] & 0xff); -+ gettimeofday(&samp->tv, NULL); -+#ifdef DEBUG -+ fprintf(stderr, "waveshare raw: %d %d %d\n", samp->x, samp->y, samp->pressure); -+ fprintf(stderr, "%x %x %x %x %x %x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); -+#endif -+ samp++; -+ buf += i->len; -+ ret -= i->len; -+ } -+ } else { -+ return -1; -+ } -+ -+ return nr; -+} -+ -+static const struct tslib_ops waveshare_ops = -+{ -+ .read = waveshare_read, -+}; -+ -+static int parse_vid_pid(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ -+ if (strlen(str) < 9 || (int) data != 1) -+ return 0; /* -1 */ -+ -+ str[4] = str[9] = '\0'; -+ i->vendor = strtol(&str[0], NULL, 16); -+ i->product = strtol(&str[5], NULL, 16); -+//#ifdef DEBUG -+ fprintf(stderr, "waveshare vid:pid - %04X:%04X\n", i->vendor, i->product); -+//#endif /*DEBUG*/ -+ return 0; -+} -+ -+static int parse_len(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ int v; -+ int err = errno; -+ -+ v = atoi(str); -+ -+ if (v < 0) -+ return -1; -+ -+ errno = err; -+ switch ((int) data) { -+ case 1: -+ i->len = v; -+ fprintf(stderr, "waveshare raw data len: %d bytes\n", i->len); -+ break; -+ default: -+ return -1; -+ } -+ return 0; -+} -+ -+static const struct tslib_vars raw_vars[] = -+{ -+ { "vid_pid", (void *) 1, parse_vid_pid }, -+ { "len", (void *) 1, parse_len }, -+}; -+ -+#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0])) -+ -+TSAPI struct tslib_module_info *waveshare_mod_init(struct tsdev *dev, const char *params) -+{ -+ struct tslib_input *i; -+ -+ (void) dev; -+ -+ i = malloc(sizeof(struct tslib_input)); -+ if (i == NULL) -+ return NULL; -+ -+ i->module.ops = &waveshare_ops; -+ i->vendor = 0; -+ i->product = 0; -+ i->len = 25; -+ -+ if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { -+ free(i); -+ return NULL; -+ } -+ -+ return &(i->module); -+} -+ -+#ifndef TSLIB_STATIC_WAVESHARE_MODULE -+ TSLIB_MODULE_INIT(waveshare_mod_init); -+#endif -diff --git a/src/Makefile.am b/src/Makefile.am -index b561aa8..a8fded9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -75,6 +75,10 @@ if ENABLE_STATIC_ST1232_MODULE - libts_la_SOURCES += $(top_srcdir)/plugins/st1232-raw.c - endif - -+if ENABLE_STATIC_WAVESHARE_MODULE -+libts_la_SOURCES += $(top_srcdir)/plugins/waveshare-raw.c -+endif -+ - libts_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -export-dynamic - libts_la_LIBADD = -ldl - -From 72128c5f16db89d7b644dd184c1b1c6dbe6ef79e Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Sun, 20 Sep 2015 10:30:33 +0200 -Subject: [PATCH 05/11] waveshare: remove reopening device based on vid/pid - ---- - plugins/waveshare-raw.c | 76 ------------------------------------------------- - 1 file changed, 76 deletions(-) - -diff --git a/plugins/waveshare-raw.c b/plugins/waveshare-raw.c -index ff13055..0839af0 100644 ---- a/plugins/waveshare-raw.c -+++ b/plugins/waveshare-raw.c -@@ -24,73 +24,16 @@ - - struct tslib_input { - struct tslib_module_info module; -- int vendor; -- int product; - int len; - }; - - static int waveshare_read(struct tslib_module_info *inf, struct ts_sample *samp, int nr) - { -- static bool reopen = true; -- struct stat devstat; -- struct hidraw_devinfo info; -- char name_buf[512]; -- int cnt; -- bool found = false; - struct tslib_input *i = (struct tslib_input *) inf; - struct tsdev *ts = inf->dev; -- struct tsdev *ts_tmp; - char *buf; - int ret; - -- if (reopen == true) { -- reopen = false; -- -- if (i->vendor > 0 && i->product > 0) { -- fprintf(stderr, "waveshare: searching for device using hidraw....\n"); -- for (cnt=0; cntfd, HIDIOCGRAWINFO, &info); -- if (ret < 0) { -- ts_close(ts_tmp); -- continue; -- } -- -- info.vendor &= 0xFFFF; -- info.product &= 0xFFFF; -- fprintf(stderr, " vid=%04X, pid=%04X\n", info.vendor, info.product); -- -- if (i->vendor == info.vendor && i->product == info.product) { -- if (ts->fd > 0) -- close(ts->fd); -- -- ts->fd = ts_tmp->fd; -- free(ts_tmp); -- found = true; -- fprintf(stderr, " correct device\n"); -- break; -- } -- -- ts_close(ts_tmp); -- } /* for HIDRAW_MAX_DEVICES */ -- -- if (found == false) { -- return -1; -- } -- } /* vid/pid set */ -- } /* reopen */ -- - buf = alloca(i->len * nr); - - ret = read(ts->fd, buf, i->len * nr); -@@ -127,22 +70,6 @@ static const struct tslib_ops waveshare_ops = - .read = waveshare_read, - }; - --static int parse_vid_pid(struct tslib_module_info *inf, char *str, void *data) --{ -- struct tslib_input *i = (struct tslib_input *)inf; -- -- if (strlen(str) < 9 || (int) data != 1) -- return 0; /* -1 */ -- -- str[4] = str[9] = '\0'; -- i->vendor = strtol(&str[0], NULL, 16); -- i->product = strtol(&str[5], NULL, 16); --//#ifdef DEBUG -- fprintf(stderr, "waveshare vid:pid - %04X:%04X\n", i->vendor, i->product); --//#endif /*DEBUG*/ -- return 0; --} -- - static int parse_len(struct tslib_module_info *inf, char *str, void *data) - { - struct tslib_input *i = (struct tslib_input *)inf; -@@ -168,7 +95,6 @@ static int parse_len(struct tslib_module_info *inf, char *str, void *data) - - static const struct tslib_vars raw_vars[] = - { -- { "vid_pid", (void *) 1, parse_vid_pid }, - { "len", (void *) 1, parse_len }, - }; - -@@ -185,8 +111,6 @@ TSAPI struct tslib_module_info *waveshare_mod_init(struct tsdev *dev, const char - return NULL; - - i->module.ops = &waveshare_ops; -- i->vendor = 0; -- i->product = 0; - i->len = 25; - - if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { - -From 8b6a678e507211d5d51081655af244561a931d8f Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Sun, 20 Sep 2015 10:42:31 +0200 -Subject: [PATCH 06/11] ts_reconfig: reload all modules useful to reload - calibration data without closing and opening device - ---- - src/Makefile.am | 2 +- - src/ts_reconfig.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/tslib.h | 5 +++++ - 3 files changed, 54 insertions(+), 1 deletion(-) - create mode 100644 src/ts_reconfig.c - -diff --git a/src/Makefile.am b/src/Makefile.am -index a8fded9..606a5ae 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -17,7 +17,7 @@ include_HEADERS = tslib.h - lib_LTLIBRARIES = libts.la - libts_la_SOURCES = ts_attach.c ts_close.c ts_config.c ts_error.c \ - ts_fd.c ts_load_module.c ts_open.c ts_parse_vars.c \ -- ts_read.c ts_read_raw.c ts_option.c -+ ts_read.c ts_read_raw.c ts_option.c ts_reconfig.c - - if ENABLE_STATIC_LINEAR_MODULE - libts_la_SOURCES += $(top_srcdir)/plugins/linear.c -diff --git a/src/ts_reconfig.c b/src/ts_reconfig.c -new file mode 100644 -index 0000000..c94ec3e ---- /dev/null -+++ b/src/ts_reconfig.c -@@ -0,0 +1,48 @@ -+/* -+ * tslib/src/ts_reconfig.c -+ * based on tslib/src/ts_close.c -+ * -+ * Copyright (C) 2001 Russell King. -+ * -+ * This file is placed under the LGPL. Please see the file -+ * COPYING for more details. -+ * -+ * -+ * Reloads all modules - useful to reload calibration data. -+ */ -+#include "config.h" -+#include -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+#include -+ -+#include "tslib-private.h" -+ -+int ts_reconfig(struct tsdev *ts) -+{ -+ void *handle; -+ int ret; -+ struct tslib_module_info *info, *next; -+ int fd; -+ -+ info = ts->list; -+ while(info) { -+ /* Save the "next" pointer now because info will be freed */ -+ next = info->next; -+ -+ handle = info->handle; -+ info->ops->fini(info); -+ if (handle) -+ dlclose(handle); -+ -+ info = next; -+ } -+ -+ fd = ts->fd; /* save temp */ -+ memset(ts, 0, sizeof(struct tsdev)); -+ ts->fd = fd; -+ -+ ret = ts_config(ts); -+ return ret; -+} -diff --git a/src/tslib.h b/src/tslib.h -index df8e284..28156ba 100644 ---- a/src/tslib.h -+++ b/src/tslib.h -@@ -57,6 +57,11 @@ enum ts_param { - TSAPI int ts_close(struct tsdev *); - - /* -+ * Reloads all modules - useful to reload calibration data. -+ */ -+TSAPI int ts_reconfig(struct tsdev *); -+ -+/* - * Configure the touchscreen device. - */ - TSAPI int ts_config(struct tsdev *); - -From df81ed55ed9c99a8636f0b8524e0c5da0d00d33d Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Sun, 20 Sep 2015 10:45:55 +0200 -Subject: [PATCH 07/11] ts_uinput_touch: reload modules (and calibration data) - automatically after calibration and on SIGHUP signal - ---- - tests/ts_uinput_touch.c | 67 +++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 48 insertions(+), 19 deletions(-) - -diff --git a/tests/ts_uinput_touch.c b/tests/ts_uinput_touch.c -index 489a22f..871c5e4 100755 ---- a/tests/ts_uinput_touch.c -+++ b/tests/ts_uinput_touch.c -@@ -74,6 +74,7 @@ typedef struct { - int a[7]; - } calibration; - -+struct tsdev *ts = NULL; - char *uinput_names[] = {"/dev/uinput", "/dev/input/uinput", "/dev/misc/uinput"}; - #define UINPUT_NAMES_NUM ((int) (sizeof(uinput_names)/sizeof(char *))) - -@@ -99,7 +100,7 @@ static void daemonize() { - die("failed to become a session leader while daemonising(errno=%d)", errno) - } - -- signal(SIGHUP,SIG_IGN); -+ /* signal(SIGHUP,SIG_IGN); */ - pid=fork(); - if (pid == -1) { - die("failed to fork while daemonizing (errno=%d)", errno) -@@ -129,7 +130,7 @@ static void daemonize() { - } - } - --static void sig(int sig) -+static void signal_end(int sig) - { - fflush(stderr); - printf("signal %d caught\n", sig); -@@ -163,7 +164,15 @@ static int send_event(int fd, __u16 type, __u16 code, __s32 value) - } - - static void signal_handler(int signal_number) { -- if (signal_number == SIGUSR1) -+ if (signal_number == SIGHUP) { -+ /* reload modules (and calibration data) */ -+ printf("signal handler %d, reconfig ts\n", signal_number); -+ if (ts_reconfig(ts)) { -+ die("ts_reconfig") -+ } -+ -+ return; -+ } else if (signal_number == SIGUSR1) - calibration_mode = true; - else if (signal_number == SIGUSR2) - calibration_mode = false; -@@ -366,25 +375,25 @@ static void run_calibration(struct tsdev *ts) - - int get_resolution(void) - { -- static char *fbdevice; -+ char *env_str; - int fd; - static struct fb_var_screeninfo var; - -- fbdevice = getenv("TSLIB_FBDEVICE"); -- if (fbdevice == NULL) -- return -1; -+ env_str = getenv("TSLIB_FBDEVICE"); -+ if (env_str == NULL) -+ goto not_found; - -- printf("using fb device: %s\n", fbdevice); -- fd = open(fbdevice, O_RDWR); -+ printf("using fb device: %s\n", env_str); -+ fd = open(env_str, O_RDWR); - if (fd == -1) { - perror("open fbdevice"); -- return -1; -+ goto not_found; - } - - if (ioctl(fd, FBIOGET_VSCREENINFO, &var) < 0) { - perror("ioctl FBIOGET_VSCREENINFO"); - close(fd); -- return -1; -+ goto not_found; - } - - xres = var.xres; -@@ -392,13 +401,28 @@ int get_resolution(void) - - close(fd); - return 0; -+ -+not_found: -+ env_str = getenv("TSLIB_RES_X"); -+ if (env_str != NULL) -+ xres = atoi(env_str); -+ -+ env_str = getenv("TSLIB_RES_Y"); -+ if (env_str != NULL) -+ yres = atoi(env_str); -+ -+ if (xres == 0 || yres == 0) { -+ xres = yres = 0; -+ return -1; -+ } -+ -+ return 0; - } - - int main(int argc, char *argv[]) - { - int c; - char *tsdevice; -- struct tsdev *ts; - int ret; - struct ts_sample samp; - int uinput_fd; -@@ -423,7 +447,7 @@ int main(int argc, char *argv[]) - } - } - -- get_resolution(); -+ ret = get_resolution(); - - while ((c = getopt(argc, argv, "?dt:x:y:")) != -1) { - switch (c) { -@@ -460,12 +484,11 @@ int main(int argc, char *argv[]) - - printf("resolution: %dx%d\n", xres, yres); - -- signal(SIGSEGV, sig); -- signal(SIGINT, sig); -- signal(SIGTERM, sig); -+ signal(SIGSEGV, signal_end); -+ signal(SIGINT, signal_end); -+ signal(SIGTERM, signal_end); - - tsdevice = getenv("TSLIB_TSDEVICE"); -- - if (tsdevice == NULL) { - errno = ENOENT; - die("error: TSLIB_TSDEVICE") -@@ -482,7 +505,7 @@ int main(int argc, char *argv[]) - die("ts_config") - } - -- system("modprobe uinput"); -+ ret = system("modprobe uinput"); - - for (c=0; c < UINPUT_NAMES_NUM; c++) { - uinput_fd = open(uinput_names[c], O_WRONLY | O_NONBLOCK); -@@ -505,6 +528,7 @@ int main(int argc, char *argv[]) - - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = &signal_handler; -+ sigaction(SIGHUP, &sa, NULL); - sigaction(SIGUSR1, &sa, NULL); - sigaction(SIGUSR2, &sa, NULL); - -@@ -572,7 +596,12 @@ int main(int argc, char *argv[]) - run_calibration(ts); - calibration_mode = false; - close(sock); -- printf("calibration mode finished\n"); -+ printf("calibration mode finished, reload plugins\n"); -+ -+ clearbuf(ts); -+ if (ts_reconfig(ts)) { -+ die("ts_reconfig") -+ } - } - - ret = ts_read(ts, &samp, 1); - -From dbf1c882dbc239065df422f9e16da955c0b7653f Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Sun, 20 Sep 2015 10:47:44 +0200 -Subject: [PATCH 08/11] plugins: compile statically - ---- - plugins/Makefile.am | 2 ++ - plugins/dmc-raw.c | 6 +++++- - plugins/plugins.h | 5 ++++- - plugins/touchkit-raw.c | 6 +++++- - src/Makefile.am | 12 ++++++++++++ - src/ts_load_module.c | 12 ++++++++++++ - 6 files changed, 40 insertions(+), 3 deletions(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 98881b3..87fa18b 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -194,6 +194,7 @@ tatung_la_LDFLAGS = -module $(LTVSN) - - dmc_la_SOURCES = dmc-raw.c - dmc_la_LDFLAGS = -module $(LTVSN) -+dmc_la_LIBADD = $(top_builddir)/src/libts.la - - input_la_SOURCES = input-raw.c - input_la_LDFLAGS = -module $(LTVSN) -@@ -205,6 +206,7 @@ galax_la_LIBADD = $(top_builddir)/src/libts.la - - touchkit_la_SOURCES = touchkit-raw.c - touchkit_la_LDFLAGS = -module $(LTVSN) -+touchkit_la_LIBADD = $(top_builddir)/src/libts.la - - linear_h2200_la_SOURCES = linear-h2200.c - linear_h2200_la_LDFLAGS = -module $(LTVSN) -diff --git a/plugins/dmc-raw.c b/plugins/dmc-raw.c -index f9f5381..59980cc 100644 ---- a/plugins/dmc-raw.c -+++ b/plugins/dmc-raw.c -@@ -123,7 +123,7 @@ static const struct tslib_ops dmc_ops = - .read = dmc_read, - }; - --TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) -+TSAPI struct tslib_module_info *dmc_mod_init(struct tsdev *dev, const char *params) - { - struct tslib_dmc *m; - -@@ -137,3 +137,7 @@ TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) - m->module.ops = &dmc_ops; - return (struct tslib_module_info*)m; - } -+ -+#ifndef TSLIB_STATIC_DMC_MODULE -+ TSLIB_MODULE_INIT(dmc_mod_init); -+#endif -diff --git a/plugins/plugins.h b/plugins/plugins.h -index f347e25..798f9b3 100644 ---- a/plugins/plugins.h -+++ b/plugins/plugins.h -@@ -6,7 +6,6 @@ TSLIB_DECLARE_MODULE(dejitter); - TSLIB_DECLARE_MODULE(linear_h2200); - TSLIB_DECLARE_MODULE(variance); - TSLIB_DECLARE_MODULE(pthres); -- - TSLIB_DECLARE_MODULE(ucb1x00); - TSLIB_DECLARE_MODULE(corgi); - TSLIB_DECLARE_MODULE(collie); -@@ -16,5 +15,9 @@ TSLIB_DECLARE_MODULE(arctic2); - TSLIB_DECLARE_MODULE(tatung); - TSLIB_DECLARE_MODULE(input); - TSLIB_DECLARE_MODULE(cy8mrln_palmpre); -+TSLIB_DECLARE_MODULE(galax); -+TSLIB_DECLARE_MODULE(dmc); -+TSLIB_DECLARE_MODULE(touchkit); - TSLIB_DECLARE_MODULE(st1232); - TSLIB_DECLARE_MODULE(waveshare); -+ -diff --git a/plugins/touchkit-raw.c b/plugins/touchkit-raw.c -index e072f21..68179a3 100644 ---- a/plugins/touchkit-raw.c -+++ b/plugins/touchkit-raw.c -@@ -144,7 +144,7 @@ static const struct tslib_ops touchkit_ops = { - .read = touchkit_read, - }; - --TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) -+TSAPI struct tslib_module_info *touchkit_mod_init(struct tsdev *dev, const char *params) - { - struct tslib_module_info *m; - -@@ -155,3 +155,7 @@ TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) - m->ops = &touchkit_ops; - return m; - } -+ -+#ifndef TSLIB_STATIC_TOUCHKIT_MODULE -+ TSLIB_MODULE_INIT(touchkit_mod_init); -+#endif -diff --git a/src/Makefile.am b/src/Makefile.am -index 606a5ae..2f31519 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -71,6 +71,18 @@ if ENABLE_STATIC_INPUT_MODULE - libts_la_SOURCES += $(top_srcdir)/plugins/input-raw.c - endif - -+if ENABLE_STATIC_DMC_MODULE -+libts_la_SOURCES += $(top_srcdir)/plugins/dmc-raw.c -+endif -+ -+if ENABLE_STATIC_GALAX_MODULE -+libts_la_SOURCES += $(top_srcdir)/plugins/galax-raw.c -+endif -+ -+if ENABLE_STATIC_TOUCHKIT_MODULE -+libts_la_SOURCES += $(top_srcdir)/plugins/touchkit-raw.c -+endif -+ - if ENABLE_STATIC_ST1232_MODULE - libts_la_SOURCES += $(top_srcdir)/plugins/st1232-raw.c - endif -diff --git a/src/ts_load_module.c b/src/ts_load_module.c -index 886ca0a..903c921 100644 ---- a/src/ts_load_module.c -+++ b/src/ts_load_module.c -@@ -76,6 +76,18 @@ static const struct { - #ifdef TSLIB_STATIC_ST1232_MODULE - { "st1232", st1232_mod_init }, - #endif -+#ifdef TSLIB_STATIC_CY8MRLN_PALMPRE_MODULE -+ { "cy8mrln-palmpre", cy8mrln_palmpre_mod_init }, -+#endif -+#ifdef TSLIB_STATIC_DMC_MODULE -+ { "dmc", dmc_mod_init }, -+#endif -+#ifdef TSLIB_STATIC_TOUCHKIT_MODULE -+ { "touchkit", touchkit_mod_init }, -+#endif -+#ifdef TSLIB_STATIC_WAVESHARE_MODULE -+ { "waveshare", waveshare_mod_init }, -+#endif - }; - - #define countof(arr) (sizeof(arr) / sizeof((arr)[0])) - -From 72d2fe9e2ff18a9589510fd28e485b238a7bcbff Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Mon, 21 Sep 2015 09:36:38 +0200 -Subject: [PATCH 09/11] file permission, tabs - ---- - plugins/Makefile.am | 2 +- - tests/ts_uinput_touch.c | 0 - 2 files changed, 1 insertion(+), 1 deletion(-) - mode change 100755 => 100644 tests/ts_uinput_touch.c - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 87fa18b..4ed04c1 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -194,7 +194,7 @@ tatung_la_LDFLAGS = -module $(LTVSN) - - dmc_la_SOURCES = dmc-raw.c - dmc_la_LDFLAGS = -module $(LTVSN) --dmc_la_LIBADD = $(top_builddir)/src/libts.la -+dmc_la_LIBADD = $(top_builddir)/src/libts.la - - input_la_SOURCES = input-raw.c - input_la_LDFLAGS = -module $(LTVSN) -diff --git a/tests/ts_uinput_touch.c b/tests/ts_uinput_touch.c -old mode 100755 -new mode 100644 - -From aff635ded1b41ade1b2cf2203cdf30f7fcd61127 Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Sat, 10 Oct 2015 21:24:53 +0200 -Subject: [PATCH 10/11] ts_uinput_touch: remove button right event because it - breaks scrollbar, context menu is open on few seconds tap - ---- - tests/ts_uinput_touch.c | 141 ++++++++++++------------------------------------ - 1 file changed, 35 insertions(+), 106 deletions(-) - -diff --git a/tests/ts_uinput_touch.c b/tests/ts_uinput_touch.c -index 871c5e4..92db9ce 100644 ---- a/tests/ts_uinput_touch.c -+++ b/tests/ts_uinput_touch.c -@@ -9,9 +9,7 @@ - * - * - * Takes tslib events and send them to uinput as -- * BTN_TOUCH, BTN_RIGHT, ABS_X, ABS_Y and ABS_PRESSURE values. -- * Short tap send button touch event, little longer tap send button right event -- * and longer tap send only coordinates. -+ * ABS_X, ABS_Y, BTN_TOUCH and ABS_PRESSURE values. - * Tested only with Kodi application. - * - * code based on -@@ -79,8 +77,6 @@ char *uinput_names[] = {"/dev/uinput", "/dev/input/uinput", "/dev/misc/uinput"}; - #define UINPUT_NAMES_NUM ((int) (sizeof(uinput_names)/sizeof(char *))) - - __u32 xres = 0, yres = 0; --struct timeval tv_short_tap = {0, 300}; /* sec, msec, short tap sends BTN_TOUCH */ --struct timeval tv_right_tap = {1, 0}; /* sec, msec, longer tap sends BTN_RIGHT */ - bool calibration_mode = false; - int sock = -1; - -@@ -164,15 +160,15 @@ static int send_event(int fd, __u16 type, __u16 code, __s32 value) - } - - static void signal_handler(int signal_number) { -- if (signal_number == SIGHUP) { -- /* reload modules (and calibration data) */ -- printf("signal handler %d, reconfig ts\n", signal_number); -- if (ts_reconfig(ts)) { -- die("ts_reconfig") -- } -- -- return; -- } else if (signal_number == SIGUSR1) -+ if (signal_number == SIGHUP) { -+ /* reload modules (and calibration data) */ -+ printf("signal handler %d, reconfig ts\n", signal_number); -+ if (ts_reconfig(ts)) { -+ die("ts_reconfig") -+ } -+ -+ return; -+ } else if (signal_number == SIGUSR1) - calibration_mode = true; - else if (signal_number == SIGUSR2) - calibration_mode = false; -@@ -403,20 +399,20 @@ int get_resolution(void) - return 0; - - not_found: -- env_str = getenv("TSLIB_RES_X"); -- if (env_str != NULL) -- xres = atoi(env_str); -- -- env_str = getenv("TSLIB_RES_Y"); -- if (env_str != NULL) -- yres = atoi(env_str); -- -- if (xres == 0 || yres == 0) { -- xres = yres = 0; -- return -1; -- } -- -- return 0; -+ env_str = getenv("TSLIB_RES_X"); -+ if (env_str != NULL) -+ xres = atoi(env_str); -+ -+ env_str = getenv("TSLIB_RES_Y"); -+ if (env_str != NULL) -+ yres = atoi(env_str); -+ -+ if (xres == 0 || yres == 0) { -+ xres = yres = 0; -+ return -1; -+ } -+ -+ return 0; - } - - int main(int argc, char *argv[]) -@@ -428,43 +424,18 @@ int main(int argc, char *argv[]) - int uinput_fd; - struct uinput_user_dev uidev; - int daemon = 0; -- struct timeval tv_last; -- struct timeval tv_sub; - char *touch_str; - int val; - struct sigaction sa; - struct sockaddr_un remote_addr; - -- touch_str = getenv("TSLIB_TAP_TIME"); -- if (touch_str != NULL) { -- val = atoi(touch_str); -- if (val < 1000) { -- tv_short_tap.tv_sec = 0; -- tv_short_tap.tv_usec = val; -- } else { -- tv_short_tap.tv_sec = val / 1000; -- tv_short_tap.tv_usec = val % 1000; -- } -- } -- - ret = get_resolution(); - -- while ((c = getopt(argc, argv, "?dt:x:y:")) != -1) { -+ while ((c = getopt(argc, argv, "?dx:y:")) != -1) { - switch (c) { - case 'd': - daemon = 1; - break; -- case 't': -- val = atoi(optarg); -- if (val < 1000) { -- tv_short_tap.tv_sec = 0; -- tv_short_tap.tv_usec = val; -- } else { -- tv_short_tap.tv_sec = val / 1000; -- tv_short_tap.tv_usec = val % 1000; -- } -- -- break; - case 'x': - xres = atoi(optarg); - break; -@@ -516,16 +487,6 @@ int main(int argc, char *argv[]) - if (uinput_fd < 0) - die("error: opening uinput") - -- if (tv_short_tap.tv_sec == 0) -- printf("Short tap time: %li msec\n", tv_short_tap.tv_usec); -- else -- printf("Short tap time: %li.%li sec\n", tv_short_tap.tv_sec, tv_short_tap.tv_usec); -- -- if (tv_right_tap.tv_sec == 0) -- printf("Right tap time: %li msec\n", tv_right_tap.tv_usec); -- else -- printf("Right tap time: %li.%li sec\n", tv_right_tap.tv_sec, tv_right_tap.tv_usec); -- - memset (&sa, 0, sizeof (sa)); - sa.sa_handler = &signal_handler; - sigaction(SIGHUP, &sa, NULL); -@@ -540,7 +501,6 @@ int main(int argc, char *argv[]) - set_ioctl(uinput_fd, UI_SET_EVBIT, EV_SYN); - set_ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY); - set_ioctl(uinput_fd, UI_SET_KEYBIT, BTN_TOUCH); -- set_ioctl(uinput_fd, UI_SET_KEYBIT, BTN_RIGHT); - set_ioctl(uinput_fd, UI_SET_EVBIT, EV_ABS); - set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_X); - set_ioctl(uinput_fd, UI_SET_ABSBIT, ABS_Y); -@@ -564,12 +524,7 @@ int main(int argc, char *argv[]) - if (ioctl(uinput_fd, UI_DEV_CREATE) < 0) - die("error: ioctl UI_DEV_CREATE") - -- tv_short_tap.tv_usec *= 1000; /* msec to usec */ -- tv_right_tap.tv_usec *= 1000; /* msec to usec */ -- -- timerclear(&tv_last); - while (1) { -- touch_str = ""; - if (calibration_mode) { - usleep(250000); /* app become ready */ - printf("calibration mode started\n"); -@@ -614,44 +569,18 @@ int main(int argc, char *argv[]) - } else if (ret != 1) - continue; - -- send_event(uinput_fd, EV_ABS, ABS_X, samp.x); -- send_event(uinput_fd, EV_ABS, ABS_Y, samp.y); -- -- if (samp.pressure > 0) { /* touched */ -+ if (samp.pressure > 0) { -+ touch_str = "touched"; -+ send_event(uinput_fd, EV_ABS, ABS_X, samp.x); -+ send_event(uinput_fd, EV_ABS, ABS_Y, samp.y); - send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 255); -+ send_event(uinput_fd, EV_KEY, BTN_TOUCH, 1); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ } else { -+ touch_str = "released"; -+ send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -+ send_event(uinput_fd, EV_KEY, BTN_TOUCH, 0); - send_event(uinput_fd, EV_SYN, 0, 0); -- -- if (timerisset(&tv_last) == false) { -- memcpy(&tv_last, &samp.tv, sizeof(struct timeval)); /* touched first time */ -- touch_str = "touched first"; -- } -- } else { /* released */ -- timersub(&samp.tv, &tv_last, &tv_sub); -- if (timercmp(&tv_sub, &tv_short_tap, <=)) { -- send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 255); -- send_event(uinput_fd, EV_KEY, BTN_TOUCH, 1); -- send_event(uinput_fd, EV_SYN, 0, 0); -- send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -- send_event(uinput_fd, EV_KEY, BTN_TOUCH, 0); -- send_event(uinput_fd, EV_SYN, 0, 0); -- -- touch_str = "released and send tap"; -- } else if (timercmp(&tv_sub, &tv_right_tap, <=)) { -- send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 255); -- send_event(uinput_fd, EV_KEY, BTN_RIGHT, 1); -- send_event(uinput_fd, EV_SYN, 0, 0); -- send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -- send_event(uinput_fd, EV_KEY, BTN_RIGHT, 0); -- send_event(uinput_fd, EV_SYN, 0, 0); -- -- touch_str = "released and send right"; -- } else { -- send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); -- send_event(uinput_fd, EV_SYN, 0, 0); -- touch_str = "released"; -- } -- -- timerclear(&tv_last); - } - - printf("%ld.%06ld: %6d %6d %6d %s\n", samp.tv.tv_sec, samp.tv.tv_usec, - -From a5f00518cfe38002c47895424eda26746711a0da Mon Sep 17 00:00:00 2001 -From: Peter Vicman -Date: Tue, 24 Nov 2015 13:28:51 +0100 -Subject: [PATCH 11/11] ts_uinput_touch: move cursor out of display after - touched - ---- - tests/ts_uinput_touch.c | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/tests/ts_uinput_touch.c b/tests/ts_uinput_touch.c -index 92db9ce..8280b18 100644 ---- a/tests/ts_uinput_touch.c -+++ b/tests/ts_uinput_touch.c -@@ -415,6 +415,22 @@ int get_resolution(void) - return 0; - } - -+int get_touch_home_time(void) -+{ -+ char *env_str; -+ int touch_home_time = 0; -+ -+ env_str = getenv("TSLIB_TOUCH_HOME_TIME"); -+ if (env_str != NULL) { -+ touch_home_time = atoi(env_str); -+ if (touch_home_time < 0 || touch_home_time > 5000) -+ touch_home_time = 100; /* 100 msec */ -+ } -+ -+ touch_home_time *= 1000; /* msec to usec */ -+ return touch_home_time; -+} -+ - int main(int argc, char *argv[]) - { - int c; -@@ -424,11 +440,25 @@ int main(int argc, char *argv[]) - int uinput_fd; - struct uinput_user_dev uidev; - int daemon = 0; -+ int touch_home_time = 0; - char *touch_str; - int val; - struct sigaction sa; - struct sockaddr_un remote_addr; - -+ printf("\nts_uinput_touch environment variables:\n"); -+ printf(" TSLIB_TSDEVICE: '%s'\n", getenv("TSLIB_TSDEVICE")); -+ printf(" TSLIB_PLUGINDIR: '%s'\n", getenv("TSLIB_PLUGINDIR")); -+ printf(" TSLIB_CONSOLEDEVICE: '%s'\n", getenv("TSLIB_CONSOLEDEVICE")); -+ printf(" TSLIB_FBDEVICE: '%s'\n", getenv("TSLIB_FBDEVICE")); -+ printf(" TSLIB_CALIBFILE: '%s'\n", getenv("TSLIB_CALIBFILE")); -+ printf(" TSLIB_CONFFILE: '%s'\n", getenv("TSLIB_CONFFILE")); -+ printf(" TSLIB_RES_X: '%s'\n", getenv("TSLIB_RES_X")); -+ printf(" TSLIB_RES_Y: '%s'\n", getenv("TSLIB_RES_Y")); -+ printf("TSLIB_TOUCH_HOME_TIME: '%s'\n", getenv("TSLIB_TOUCH_HOME_TIME")); -+ printf("\n"); -+ -+ touch_home_time = get_touch_home_time(); - ret = get_resolution(); - - while ((c = getopt(argc, argv, "?dx:y:")) != -1) { -@@ -581,6 +611,13 @@ int main(int argc, char *argv[]) - send_event(uinput_fd, EV_ABS, ABS_PRESSURE, 0); - send_event(uinput_fd, EV_KEY, BTN_TOUCH, 0); - send_event(uinput_fd, EV_SYN, 0, 0); -+ -+ if (touch_home_time > 0) { -+ usleep(touch_home_time); /* short delay for kodi */ -+ send_event(uinput_fd, EV_ABS, ABS_X, -50); /* hide cursor */ -+ send_event(uinput_fd, EV_ABS, ABS_Y, -50); -+ send_event(uinput_fd, EV_SYN, 0, 0); -+ } - } - - printf("%ld.%06ld: %6d %6d %6d %s\n", samp.tv.tv_sec, samp.tv.tv_usec, diff --git a/packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch b/packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch deleted file mode 100644 index 9284e159ca..0000000000 --- a/packages/addons/addon-depends/tslib/patches/tslib-20-fbutils_fix_x64_execution.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c4c59790f3191c1a233fc1a61f8fedad85de1aeb Mon Sep 17 00:00:00 2001 -From: Peter Fink -Date: Wed, 8 Feb 2017 14:04:45 +0100 -Subject: [PATCH] fbutils: Fix x64 execution. Call malloc not with a hardcoded - sizeof(__u32). This caused the application to crash with segfaults on x64 - machines. - ---- - tests/fbutils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/fbutils.c b/tests/fbutils.c -index 8ee494bc..fd7fbfe9 100644 ---- a/tests/fbutils.c -+++ b/tests/fbutils.c -@@ -138,7 +138,7 @@ int open_framebuffer(void) - memset(fbuffer,0,fix.smem_len); - - bytes_per_pixel = (var.bits_per_pixel + 7) / 8; -- line_addr = malloc (sizeof (__u32) * var.yres_virtual); -+ line_addr = malloc (sizeof (line_addr) * var.yres_virtual); - addr = 0; - for (y = 0; y < var.yres_virtual; y++, addr += fix.line_length) - line_addr [y] = fbuffer + addr; diff --git a/packages/addons/addon-depends/tslib/patches/tslib-30-support-time-bits-64.patch b/packages/addons/addon-depends/tslib/patches/tslib-30-support-time-bits-64.patch deleted file mode 100644 index bc8bb0262f..0000000000 --- a/packages/addons/addon-depends/tslib/patches/tslib-30-support-time-bits-64.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/plugins/galax-raw.c 2022-07-21 15:46:14.666220340 +0000 -+++ b/plugins/galax-raw.c 2022-07-22 01:11:26.708402821 +0000 -@@ -198,7 +198,8 @@ - samp->x = i->current_x; - samp->y = i->current_y; - samp->pressure = i->current_p; -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - samp++; - total++; - break; ---- a/plugins/input-raw.c 2013-08-08 00:23:04.000000000 +0000 -+++ b/plugins/input-raw.c 2022-07-22 01:30:41.417546206 +0000 -@@ -179,7 +179,8 @@ - samp->y = i->current_y; - samp->pressure = i->current_p; - } -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - #ifdef DEBUG - fprintf(stderr, "RAW---------------------> %d %d %d %d.%d\n", - samp->x, samp->y, samp->pressure, samp->tv.tv_sec, -@@ -262,7 +263,8 @@ - samp->pressure = i->current_p = ev.value; - break; - } -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - #ifdef DEBUG - fprintf(stderr, "RAW---------------------------> %d %d %d\n", - samp->x, samp->y, samp->pressure); -@@ -278,7 +280,8 @@ - samp->x = 0; - samp->y = 0; - samp->pressure = 0; -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - samp++; - total++; - } ---- a/plugins/st1232-raw.c 2022-07-22 01:31:02.757483058 +0000 -+++ b/plugins/st1232-raw.c 2022-07-22 01:27:40.174757983 +0000 -@@ -162,7 +162,8 @@ - samp->x = i->current_x; - samp->y = i->current_y; - samp->pressure = i->current_p; /* is 0 on finger released */ -- samp->tv = ev.time; -+ samp->tv.tv_sec = ev.input_event_sec; -+ samp->tv.tv_usec = ev.input_event_usec; - - i->current_p = 0; /* will be set again when getting xy cordinate */ - samp++; diff --git a/packages/addons/addon-depends/ttyd-depends/libuv/package.mk b/packages/addons/addon-depends/ttyd-depends/libuv/package.mk index 67467e8187..0d14575fe1 100644 --- a/packages/addons/addon-depends/ttyd-depends/libuv/package.mk +++ b/packages/addons/addon-depends/ttyd-depends/libuv/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libuv" -PKG_VERSION="1.48.0" -PKG_SHA256="8c253adb0f800926a6cbd1c6576abae0bc8eb86a4f891049b72f9e5b7dc58f33" +PKG_VERSION="1.51.0" +PKG_SHA256="27e55cf7083913bfb6826ca78cde9de7647cded648d35f24163f2d31bb9f51cd" PKG_LICENSE="MIT" PKG_SITE="https://github.com/libuv/libuv" PKG_URL="https://github.com/libuv/libuv/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk index e525dcc121..d74700e310 100644 --- a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk +++ b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libwebsockets" -PKG_VERSION="4.3.3" -PKG_SHA256="6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90" +PKG_VERSION="4.4.1" +PKG_SHA256="472e6cfa77b6f80ff2cc176bc59f6cb2856df7e30e8f31afcbd1fc94ffd2f828" PKG_LICENSE="MIT" PKG_SITE="https://libwebsockets.org" PKG_URL="https://github.com/warmcat/libwebsockets/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk index 15a31123cd..aa21a65201 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-eepg" -PKG_VERSION="6be7f2ee644aa33bd6e6e038548be8a85514272e" -PKG_SHA256="f8698d8e72c4e1239a57ba4a0b2f54020270506d5dce7298f3080fcc8d59f56f" +PKG_VERSION="0.0.7" +PKG_SHA256="7ef5ffb0eb26895561215a7e24e4a33123d626c19d59cc0d1ea013c07209bc40" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg" PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/patches/vdr-plugin-eepg-PR2-fix-build-with-vdr-2-7-1.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/patches/vdr-plugin-eepg-PR2-fix-build-with-vdr-2-7-1.patch deleted file mode 100644 index 3c90edce43..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/patches/vdr-plugin-eepg-PR2-fix-build-with-vdr-2-7-1.patch +++ /dev/null @@ -1,148 +0,0 @@ -From c958894e6a4fffff58b0dc276fc978616560192d Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -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 { diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk index 2c1c6f1a95..2b66c35010 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-epgsearch" -PKG_VERSION="2.4.3" -PKG_SHA256="3824a72be529391ce26d00f0323b9d71572855c1c660bae9d30064f42366aadf" +PKG_VERSION="2.4.4" +PKG_SHA256="e64b4ce3ac706d5cb080e060b6e1a2815785819695d20d3fd05d31d0ee7dad7f" 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" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk index af90a2793b..d0519aa97b 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-iptv" -PKG_VERSION="f7369c9578c1437c7a19cf11e21424844f42a341" -PKG_SHA256="9045ec034182d19535ab3478152ef6a7fd2640478c78d697d2f2c93f11482316" +PKG_VERSION="f80cd74389576abea552311bade45363247a1c32" +PKG_SHA256="b26ac5b96f573cf405ad8a6f2fe81cced67c261fcb941f74a588f99fe2fef464" PKG_LICENSE="GPL" PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/" -PKG_URL="https://github.com/rofafor/vdr-plugin-iptv/archive/${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/Zabrimus/vdr-plugin-iptv/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr curl" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk index 0bc8b93a33..1c31f4322d 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-live" -PKG_VERSION="3.3.6" -PKG_SHA256="2dc11ab4d68ce7100d8dca8eef65bc81280e30493bd7670ec661714b2bf18211" +PKG_VERSION="3.5.1" +PKG_SHA256="364a6b0deed95bbcb41fa5360ad2c0a1fb40d3a47dae9aed78d7aae468d976b3" 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" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk index f61c906a00..91da3372d4 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-satip" -PKG_VERSION="20240720" -PKG_SHA256="2a9709bfb31a3745c18c867a543d708eddbf4c41af898555e4a0daa63a2199a7" +PKG_VERSION="20250621" +PKG_SHA256="25e91ca2cd22fdb9f445395579f39054fddab31c06982a7c5a96fa851c56067f" 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" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk index 2e690a6d7d..61e5ea6d44 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-streamdev" -PKG_VERSION="0.6.3" -PKG_SHA256="a678653dfb2641bc9dea9a1bd3b2400f3edbe697953364cf597f76d93cfaea2c" +PKG_VERSION="0.6.4" +PKG_SHA256="1698afccb5fde1ea4e40794ae187fa42ce7fc38af48c12ecd3fa1d3154c6c794" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev" PKG_URL="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch index 5be059a4aa..7e839a78a4 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-03_i18n.patch @@ -1,17 +1,17 @@ --- a/Makefile 2017-09-30 21:31:48.000000000 +0200 +++ b/Makefile 2021-01-12 23:26:57.857536391 +0100 -@@ -71,12 +71,14 @@ all: client server +@@ -70,12 +70,14 @@ all: client server client: - $(MAKE) -C ./tools - $(MAKE) -C ./client -+ $(MAKE) -C ./client install-i18n + $(Q)$(MAKE) --no-print-directory -C ./tools + $(Q)$(MAKE) --no-print-directory -C ./client ++ $(Q)$(MAKE) --no-print-directory -C ./client install-i18n server: - $(MAKE) -C ./tools - $(MAKE) -C ./libdvbmpeg - $(MAKE) -C ./remux - $(MAKE) -C ./server -+ $(MAKE) -C ./server install-i18n + $(Q)$(MAKE) --no-print-directory -C ./tools + $(Q)$(MAKE) --no-print-directory -C ./libdvbmpeg + $(Q)$(MAKE) --no-print-directory -C ./remux + $(Q)$(MAKE) --no-print-directory -C ./server ++ $(Q)$(MAKE) --no-print-directory -C ./server install-i18n install-client: client - $(MAKE) -C ./client install + $(Q)$(MAKE) --no-print-directory -C ./client install diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk index 54fc774808..fc3235048b 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-vnsiserver" -PKG_VERSION="47a90dd9298753083a9a6482bb9990ea9a88aa7a" -PKG_SHA256="cd8087306dc5d77b150ca9f77bba91460507dc9a2336b9f61ce13aeefecf23e3" +PKG_VERSION="65bfc62b16ffd278f40eb35a749fb3d1f467e112" +PKG_SHA256="e34533c0aed3f6e1dac3bfb608509df532089736ff04632d762438d796d339db" PKG_LICENSE="GPL" -PKG_SITE="https://github.com/mdre77/vdr-plugin-vnsiserver" -PKG_URL="https://github.com/mdre77/vdr-plugin-vnsiserver/archive/${PKG_VERSION}.tar.gz" +PKG_SITE="https://github.com/vdr-projects/vdr-plugin-vnsiserver" +PKG_URL="https://github.com/vdr-projects/vdr-plugin-vnsiserver/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_DEPENDS_UNPACK="vdr-plugin-wirbelscan" PKG_NEED_UNPACK="$(get_pkg_directory vdr) $(get_pkg_directory vdr-plugin-wirbelscan)" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk index 9b563c2058..dcf13af746 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-xmltv2vdr" -PKG_VERSION="0.2.3" -PKG_SHA256="e543f2ce175960a6664d6c06dd3c9dc89c15599e144c0c8551efd66368293579" +PKG_VERSION="0.2.4" +PKG_SHA256="6ed8886f5f6fc97b136cbe26e380ed3a8083300318db934e001a4918617a9785" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr" PKG_URL="https://github.com/vdr-projects/vdr-plugin-xmltv2vdr/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch deleted file mode 100644 index 6e5879c2c8..0000000000 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-04-fixed-import-for-vdr-2-7-1.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ee9769b5746240247c3a01f4000afdf8fc56857 Mon Sep 17 00:00:00 2001 -From: joed74 -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(), diff --git a/packages/addons/addon-depends/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk index 0444b7c2bf..78880f0e41 100644 --- a/packages/addons/addon-depends/vdr/package.mk +++ b/packages/addons/addon-depends/vdr/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr" -PKG_VERSION="2.7.1" -PKG_SHA256="ae3010a5297891f55b3d11b19fe15cd868f24250da8554e985ab163e19d98026" +PKG_VERSION="2.7.7" +PKG_SHA256="f0d8d30b6a8012f6838eaaf9c337b7352bfac67f1cea6342b9c685e8df88c856" 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" diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index b1b10875e5..182ea26818 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -4,7 +4,7 @@ PKG_NAME="chrome" PKG_VERSION="1.0" # curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version -PKG_VERSION_NUMBER="126.0.6478.126" +PKG_VERSION_NUMBER="138.0.7204.92" PKG_REV="0" PKG_ARCH="x86_64" PKG_LICENSE="Custom" diff --git a/packages/addons/service/docker/config/docker.conf b/packages/addons/service/docker/config/docker.conf new file mode 100644 index 0000000000..acc6e63df4 --- /dev/null +++ b/packages/addons/service/docker/config/docker.conf @@ -0,0 +1,2 @@ +DOCKER_DAEMON_OPTS="--data-root=/storage/docker" +DOCKER_STORAGE_OPTS="--storage-driver=overlay2" diff --git a/packages/addons/service/docker/lib/dockermon.py b/packages/addons/service/docker/lib/dockermon.py new file mode 100755 index 0000000000..2a973bc355 --- /dev/null +++ b/packages/addons/service/docker/lib/dockermon.py @@ -0,0 +1,161 @@ +#!/usr/bin/env python +"""docker monitor using docker /events HTTP streaming API""" +"""https://github.com/CyberInt/dockermon""" + +from contextlib import closing +from functools import partial +from socket import socket, AF_UNIX, timeout +from subprocess import Popen, PIPE +from sys import stdout, version_info +import json +import shlex + +if version_info[:2] < (3, 0): + from httplib import OK as HTTP_OK + from urlparse import urlparse +else: + from http.client import OK as HTTP_OK + from urllib.parse import urlparse + +__version__ = '0.2.2' +# buffer size must be 256 or lower otherwise events won't show in realtime +bufsize = 256 +default_sock_url = 'ipc:///var/run/docker.sock' + + +class DockermonError(Exception): + pass + + +def read_http_header(sock): + """Read HTTP header from socket, return header and rest of data.""" + buf = [] + hdr_end = '\r\n\r\n' + + while True: + buf.append(sock.recv(bufsize).decode('utf-8')) + data = ''.join(buf) + i = data.find(hdr_end) + if i == -1: + continue + return data[:i], data[i + len(hdr_end):] + + +def header_status(header): + """Parse HTTP status line, return status (int) and reason.""" + status_line = header[:header.find('\r')] + # 'HTTP/1.1 200 OK' -> (200, 'OK') + fields = status_line.split(None, 2) + return int(fields[1]), fields[2] + + +def connect(url): + """Connect to UNIX or TCP socket. + + url can be either tcp://:port or ipc:// + """ + url = urlparse(url) + if url.scheme == 'tcp': + sock = socket() + netloc = tuple(url.netloc.rsplit(':', 1)) + hostname = socket.gethostname() + elif url.scheme == 'ipc': + sock = socket(AF_UNIX) + netloc = url.path + hostname = 'localhost' + else: + raise ValueError('unknown socket type: %s' % url.scheme) + + sock.connect(netloc) + return sock, hostname + + +def watch(callback, url=default_sock_url, run=None): + """Watch docker events. Will call callback with each new event (dict). + + url can be either tcp://:port or ipc:// + """ + sock, hostname = connect(url) + if run: + sock.settimeout(1.5) + request = 'GET /events HTTP/1.1\nHost: %s\n\n' % hostname + request = request.encode('utf-8') + + with closing(sock): + sock.sendall(request) + header, payload = read_http_header(sock) + status, reason = header_status(header) + if status != HTTP_OK: + raise DockermonError('bad HTTP status: %s %s' % (status, reason)) + + # Messages are \r\n\r\n + buf = [payload] + while True: + try: + chunk = sock.recv(bufsize) + except timeout: + if run(): + continue + if run and not run(): + raise DockermonError('stopped') + if not chunk: + raise EOFError('socket closed') + buf.append(chunk.decode('utf-8')) + data = ''.join(buf) + i = data.find('\r\n') + if i == -1: + continue + + size = int(data[:i], 16) + start = i + 2 # Skip initial \r\n + + if len(data) < start + size + 2: + continue + payload = data[start:start+size] + callback(json.loads(payload)) + buf = [data[start+size+2:]] # Skip \r\n suffix + + +def print_callback(msg): + """Print callback, prints message to stdout as JSON in one line.""" + json.dump(msg, stdout) + stdout.write('\n') + stdout.flush() + + +def prog_callback(prog, msg): + """Program callback, calls prog with message in stdin""" + pipe = Popen(prog, stdin=PIPE) + data = json.dumps(msg) + pipe.stdin.write(data.encode('utf-8')) + pipe.stdin.close() + + +if __name__ == '__main__': + from argparse import ArgumentParser + + parser = ArgumentParser(description=__doc__) + parser.add_argument('--prog', default=None, + help='program to call (e.g. "jq --unbuffered .")') + parser.add_argument( + '--socket-url', default=default_sock_url, + help='socket url (ipc:///path/to/sock or tcp:///host:port)') + parser.add_argument( + '--version', help='print version and exit', + action='store_true', default=False) + args = parser.parse_args() + + if args.version: + print('dockermon %s' % __version__) + raise SystemExit + + if args.prog: + prog = shlex.split(args.prog) + callback = partial(prog_callback, prog) + else: + callback = print_callback + + try: + watch(callback, args.socket_url) + except (KeyboardInterrupt, EOFError): + pass diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 3bc1fd70e4..55b4240249 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2017 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" @@ -7,7 +6,7 @@ PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" -PKG_DEPENDS_TARGET="cli containerd ctop moby runc tini" +PKG_DEPENDS_TARGET="cli containerd ctop docker-compose moby runc tini" PKG_SECTION="service/system" PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere." PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above." @@ -29,7 +28,6 @@ addon() { # containerd cp -P $(get_build_dir containerd)/bin/containerd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd - cp -P $(get_build_dir containerd)/bin/containerd-shim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim cp -P $(get_build_dir containerd)/bin/containerd-shim-runc-v2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim-runc-v2 # ctop @@ -45,3 +43,40 @@ addon() { post_install_addon() { sed -e "s/@DISTRO_PKG_SETTINGS_ID@/${DISTRO_PKG_SETTINGS_ID}/g" -i "${INSTALL}/default.py" } + +post_makeinstall_target() { + mkdir -p ${INSTALL}/etc + # docker.conf + cp -P ${PKG_DIR}/config/docker.conf ${INSTALL}/etc + + mkdir -p ${INSTALL}/usr/bin + # dockermon.py + cp -P ${PKG_DIR}/lib/dockermon.py ${INSTALL}/usr/bin/dockermon + + # cli + cp -P $(get_build_dir cli)/bin/docker ${INSTALL}/usr/bin + + # moby + cp -P $(get_build_dir moby)/bin/dockerd ${INSTALL}/usr/bin + cp -P $(get_build_dir moby)/bin/docker-proxy ${INSTALL}/usr/bin/docker-proxy + + # containerd + cp -P $(get_build_dir containerd)/bin/containerd ${INSTALL}/usr/bin/containerd + cp -P $(get_build_dir containerd)/bin/containerd-shim-runc-v2 ${INSTALL}/usr/bin/containerd-shim-runc-v2 + + # ctop + cp -P $(get_build_dir ctop)/bin/ctop ${INSTALL}/usr/bin/ctop + + # docker-compose + cp -P $(get_build_dir docker-compose)/docker-compose ${INSTALL}/usr/bin/docker-compose + + # runc + cp -P $(get_build_dir runc)/bin/runc ${INSTALL}/usr/bin/runc + + # tini + cp -P $(get_build_dir tini)/.${TARGET_NAME}/tini-static ${INSTALL}/usr/bin/docker-init +} + +post_install() { + enable_service docker.service +} diff --git a/packages/addons/service/docker/source/bin/docker-config b/packages/addons/service/docker/source/bin/docker-config index 1b1d133d29..ca3d9b237f 100755 --- a/packages/addons/service/docker/source/bin/docker-config +++ b/packages/addons/service/docker/source/bin/docker-config @@ -1,8 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) -# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) +# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) ADDON_DIR="/storage/.kodi/addons/service.system.docker" ADDON_HOME_DIR="/storage/.kodi/userdata/addon_data/service.system.docker" diff --git a/packages/addons/service/docker/source/default.py b/packages/addons/service/docker/source/default.py index dbc5ca8bd3..3cf2014424 100644 --- a/packages/addons/service/docker/source/default.py +++ b/packages/addons/service/docker/source/default.py @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) import os @@ -10,7 +9,7 @@ import xbmc import xbmcaddon import xbmcgui -__author__ = 'lrusak' +__author__ = 'LibreELEC' __addon__ = xbmcaddon.Addon() __path__ = __addon__.getAddonInfo('path') diff --git a/packages/addons/service/docker/system.d/docker.service b/packages/addons/service/docker/system.d/docker.service new file mode 100644 index 0000000000..61008ba6b7 --- /dev/null +++ b/packages/addons/service/docker/system.d/docker.service @@ -0,0 +1,23 @@ +[Unit] +Description=Docker Application Container Engine +Documentation=https://docs.docker.com +After=network.target + +[Service] +Type=notify +EnvironmentFile=-/etc/docker.conf +ExecStart=/usr/bin/dockerd --exec-opt native.cgroupdriver=systemd \ + --log-driver=journald \ + --group=root \ + $DOCKER_DAEMON_OPTS \ + $DOCKER_STORAGE_OPTS +ExecReload=/bin/kill -s HUP $MAINPID +TasksMax=8192 +LimitNOFILE=1048576 +LimitNPROC=1048576 +LimitCORE=infinity +TimeoutStartSec=0 +Restart=on-abnormal + +[Install] +WantedBy=multi-user.target diff --git a/packages/addons/service/docker/tmpfiles.d/z_05_docker.conf b/packages/addons/service/docker/tmpfiles.d/z_05_docker.conf new file mode 100644 index 0000000000..b5c233efef --- /dev/null +++ b/packages/addons/service/docker/tmpfiles.d/z_05_docker.conf @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv) + +d /storage/docker 0755 root root - - diff --git a/packages/addons/service/filebrowser/package.mk b/packages/addons/service/filebrowser/package.mk index 98d9452867..35368824a5 100644 --- a/packages/addons/service/filebrowser/package.mk +++ b/packages/addons/service/filebrowser/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="filebrowser" -PKG_VERSION="2.27.0" +PKG_VERSION="2.41.0" PKG_REV="0" PKG_LICENSE="Apache License 2.0" PKG_SITE="https://filebrowser.org" @@ -15,15 +15,15 @@ PKG_TOOLCHAIN="manual" case "${ARCH}" in "aarch64") - PKG_SHA256="fe68b8f95f9eba2069fe337c7f062bab6da5673f4153c0716a0834caebf261a6" + PKG_SHA256="3d6dc3406ce57b40f7339d166c007b9dedc2aefe533a759f4dedd3ea7680b378" PKG_URL="https://github.com/filebrowser/filebrowser/releases/download/v${PKG_VERSION}/linux-arm64-filebrowser.tar.gz" ;; "arm") - PKG_SHA256="82e79ff7d7aa79ade729fc7ac6e20d7bd8afc7c7cca1f4b794b65ee751347472" + PKG_SHA256="1a1709ca3abf37112593d2ceba8343f5670a4bcfabaaf613efb990887272caae" PKG_URL="https://github.com/filebrowser/filebrowser/releases/download/v${PKG_VERSION}/linux-armv7-filebrowser.tar.gz" ;; "x86_64") - PKG_SHA256="95d5add44820c6f6bf03a1aa063c618f8f242f53b892c1665dc066b4e037ba80" + PKG_SHA256="57f2f25d627aeadead69112d230c25d30c48417ce30f52578fcc59bb21439d17" PKG_URL="https://github.com/filebrowser/filebrowser/releases/download/v${PKG_VERSION}/linux-amd64-filebrowser.tar.gz" ;; esac diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index 279710ddd1..28a9f764c3 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="hyperion" diff --git a/packages/addons/service/hyperion/source/bin/hyperiond.start b/packages/addons/service/hyperion/source/bin/hyperiond.start index f9aac15adb..c1cb3388cb 100644 --- a/packages/addons/service/hyperion/source/bin/hyperiond.start +++ b/packages/addons/service/hyperion/source/bin/hyperiond.start @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) +# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv) . /etc/profile diff --git a/packages/addons/service/hyperion/source/default.py b/packages/addons/service/hyperion/source/default.py index 6121a93630..7c285c0bb9 100644 --- a/packages/addons/service/hyperion/source/default.py +++ b/packages/addons/service/hyperion/source/default.py @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) +# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv) import xbmc diff --git a/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch b/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch index 999ceeeb31..64f83f9204 100644 --- a/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch +++ b/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch @@ -141,7 +141,7 @@ index 0000000..56f9219 + p->gFlags = 0; + p->gDisplayMode = VFD_MODE_NONE; + -+ if ((p->framebuf = (char *) calloc(1, p->height)) == NULL) ++ if ((p->framebuf = (char **) calloc(1, p->height)) == NULL) + { + report(RPT_CRIT, "Allocating memory for framebuffer Failed\n"); + return -1; @@ -362,7 +362,7 @@ new file mode 100644 index 0000000..0bb565c --- /dev/null +++ b/server/drivers/led.c -@@ -0,0 +1,1065 @@ +@@ -0,0 +1,1066 @@ +/* File modified by Henrik Larsson 2007 to interface with LCDproc API + */ + @@ -394,6 +394,7 @@ index 0000000..0bb565c +#include "libvfd.h" +#include "shared/report.h" +#include "dm140.h" ++#include "led.h" + + +//************************************************************** diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 5dff52eee9..df7ddcf36b 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -3,15 +3,15 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librespot" -PKG_VERSION="299b7dec20b45b9fa19a4a46252079e8a8b7a8ba" -PKG_VERSION_DATE="2023-12-06" -PKG_SHA256="3699d2f15065222a769e57fec22b51e3d355c2d9837b49c3ec3ef16d2ace4b35" +PKG_VERSION="5981b88ac50876d86c882c2cf817dfe1d0427208" +PKG_VERSION_DATE="2025-04-01" +PKG_SHA256="0a8a7412894d856907bc1d50b65765841516c5730a32e08d882126da3e7f2b3e" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/librespot-org/librespot/" PKG_URL="https://github.com/librespot-org/librespot/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain alsa-lib avahi pulseaudio cargo:host" +PKG_DEPENDS_TARGET="toolchain alsa-lib avahi pulseaudio bindgen-cli:host cargo:host cmake:host" PKG_SECTION="service" PKG_SHORTDESC="Librespot: play Spotify through Kodi using a Spotify app as a remote" PKG_LONGDESC="Librespot (${PKG_VERSION_DATE}) lets you play Spotify through Kodi using a Spotify app as a remote." @@ -23,6 +23,12 @@ PKG_ADDON_TYPE="xbmc.service" PKG_MAINTAINER="Anton Voyl (awiouy)" make_target() { + # build of the crate aws-lc-rs fails when CMAKE is set. Set the required toolchain. + unset CMAKE + export CMAKE_TOOLCHAIN_FILE="${CMAKE_CONF}" + export CMAKE_INSTALL_PREFIX="/usr" + + export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${SYSROOT_PREFIX}" export RUSTC_LINKER=${CC} cargo build \ --target ${TARGET_NAME} \ diff --git a/packages/addons/service/librespot/source/bin/onevent.py b/packages/addons/service/librespot/source/bin/onevent.py deleted file mode 100644 index ec0151506e..0000000000 --- a/packages/addons/service/librespot/source/bin/onevent.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/python -import json -import os -import socket - -ADDRESS = ('127.0.0.1', 36963) -BUFFER_SIZE = 1024 - - -def send_event(event): - data = json.dumps(event).encode() - with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: - sock.sendto(data, ADDRESS) - - -def receive_event(): - with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: - sock.settimeout(None) - sock.bind(ADDRESS) - while True: - data, addr = sock.recvfrom(BUFFER_SIZE) - event = json.loads(data.decode()) - if not event: - break - yield event - - -ARG_ALBUM = 'album' -ARG_ARTIST = 'artist' -ARG_ART = 'art' -ARG_TITLE = 'title' - -KEY_ALBUM = 'ALBUM' -KEY_ARTISTS = 'ARTISTS' -KEY_COVERS = 'COVERS' -KEY_ITEM_TYPE = 'ITEM_TYPE' -KEY_NAME = 'NAME' -KEY_PLAYER_EVENT = 'PLAYER_EVENT' -KEY_SHOW_NAME = 'SHOW_NAME' - -PLAYER_EVENT_STOPPED = 'stopped' -PLAYER_EVENT_TRACK_CHANGED = 'track_changed' - -ITEM_TYPE_EPISODE = 'Episode' -ITEM_TYPE_TRACK = 'Track' - - -def get_env_value(key): - return os.environ.get(key, '').partition('\n')[0] - - -if __name__ == '__main__': - player_event = get_env_value(KEY_PLAYER_EVENT) - event = {KEY_PLAYER_EVENT: player_event} - if player_event == PLAYER_EVENT_STOPPED: - send_event(event) - elif player_event == PLAYER_EVENT_TRACK_CHANGED: - event[ARG_ART] = get_env_value(KEY_COVERS) - event[ARG_TITLE] = get_env_value(KEY_NAME) - item_type = get_env_value(KEY_ITEM_TYPE) - if item_type == ITEM_TYPE_EPISODE: - event[ARG_ALBUM] = get_env_value(KEY_SHOW_NAME) - elif item_type == ITEM_TYPE_TRACK: - event[ARG_ALBUM] = get_env_value(KEY_ALBUM) - event[ARG_ARTIST] = get_env_value(KEY_ARTISTS) - send_event(event) diff --git a/packages/addons/service/librespot/source/default.py b/packages/addons/service/librespot/source/default.py index 01c1dcde58..acdb5c41e5 100644 --- a/packages/addons/service/librespot/source/default.py +++ b/packages/addons/service/librespot/source/default.py @@ -1,25 +1,8 @@ import os import sys -import xbmcaddon -import xbmcvfs +sys.path.append(os.path.join(os.path.dirname(__file__), "resources", "lib")) -def _set_home(): - home = xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo('profile')) - os.makedirs(home, exist_ok=True) - os.chdir(home) +import monitor - -def _set_paths(): - path = xbmcaddon.Addon().getAddonInfo('path') - os.environ['PATH'] += os.pathsep + os.path.join(path, 'bin') - os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.path.join(path, 'lib') - sys.path.append(os.path.join(path, 'bin')) - sys.path.append(os.path.join(path, 'resources', 'lib')) - - -if __name__ == '__main__': - _set_home() - _set_paths() - import service - service.Monitor().run() +monitor.run() diff --git a/packages/addons/service/librespot/source/resources/language/English/strings.po b/packages/addons/service/librespot/source/resources/language/English/strings.po index 8a12a179c3..00361273ba 100644 --- a/packages/addons/service/librespot/source/resources/language/English/strings.po +++ b/packages/addons/service/librespot/source/resources/language/English/strings.po @@ -16,11 +16,11 @@ msgid "Do not disturb Kodi" msgstr "" msgctxt "#30103" -msgid "User options" +msgid "Backend" msgstr "" msgctxt "#30104" -msgid "Backend" +msgid "Player" msgstr "" msgctxt "#30105" diff --git a/packages/addons/service/librespot/source/resources/lib/event_handler.py b/packages/addons/service/librespot/source/resources/lib/event_handler.py new file mode 100644 index 0000000000..ef2695337a --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/event_handler.py @@ -0,0 +1,49 @@ +import json +import socket +import threading + +import onevent +import utils + +_BUFFER = 1024 + + +class EventHandler: + @utils.logged_method + def __init__(self, target): + self._target = target + self._socket = socket.socket(onevent.SOCK_AF, onevent.SOCK_TYPE) + self._socket.settimeout(None) + self._socket.bind((onevent.HOST, 0)) + self._port = self._socket.getsockname()[1] + self._receiver = threading.Thread(target=self._handle_events) + self._receiver.start() + + @utils.logged_method + def __enter__(self): + return self + + @utils.logged_method + def __exit__(self, *_): + onevent.send_event(self._port) + self._receiver.join() + + def _handle_events(self): + utils.log(f"Event handler listening on port {self._port}") + with self._socket: + while True: + data, _ = self._socket.recvfrom(_BUFFER) + event, dict = json.loads(data) + if event: + try: + utils.log(f"Event handler handling {event}{dict}") + method = f"on_event_{event}" + getattr(self._target, method)(**dict) + except Exception as e: + utils.log(f"Event handler failed to handle {event}: {e}") + else: + break + utils.log("Event handler ended") + + def get_onevent(self): + return f"python {onevent.__file__} {self._port}" diff --git a/packages/addons/service/librespot/source/resources/lib/external_player.py b/packages/addons/service/librespot/source/resources/lib/external_player.py deleted file mode 100644 index 3fd6714295..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/external_player.py +++ /dev/null @@ -1,8 +0,0 @@ -import player -import service - - -class Player(player.Player): - - def onLibrespotTrackChanged(self, art, artist, title, **kwargs): - service.notification(heading=title, message=artist, icon=art) diff --git a/packages/addons/service/librespot/source/resources/lib/internal_player.py b/packages/addons/service/librespot/source/resources/lib/internal_player.py deleted file mode 100644 index 0636e92fd8..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/internal_player.py +++ /dev/null @@ -1,34 +0,0 @@ -import xbmc -import xbmcgui - -import player -import service - - -class Player(player.Player): - - def __init__(self, codec='pcm_sb16be', max_fanarts='10', **kwargs): - super().__init__(**kwargs) - self._max_fanarts = int(max_fanarts) - self._list_item = xbmcgui.ListItem(path=self.librespot.file) - self._list_item.getVideoInfoTag().addAudioStream(xbmc.AudioStreamDetail(2, codec)) - self._music_info_tag = self._list_item.getMusicInfoTag() - - def onLibrespotTrackChanged(self, album='', art='', artist='', title=''): - fanart = service.get_fanart(art, self._max_fanarts) if art else art - self._list_item.setArt({'fanart': fanart, 'thumb': art}) - self._music_info_tag.setAlbum(album) - self._music_info_tag.setArtist(artist) - self._music_info_tag.setTitle(title) - if self.isPlaying() and self.getPlayingFile() == self.librespot.file: - self.updateInfoTag(self._list_item) - else: - self.stop() # fixes unepxected behaviour of Player.play() - self.librespot.start_sink() - self.play(self.librespot.file, listitem=self._list_item) - - def onLibrespotStopped(self): - self.librespot.stop_sink() - if self.isPlaying() and self.getPlayingFile() == self.librespot.file: - self.last_file = None - self.stop() diff --git a/packages/addons/service/librespot/source/resources/lib/librespot.py b/packages/addons/service/librespot/source/resources/lib/librespot.py index 983b83a7c3..db8b35c7dd 100644 --- a/packages/addons/service/librespot/source/resources/lib/librespot.py +++ b/packages/addons/service/librespot/source/resources/lib/librespot.py @@ -1,93 +1,78 @@ -import shlex import socket import subprocess import threading -import external_player -import internal_player -import service +import utils class Librespot: - - def __init__(self, - bitrate='320', - device_type='tv', - max_retries='5', - name='Librespot@{}', - options='', - **kwargs): - name = name.format(socket.gethostname()) - self.command = [ - 'librespot', - '--bitrate', f'{bitrate}', - '--device-type', f'{device_type}', - '--disable-audio-cache', - '--disable-credential-cache', - '--name', f'{name}', - '--onevent', 'onevent.py', - '--quiet', - ] + shlex.split(options) - service.log(self.command) - self.file = '' - self._is_started = threading.Event() - self._is_stopped = threading.Event() + @utils.logged_method + def __init__(self, target, backend, device): + self._target = target + name = utils.get_setting("name").format(socket.gethostname()) + self._command = [ + "librespot", + "--backend", backend, + "--bitrate", "320", + "--device", device, + "--device-type", "tv", + "--disable-audio-cache", + "--disable-credential-cache", + "--name", name, + "--onevent", target.event_handler.get_onevent(), + "--quiet", + ] + self._failures = 0 + self._max_failures = 5 self._librespot = None - self._max_retries = int(max_retries) - self._retries = 0 - self._thread = threading.Thread() - - def get_player(self, **kwargs): - return (internal_player if self.file else external_player).Player(**kwargs) - - def restart(self): - if self._thread.is_alive(): - self._librespot.terminate() - else: - self.start() - - def start(self): - if not self._thread.is_alive() and self._retries < self._max_retries: - self._thread = threading.Thread(daemon=True, target=self._run) - self._thread.start() - self._is_started.wait(1) - - def stop(self): - if self._thread.is_alive(): - self._is_stopped.set() - self._librespot.terminate() - self._thread.join() - - def start_sink(self): - pass - - def stop_sink(self): - pass - - def _run(self): - service.log('librespot thread started') - self._is_started.clear() - self._is_stopped.clear() - while not self._is_stopped.is_set(): - with subprocess.Popen(self.command, stderr=subprocess.PIPE, text=True) as self._librespot: - self._is_started.set() - for line in self._librespot.stderr: - service.log(line.rstrip()) - self.stop_sink() - if self._librespot.returncode <= 0: - self._retries = 0 - else: - self._retries += 1 - if self._retries < self._max_retries: - service.notification( - f'librespot failed {self._retries}/{self._max_retries}') - else: - service.notification('librespot failed too many times') - break - service.log('librespot thread stopped') + self._get_librespot = self._schedule_librespot() + @utils.logged_method def __enter__(self): return self - def __exit__(self, *args): - self.stop() + @utils.logged_method + def __exit__(self, *_): + self._get_librespot.close() + + def _schedule_librespot(self): + while self._failures < self._max_failures: + with subprocess.Popen( + self._command, stderr=subprocess.PIPE, text=True + ) as self._librespot: + threading.Thread(target=self._monitor_librespot).start() + try: + yield + finally: + self._librespot.terminate() + utils.call_if_has(self._target, "on_librespot_broken") + utils.log("Librespot crashed too many times", True) + self._librespot = None + while True: + yield + + def _monitor_librespot(self): + self._target.on_librespot_started() + with self._librespot as librespot: + for line in librespot.stderr: + utils.log(line.rstrip()) + self._target.on_librespot_stopped() + if librespot.returncode < 0: + self._failures = 0 + else: + self._failures += 1 + next(self._get_librespot) + + @utils.logged_method + def restart(self): + next(self._get_librespot) + + @utils.logged_method + def start(self): + if self._librespot is None or self._librespot.poll() is not None: + next(self._get_librespot) + + @utils.logged_method + def stop(self): + if self._librespot is not None: + self._librespot.terminate() diff --git a/packages/addons/service/librespot/source/resources/lib/librespot_alsa.py b/packages/addons/service/librespot/source/resources/lib/librespot_alsa.py deleted file mode 100644 index 6b1446bdbe..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/librespot_alsa.py +++ /dev/null @@ -1,11 +0,0 @@ -import librespot - - -class Librespot(librespot.Librespot): - - def __init__(self, alsa_device='hw:2,0', **kwargs): - super().__init__(**kwargs) - self.command += [ - '--backend', 'alsa', - '--device', f'{alsa_device}', - ] diff --git a/packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py b/packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py deleted file mode 100644 index 6b1a79a46a..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py +++ /dev/null @@ -1,73 +0,0 @@ -import socket -import subprocess - -import librespot -import service - - -class Librespot(librespot.Librespot): - - def __init__(self, - codec='pcm_sb16be', - pa_rtp_address='127.0.0.1', - pa_rtp_device='librespot', - pa_rtp_port='24642', - **kwargs): - service.log('pulseaudio backend started') - sap_cmd = f'nc -l -u -s {pa_rtp_address} -p 9875'.split() - self._sap_server = subprocess.Popen(sap_cmd, - stdout=subprocess.DEVNULL, - stderr=subprocess.STDOUT) - service.log(f'sap server started') - if not pa_rtp_port: - with socket.socket() as s: - s.bind((pa_rtp_address, 0)) - pa_rtp_port = s.getsockname()[1] - modules = [ - [ - f'module-null-sink', - f'sink_name={pa_rtp_device}', - ], - [ - f'module-rtp-send', - f'destination_ip={pa_rtp_address}', - f'inhibit_auto_suspend=always', - f'port={pa_rtp_port}', - f'source={pa_rtp_device}.monitor', - ], - ] - self._modules = [self._pactl('load-module', *m) for m in modules] - self._sink_name = f'{pa_rtp_device}' - self.stop_sink() - service.log(f'pulseaudio modules loaded: {self._modules}') - super().__init__(**kwargs) - self.command += [ - '--backend', 'pulseaudio', - '--device', f'{pa_rtp_device}', - ] - self.file = f'rtp://{pa_rtp_address}:{pa_rtp_port}' - - def start_sink(self): - self._pactl('suspend-sink', self._sink_name, '0') - - def stop_sink(self): - self._pactl('suspend-sink', self._sink_name, '1') - - def _pactl(self, command, *args): - out = subprocess.run(['pactl', command, *args], - stdout=subprocess.PIPE, - text=True - ).stdout.rstrip() - service.log(f'pactl {command} {args}: {out}') - return out - - def __exit__(self, *args): - super().__exit__(*args) - for module in reversed(self._modules): - if module: - self._pactl('unload-module', module) - service.log('pulseaudio backend stopped') - if self._sap_server.poll() is None: - self._sap_server.terminate() - self._sap_server.wait() - service.log('sap server stopped') diff --git a/packages/addons/service/librespot/source/resources/lib/monitor.py b/packages/addons/service/librespot/source/resources/lib/monitor.py new file mode 100644 index 0000000000..cb6ad74b05 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/monitor.py @@ -0,0 +1,33 @@ +import xbmc + +import service +import service_pulseaudio +import utils + + +def _get_service(): + while True: + backend = utils.get_setting("backend") + match backend: + case "alsa": + alsa_device = utils.get_setting("alsa_device") + service_ = service.Service(backend, alsa_device) + case _: + service_ = service_pulseaudio.Service() + yield from service_.run() + + +class _Monitor(xbmc.Monitor): + @utils.logged_method + def __init__(self): + super().__init__() + self._service = _get_service() + next(self._service) + + @utils.logged_method + def onSettingsChanged(self): + next(self._service) + + +def run(): + _Monitor().waitForAbort() diff --git a/packages/addons/service/librespot/source/resources/lib/onevent.py b/packages/addons/service/librespot/source/resources/lib/onevent.py new file mode 100644 index 0000000000..49b442ec78 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/onevent.py @@ -0,0 +1,56 @@ +import json +import os +import socket +import sys +import time + +HOST = "127.0.0.1" +SOCK_AF = socket.AF_INET +SOCK_TYPE = socket.SOCK_DGRAM + + +def _get(key): + return os.environ.get(key, "") + + +def _get_first(key): + return os.environ.get(key, "").partition("\n")[0] + + +def _get_time(key): + return int(os.environ.get(key, "0")) / 1000 + + +def _on_event(): + event = _get("PLAYER_EVENT") + dict = {} + if event in ["paused", "playing", "position_correction", "seeked"]: + dict["position"] = _get_time("POSITION_MS") + dict["then"] = time.time() + elif event == "track_changed": + dict["art"] = _get_first("COVERS") + dict["duration"] = round(_get_time("DURATION_MS")) + dict["title"] = _get("NAME") + item_type = _get("ITEM_TYPE") + match item_type: + case "Track": + dict["album"] = _get("ALBUM") + dict["artist"] = _get_first("ARTISTS") + case "Episode": + dict["album"] = _get("SHOW_NAME") + elif event == "stopped": + pass + else: + return + port = int(sys.argv[1]) + send_event(port, event, dict) + + +def send_event(port, event="", dict={}): + data = json.dumps([event, dict]).encode() + with socket.socket(SOCK_AF, SOCK_TYPE) as sock: + sock.sendto(data, (HOST, port)) + + +if __name__ == "__main__": + _on_event() diff --git a/packages/addons/service/librespot/source/resources/lib/player.py b/packages/addons/service/librespot/source/resources/lib/player.py index 6ed93dab1e..405ace106c 100644 --- a/packages/addons/service/librespot/source/resources/lib/player.py +++ b/packages/addons/service/librespot/source/resources/lib/player.py @@ -1,71 +1,82 @@ -import threading import xbmc -import onevent -import service +import utils class Player(xbmc.Player): + @utils.logged_method + def __init__(self, target, file, librespot): + self._target = target + self.file = file + self._librespot = librespot + self._dnd_kodi = utils.get_setting("dnd_kodi") == "true" + self._was_playing_file = False + if not self._dnd_kodi or not self.isPlaying(): + self._librespot.start() - def __init__(self, dnd_kodi='false', librespot=None, **kwargs): - super().__init__() - self._dnd_kodi = (dnd_kodi == 'true') - self._thread = threading.Thread(daemon=True, target=self._run) - self._thread.start() - self.last_file = None - self.librespot = librespot - if not (self._dnd_kodi and self.isPlaying()): - self.librespot.start() - - def onAVStarted(self): - file = self.getPlayingFile() - if file != self.librespot.file: - if self._dnd_kodi: - self.librespot.stop() - elif self.last_file == self.librespot.file: - self.librespot.restart() - self.last_file = file - - def onLibrespotStopped(self): - pass - - def onLibrespotTrackChanged(self, album='', art='', artist='', title=''): - pass - - def onPlayBackEnded(self): - if self.last_file == self.librespot.file: - self.librespot.restart() + def _on_playback_ended(self): + was_playing_file = self._was_playing_file + self._was_playing_file = False + if was_playing_file: + self._librespot.restart() else: - self.librespot.start() - self.last_file = None + self._librespot.start() + def is_playing_file(self): + return self.isPlaying() and self.getPlayingFile() == self.file + + @utils.logged_method + def onAVStarted(self): + if self.is_playing_file(): + self._was_playing_file = True + self.on_playback_started() + else: + self._was_playing_file = False + if self._dnd_kodi: + self._librespot.stop() + else: + self._librespot.start() + + @utils.logged_method + def onPlayBackEnded(self): + self._on_playback_ended() + + @utils.logged_method def onPlayBackError(self): - self.onPlayBackEnded() + self._on_playback_ended() + @utils.logged_method def onPlayBackStopped(self): - self.onPlayBackEnded() + self._on_playback_ended() - # fixes unexpected behaviour of Player.stop() - def stop(self): - xbmc.executebuiltin('PlayerControl(Stop)') + def on_playback_started(self): + pass - def _run(self): - service.log('onevent dispatcher started') - for event in onevent.receive_event(): - try: - player_event = event.pop(onevent.KEY_PLAYER_EVENT) - if player_event == onevent.PLAYER_EVENT_STOPPED: - self.onLibrespotStopped() - elif player_event == onevent.PLAYER_EVENT_TRACK_CHANGED: - self.onLibrespotTrackChanged(**event) - except Exception as e: - service.log(e, True) - service.log('onevent dispatcher stopped') + def do_paused(self, **_): + pass - def __enter__(self): - return self + def do_playing(self, **_): + pass - def __exit__(self, *args): - onevent.send_event({}) - self._thread.join() - self.onLibrespotStopped() + def do_position_correction(self, **_): + pass + + def do_seeked(self, **_): + pass + + @utils.logged_method + def do_stopped(self, **_): + if self._was_playing_file: + self._was_playing_file = False + self.stop() + + @utils.logged_method + def do_track_changed(self, album="", art="", artist="", title="", **_): + if not self.isPlaying(): + utils.notification(title, artist if artist else album, art) + + def on_librespot_started(self): + pass + + def on_librespot_stopped(self): + pass diff --git a/packages/addons/service/librespot/source/resources/lib/player_basic.py b/packages/addons/service/librespot/source/resources/lib/player_basic.py new file mode 100644 index 0000000000..955b17b22c --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/player_basic.py @@ -0,0 +1,36 @@ +import xbmcgui + +import player +import spotify +import utils + + +class Player(player.Player): + @utils.logged_method + def __init__(self, target, file, librespot): + super().__init__(target, file, librespot) + self._list_item = xbmcgui.ListItem(path=self.file) + self._list_item.setProperties( + { + "inputstream": "inputstream.ffmpeg", + } + ) + self._info_tag_music = self._list_item.getMusicInfoTag() + + def do_paused(self, **kwargs): + self.do_playing(**kwargs) + + @utils.logged_method + def do_playing(self, **_): + if not self.is_playing_file(): + self.play(self.file, self._list_item) + + @utils.logged_method + def do_track_changed(self, album="", art="", artist="", title="", **_): + fanart = spotify.get_fanart(art) + self._list_item.setArt({"fanart": fanart, "thumb": art}) + self._info_tag_music.setAlbum(album) + self._info_tag_music.setArtist(artist) + self._info_tag_music.setTitle(title) + if self.is_playing_file(): + self.updateInfoTag(self._list_item) diff --git a/packages/addons/service/librespot/source/resources/lib/player_default.py b/packages/addons/service/librespot/source/resources/lib/player_default.py new file mode 100644 index 0000000000..db7047d9f6 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/player_default.py @@ -0,0 +1,60 @@ +import time +import xbmcgui + +import player +import spotify +import utils + + +class Player(player.Player): + @utils.logged_method + def __init__(self, target, file, librespot): + super().__init__(target, file, librespot) + self._list_item = xbmcgui.ListItem(path=self.file) + self._list_item.setProperties( + { + "inputstream": "inputstream.ffmpeg", + } + ) + self._info_tag_music = self._list_item.getMusicInfoTag() + self._is_paused = False + + def _do_playing(self, paused, position=0.0, then=0.0, **_): + self._is_paused = paused + if self.is_playing_file(): + self.do_seeked(position, then) + else: + self._position = position + self._then = then + self.play(self.file, self._list_item) + + @utils.logged_method + def do_paused(self, **kwargs): + self._do_playing(True, **kwargs) + + @utils.logged_method + def do_playing(self, **kwargs): + self._do_playing(False, **kwargs) + + @utils.logged_method + def do_seeked(self, position=0.0, then=0.0, **_): + if self._is_paused: + self.seekTime(position) + self.pause() + else: + self.seekTime(position - then + time.time()) + + @utils.logged_method + def do_track_changed(self, album="", art="", artist="", duration=0.0, title="", **_): + fanart = spotify.get_fanart(art) + self._list_item.setArt({"fanart": fanart, "thumb": art}) + self._info_tag_music.setAlbum(album) + self._info_tag_music.setArtist(artist) + self._info_tag_music.setDuration(duration) + self._info_tag_music.setTitle(title) + if self.is_playing_file(): + self.updateInfoTag(self._list_item) + + @utils.logged_method + def on_playback_started(self): + self.do_seeked(self._position, self._then) diff --git a/packages/addons/service/librespot/source/resources/lib/pulseaudio.py b/packages/addons/service/librespot/source/resources/lib/pulseaudio.py new file mode 100644 index 0000000000..1f8ea27575 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/pulseaudio.py @@ -0,0 +1,49 @@ +import subprocess + +import utils + + +def _run(command): + stdout = subprocess.run( + command.split(), stdout=subprocess.PIPE, text=True + ).stdout.rstrip() + utils.log(f"{command}: {stdout}") + return stdout + + +class PulseAudio: + @utils.logged_method + def __init__(self, address="127.0.0.1", device="librespot", port="23432"): + self._device = device + self._file = f"rtp://{address}:{port}" + self._sap_server = subprocess.Popen( + f"nc -lup 9875 -s {address}".split(), + stdout=subprocess.DEVNULL, + stderr=subprocess.STDOUT, + ) + self._m1 = _run(f"pactl load-module module-null-sink sink_name={device}") + self.suspend_sink(1) + self._m2 = _run( + f"pactl load-module module-rtp-send destination_ip={address} inhibit_auto_suspend=always port={port} source={device}.monitor" + ) + + @utils.logged_method + def __enter__(self): + return self + + @utils.logged_method + def __exit__(self, *args): + self.suspend_sink("1") + for m in [self._m2, self._m1]: + if m: + _run(f"pactl unload-module {m}") + self._sap_server.terminate() + + def get_device(self): + return self._device + + def get_file(self): + return self._file + + def suspend_sink(self, bit): + _run(f"pactl suspend-sink {bit}") diff --git a/packages/addons/service/librespot/source/resources/lib/service.py b/packages/addons/service/librespot/source/resources/lib/service.py index 74b21c83e2..6b52b163b5 100644 --- a/packages/addons/service/librespot/source/resources/lib/service.py +++ b/packages/addons/service/librespot/source/resources/lib/service.py @@ -1,88 +1,51 @@ -import PIL.Image -import urllib.request -import tempfile -import os -import xbmc -import xbmcaddon -import xbmcgui - -_ADDON = xbmcaddon.Addon() -_ICON = _ADDON.getAddonInfo('icon') -_NAME = _ADDON.getAddonInfo('name') -_DIALOG = xbmcgui.Dialog() +import event_handler +import librespot +import utils -def log(message, show=False): - xbmc.log(f'{_NAME}: {message}', xbmc.LOGINFO if show else xbmc.LOGDEBUG) - - -def notification(message='', sound=False, heading=_NAME, icon=_ICON, time=5000): - _DIALOG.notification(heading, message, icon, time, sound) - - -_FANART_DIR = os.path.join(tempfile.gettempdir(), 'librespot.fanart') - - -def get_fanart(url, max_fanarts): - name = os.path.basename(url) - target = os.path.join(_FANART_DIR, f'{name}_16x9') - if not os.path.exists(target): - if not os.path.exists(_FANART_DIR): - os.makedirs(_FANART_DIR) - files = os.listdir(_FANART_DIR) - files = [os.path.join(_FANART_DIR, file) for file in files if os.path.isfile( - os.path.join(_FANART_DIR, file))] - files.sort(key=os.path.getmtime) - for file in files[:-max_fanarts]: - os.remove(file) - source = os.path.join(_FANART_DIR, f'{name}_9x9') - urllib.request.urlretrieve(url, source) - image = PIL.Image.open(source) - width, height = image.size - new_width = int(height * 16 / 9) - delta_w = new_width - width - new_image = PIL.Image.new('RGB', (new_width, height), (0, 0, 0)) - new_image.paste(image, (delta_w // 2, 0)) - new_image.save(target, 'JPEG', optimize=True) - os.remove(source) - return target - - -_SETTINGS = { - 'alsa_device': 'hw:2,0', - 'backend': 'pulseaudio_rtp', - 'dnd_kodi': 'false', - 'name': f'{_NAME}@{{}}', - 'options': '', -} - - -def _get_setting(setting, default): - value = _ADDON.getSetting(setting) - return value if value else default - - -def _get_librespot(): - while True: - settings = {k: _get_setting(k, v) for k, v in _SETTINGS.items()} - backend = settings.pop('backend') - librespot_class = __import__(f'librespot_{backend}').Librespot - with librespot_class(**settings) as librespot: - with librespot.get_player(librespot=librespot, **settings) as player: - yield - - -class Monitor(xbmc.Monitor): - - def __init__(self): - self._get_librespot = _get_librespot() - self.onSettingsChanged() - - def onSettingsChanged(self): - log('settings changed') - next(self._get_librespot) +class Service: + @utils.logged_method + def __init__(self, backend, device, file=""): + self.backend = backend + self.device = device + self.file = file + @utils.logged_method def run(self): - self.waitForAbort() - log('abort requested') - self._get_librespot.close() + if self.file: + player = utils.get_setting("player") + module_player = f"player_{player}" + else: + module_player = "player" + + with event_handler.EventHandler(self) as self.event_handler: + with librespot.Librespot(self, self.backend, self.device) as self.librespot: + self.player = __import__(module_player).Player(self, self.file, self.librespot) + try: + yield + finally: + del self.player + + def on_event_paused(self, **_): + pass + + def on_event_playing(self, **_): + pass + + def on_event_position_correction(self, **_): + pass + + def on_event_seeked(self, **_): + pass + + def on_event_stopped(self, **kwargs): + self.player.do_stopped(**kwargs) + + def on_event_track_changed(self, **kwargs): + self.player.do_track_changed(**kwargs) + + def on_librespot_started(self): + pass + + def on_librespot_stopped(self): + pass diff --git a/packages/addons/service/librespot/source/resources/lib/service_pulseaudio.py b/packages/addons/service/librespot/source/resources/lib/service_pulseaudio.py new file mode 100644 index 0000000000..c06a73764f --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/service_pulseaudio.py @@ -0,0 +1,45 @@ +import pulseaudio +import service +import utils + + +class Service(service.Service): + @utils.logged_method + def __init__(self): + self.pulseaudio = pulseaudio.PulseAudio() + backend = "pulseaudio" + device = self.pulseaudio.get_device() + file = self.pulseaudio.get_file() + super().__init__(backend, device, file) + + @utils.logged_method + def run(self): + with self.pulseaudio: + yield from super().run() + + def on_event_paused(self, **kwargs): + self.pulseaudio.suspend_sink("0") + self.player.do_paused(**kwargs) + + def on_event_playing(self, **kwargs): + self.pulseaudio.suspend_sink("0") + self.player.do_playing(**kwargs) + + def on_event_position_correction(self, **kwargs): + self.player.do_seeked(**kwargs) + + def on_event_seeked(self, **kwargs): + self.player.do_seeked(**kwargs) + + def on_event_stopped(self, **_): + self.player.do_stopped() + self.pulseaudio.suspend_sink("1") + + def on_event_track_changed(self, **kwargs): + self.player.do_track_changed(**kwargs) + + def on_librespot_started(self): + self.pulseaudio.suspend_sink("1") + + def on_librespot_stopped(self): + self.pulseaudio.suspend_sink("1") diff --git a/packages/addons/service/librespot/source/resources/lib/spotify.py b/packages/addons/service/librespot/source/resources/lib/spotify.py new file mode 100644 index 0000000000..ed5babc59d --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/spotify.py @@ -0,0 +1,34 @@ +import PIL.Image +import os +import tempfile +import urllib.request + +_DIRECTORY_NAME = "librespot.coverart" +_DIRECTORY_PATH = os.path.join(tempfile.gettempdir(), _DIRECTORY_NAME) +_MAX_COVERARTS = 10 + + +def get_fanart(url): + name = os.path.basename(url) + target = os.path.join(_DIRECTORY_PATH, f"{name}") + if not os.path.exists(target): + if not os.path.exists(_DIRECTORY_PATH): + os.makedirs(_DIRECTORY_PATH) + paths = [ + os.path.join(_DIRECTORY_PATH, file) for file in os.listdir(_DIRECTORY_PATH) + ] + paths = [path for path in paths if os.path.isfile(path)] + paths.sort(key=os.path.getmtime) + for path in paths[:-_MAX_COVERARTS]: + os.remove(path) + source = os.path.join(_DIRECTORY_PATH, f"{name}.tmp") + urllib.request.urlretrieve(url, source) + image = PIL.Image.open(source) + width, height = image.size + new_width = int(height * 16 / 9) + delta_w = new_width - width + new_image = PIL.Image.new("RGB", (new_width, height), (0, 0, 0)) + new_image.paste(image, (delta_w // 2, 0)) + new_image.save(target, "JPEG", optimize=True) + os.remove(source) + return target diff --git a/packages/addons/service/librespot/source/resources/lib/utils.py b/packages/addons/service/librespot/source/resources/lib/utils.py new file mode 100644 index 0000000000..2e684ab51c --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/utils.py @@ -0,0 +1,47 @@ +import os +import xbmc +import xbmcaddon +import xbmcgui +import xbmcvfs + +_ADDON_HOME = xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo("profile")) +_ADDON_ICON = xbmcaddon.Addon().getAddonInfo("icon") +_ADDON_NAME = xbmcaddon.Addon().getAddonInfo("name") +_ADDON_PATH = xbmcaddon.Addon().getAddonInfo("path") +_DIALOG = xbmcgui.Dialog() +_SETTINGS = { + "alsa_device": "hw:2,0", + "backend": "pulseaudio", + "dnd_kodi": "false", + "name": "Librespot{}", + "player": "default", +} + +os.environ["PATH"] += os.pathsep + os.path.join(_ADDON_PATH, "bin") +os.makedirs(_ADDON_HOME, exist_ok=True) +os.chdir(_ADDON_HOME) + + +def get_setting(key): + setting = xbmcaddon.Addon().getSetting(key) + return setting if setting else _SETTINGS[key] + + +def log(message, notify=False): + xbmc.log(f"{_ADDON_NAME}: {message}", xbmc.LOGINFO) + if notify: + notification(message) + + +def logged_method(method): + def logger(*args, **kwargs): + log(f"{method.__module__}.{method.__qualname__}") + return method(*args, **kwargs) + + return logger + + +def notification( + message="", heading=_ADDON_NAME, icon=_ADDON_ICON, sound=False, time=5000 +): + _DIALOG.notification(heading, message, icon, time, sound) diff --git a/packages/addons/service/librespot/source/resources/settings.xml b/packages/addons/service/librespot/source/resources/settings.xml index c446d47724..51f26c3dfb 100644 --- a/packages/addons/service/librespot/source/resources/settings.xml +++ b/packages/addons/service/librespot/source/resources/settings.xml @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk index ea32f0e0eb..077c4b9758 100644 --- a/packages/addons/service/mariadb/package.mk +++ b/packages/addons/service/mariadb/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mariadb" -PKG_VERSION="11.4.3" +PKG_VERSION="11.4.7" PKG_REV="0" -PKG_SHA256="6f0017b9901bb1897de0eed21caef9ffa9d66ef559345a0d8a6f011308413ece" +PKG_SHA256="bf20687ca12fa7efda8df89cab1f2a661288cea41acf8f53189b69d5294347d0" PKG_LICENSE="GPL2" PKG_SITE="https://mariadb.org" PKG_URL="https://archive.mariadb.org/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz" @@ -22,7 +22,6 @@ PKG_ADDON_TYPE="xbmc.service" configure_package() { PKG_CMAKE_OPTS_HOST=" \ -DCMAKE_INSTALL_MESSAGE=NEVER \ - -DSTACK_DIRECTION=-1 \ -DHAVE_IB_GCC_ATOMIC_BUILTINS=1 \ -DCMAKE_CROSSCOMPILING=OFF" @@ -31,7 +30,6 @@ configure_package() { -DCMAKE_BUILD_TYPE=Release \ -DBUILD_CONFIG=mysql_release \ -DFEATURE_SET=classic \ - -DSTACK_DIRECTION=1 \ -DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING=ON \ -DCMAKE_CROSSCOMPILING=ON \ -DIMPORT_EXECUTABLES=${PKG_BUILD}/.${HOST_NAME}/import_executables.cmake \ diff --git a/packages/addons/service/mariadb/source/config/my.cnf b/packages/addons/service/mariadb/source/config/my.cnf index a11eee28af..a7fe542180 100644 --- a/packages/addons/service/mariadb/source/config/my.cnf +++ b/packages/addons/service/mariadb/source/config/my.cnf @@ -154,10 +154,8 @@ default_storage_engine = InnoDB innodb_buffer_pool_size = 256M innodb_log_buffer_size = 8M -innodb_file_per_table = 1 innodb_open_files = 400 innodb_io_capacity = 400 -innodb_flush_method = O_DIRECT character-set-server=utf8 # This avoids potential pitfalls with text in exotic codepages. #skip-name-resolve # Avoids name resolving in the local network, thus reducing overhead. That also means that all connections are done by IP only. # well, not really according to use cases :( diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk index c5033ac7c1..a785d47b64 100644 --- a/packages/addons/service/minisatip/package.mk +++ b/packages/addons/service/minisatip/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="minisatip" -PKG_VERSION="1.3.38" -PKG_SHA256="37d492ab291582e3f0a0bc64ea75a498626303b27505c8ef14737781da9f720d" +PKG_VERSION="2.0.4" +PKG_SHA256="881054e3f530a08a3ffe41e391faee537586fa83686804a56b49add84618bffe" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 9bb6a44516..9a9a4545aa 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpd" -PKG_VERSION="0.23.15" -PKG_SHA256="550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a" +PKG_VERSION="0.24.4" +PKG_SHA256="86035d6c63af32afa77fd5eb5ecd1c6afaef7cc352b28064edf51eea60f40d66" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -12,7 +12,7 @@ PKG_SITE="https://www.musicpd.org" PKG_URL="http://www.musicpd.org/download/mpd/$(get_pkg_version_maj_min)/mpd-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libfmt \ libgcrypt libiconv libid3tag libmad libmpdclient libopenmpt libsamplerate \ - libvorbis libnfs libogg mpd-mpc opus pulseaudio samba wavpack yajl" + libvorbis libnfs libogg mpd-mpc opus pulseaudio samba wavpack nlohmann-json" PKG_SECTION="service.multimedia" PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server" PKG_LONGDESC="Music Player Daemon (${PKG_VERSION}) is a flexible and powerful server-side application for playing music" @@ -77,7 +77,6 @@ PKG_MESON_OPTS_TARGET="-Dadplug=disabled \ -Dsndfile=enabled \ -Dsndio=disabled \ -Dsolaris_output=disabled \ - -Dsoundcloud=enabled \ -Dsoxr=enabled \ -Dsqlite=enabled \ -Dsyslog=disabled \ @@ -91,7 +90,7 @@ PKG_MESON_OPTS_TARGET="-Dadplug=disabled \ -Dwavpack=enabled \ -Dwebdav=enabled \ -Dwildmidi=disabled \ - -Dyajl=enabled \ + -Dnlohmann_json=enabled \ -Dzeroconf=avahi \ -Dzlib=enabled \ -Dzzip=disabled" diff --git a/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch b/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch new file mode 100644 index 0000000000..04fd0adb17 --- /dev/null +++ b/packages/addons/service/mpd/patches/mpd-9999-link-against-static-libopenmpt.patch @@ -0,0 +1,11 @@ +--- a/src/decoder/plugins/meson.build 2024-12-03 11:56:57.000000000 +0000 ++++ b/src/decoder/plugins/meson.build 2024-12-30 14:15:29.590502435 +0000 +@@ -110,7 +110,7 @@ + ] + endif + +-libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt')) ++libopenmpt_dep = dependency('libopenmpt', required: get_option('openmpt'), static: true) + decoder_features.set('ENABLE_OPENMPT', libopenmpt_dep.found()) + if libopenmpt_dep.found() + decoder_plugins_sources += [ diff --git a/packages/addons/service/net-snmp/package.mk b/packages/addons/service/net-snmp/package.mk index 535b8bf6f3..e2012bd428 100644 --- a/packages/addons/service/net-snmp/package.mk +++ b/packages/addons/service/net-snmp/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="BSD" -PKG_SITE="http://www.net-snmp.org" +PKG_SITE="https://www.net-snmp.org" PKG_URL="https://sourceforge.net/projects/net-snmp/files/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libnl openssl" PKG_SECTION="service" diff --git a/packages/addons/service/net-snmp/patches/net-snmp-0003-add-linux-6-7-compatibility-parsing-proc-net-snmp.patch b/packages/addons/service/net-snmp/patches/net-snmp-0003-add-linux-6-7-compatibility-parsing-proc-net-snmp.patch new file mode 100644 index 0000000000..b6dcd77ae8 --- /dev/null +++ b/packages/addons/service/net-snmp/patches/net-snmp-0003-add-linux-6-7-compatibility-parsing-proc-net-snmp.patch @@ -0,0 +1,119 @@ +From f5ae6baf0018abda9dedc368fe6d52c0d7a8ab8f Mon Sep 17 00:00:00 2001 +From: Philippe Troin +Date: Sat, 3 Feb 2024 10:30:30 -0800 +Subject: [PATCH] Add Linux 6.7 compatibility parsing /proc/net/snmp + +Linux 6.7 adds a new OutTransmits field to Ip in /proc/net/snmp. +This breaks the hard-coded assumptions about the Ip line length. +Add compatibility to parse Linux 6.7 Ip header while keep support +for previous versions. +--- + .../ip-mib/data_access/systemstats_linux.c | 46 +++++++++++++++---- + 1 file changed, 37 insertions(+), 9 deletions(-) + +diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c +index 49e0a34d5c..f04e828a94 100644 +--- a/agent/mibgroup/ip-mib/data_access/systemstats_linux.c ++++ b/agent/mibgroup/ip-mib/data_access/systemstats_linux.c +@@ -36,7 +36,7 @@ netsnmp_access_systemstats_arch_init(void) + } + + /* +- /proc/net/snmp ++ /proc/net/snmp - Linux 6.6 and lower + + Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates + Ip: 2 64 7083534 0 0 0 0 0 6860233 6548963 0 0 1 286623 63322 1 259920 0 0 +@@ -49,6 +49,26 @@ netsnmp_access_systemstats_arch_init(void) + + Udp: InDatagrams NoPorts InErrors OutDatagrams + Udp: 1491094 122 0 1466178 ++* ++ /proc/net/snmp - Linux 6.7 and higher ++ ++ Ip: Forwarding DefaultTTL InReceives InHdrErrors InAddrErrors ForwDatagrams InUnknownProtos InDiscards InDelivers OutRequests OutDiscards OutNoRoutes ReasmTimeout ReasmReqds ReasmOKs ReasmFails FragOKs FragFails FragCreates OutTransmits ++ Ip: 1 64 50859058 496 0 37470604 0 0 20472980 7515791 1756 0 0 7264 3632 0 3548 0 7096 44961424 ++ ++ Icmp: InMsgs InErrors InCsumErrors InDestUnreachs InTimeExcds InParmProbs InSrcQuenchs InRedirects InEchos InEchoReps InTimestamps InTimestampReps InAddrMasks InAddrMaskReps OutMsgs OutErrors OutRateLimitGlobal OutRateLimitHost OutDestUnreachs OutTimeExcds OutParmProbs OutSrcQuenchs OutRedirects OutEchos OutEchoReps OutTimestamps OutTimestampReps OutAddrMasks OutAddrMaskReps ++ Icmp: 114447 2655 0 17589 0 0 0 0 66905 29953 0 0 0 0 143956 0 0 572 16610 484 0 0 0 59957 66905 0 0 0 0 ++ ++ IcmpMsg: InType0 InType3 InType8 OutType0 OutType3 OutType8 OutType11 ++ IcmpMsg: 29953 17589 66905 66905 16610 59957 484 ++ ++ Tcp: RtoAlgorithm RtoMin RtoMax MaxConn ActiveOpens PassiveOpens AttemptFails EstabResets CurrEstab InSegs OutSegs RetransSegs InErrs OutRsts InCsumErrors ++ Tcp: 1 200 120000 -1 17744 13525 307 3783 6 18093137 9277788 3499 8 7442 0 ++ ++ Udp: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors ++ Udp: 2257832 1422 0 2252835 0 0 0 84 0 ++ ++ UdpLite: InDatagrams NoPorts InErrors OutDatagrams RcvbufErrors SndbufErrors InCsumErrors IgnoredMulti MemErrors ++ UdpLite: 0 0 0 0 0 0 0 0 0 + */ + + +@@ -101,10 +121,10 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + FILE *devin; + char line[1024]; + netsnmp_systemstats_entry *entry = NULL; +- int scan_count; ++ int scan_count, expected_scan_count; + char *stats, *start = line; + int len; +- unsigned long long scan_vals[19]; ++ unsigned long long scan_vals[20]; + + DEBUGMSGTL(("access:systemstats:container:arch", "load v4 (flags %x)\n", + load_flags)); +@@ -126,10 +146,17 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + */ + NETSNMP_IGNORE_RESULT(fgets(line, sizeof(line), devin)); + len = strlen(line); +- if (224 != len) { ++ switch (len) { ++ case 224: ++ expected_scan_count = 19; ++ break; ++ case 237: ++ expected_scan_count = 20; ++ break; ++ default: + fclose(devin); + snmp_log(LOG_ERR, "systemstats_linux: unexpected header length in /proc/net/snmp." +- " %d != 224\n", len); ++ " %d not in { 224, 237 } \n", len); + return -4; + } + +@@ -178,20 +205,20 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + memset(scan_vals, 0x0, sizeof(scan_vals)); + scan_count = sscanf(stats, + "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu" +- "%llu %llu %llu %llu %llu %llu %llu %llu %llu", ++ "%llu %llu %llu %llu %llu %llu %llu %llu %llu %llu", + &scan_vals[0],&scan_vals[1],&scan_vals[2], + &scan_vals[3],&scan_vals[4],&scan_vals[5], + &scan_vals[6],&scan_vals[7],&scan_vals[8], + &scan_vals[9],&scan_vals[10],&scan_vals[11], + &scan_vals[12],&scan_vals[13],&scan_vals[14], + &scan_vals[15],&scan_vals[16],&scan_vals[17], +- &scan_vals[18]); ++ &scan_vals[18],&scan_vals[19]); + DEBUGMSGTL(("access:systemstats", " read %d values\n", scan_count)); + +- if(scan_count != 19) { ++ if(scan_count != expected_scan_count) { + snmp_log(LOG_ERR, + "error scanning systemstats data (expected %d, got %d)\n", +- 19, scan_count); ++ expected_scan_count, scan_count); + netsnmp_access_systemstats_entry_free(entry); + return -4; + } +@@ -223,6 +250,7 @@ _systemstats_v4(netsnmp_container* container, u_int load_flags) + entry->stats.HCOutFragFails.high = scan_vals[17] >> 32; + entry->stats.HCOutFragCreates.low = scan_vals[18] & 0xffffffff; + entry->stats.HCOutFragCreates.high = scan_vals[18] >> 32; ++ /* entry->stats. = scan_vals[19]; / * OutTransmits */ + + entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCINRECEIVES] = 1; + entry->stats.columnAvail[IPSYSTEMSTATSTABLE_INHDRERRORS] = 1; diff --git a/packages/addons/service/nextpvr/package.mk b/packages/addons/service/nextpvr/package.mk index a2ae87c424..57d979d96c 100644 --- a/packages/addons/service/nextpvr/package.mk +++ b/packages/addons/service/nextpvr/package.mk @@ -31,7 +31,7 @@ post_install_addon() { 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 + cp -P $(get_install_dir x265)/usr/lib/libx265.so.215 ${INSTALL}/lib.private patchelf --add-rpath '${ORIGIN}/../lib.private' ${INSTALL}/lbin/comskip fi } diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk index 7b51323bd4..db0cc4a407 100644 --- a/packages/addons/service/oscam/package.mk +++ b/packages/addons/service/oscam/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="oscam" -PKG_VERSION="11799" -PKG_SHA256="10e7ffb153c66b4f29c21dd5a239d1186f988e918e8ff2673a4ea5fb9073a209" +PKG_VERSION="11881" +PKG_SHA256="0e9393a443510ea06faf418aa3c6431bbd12617a40f5de1c023218c4419e9006" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -58,7 +58,6 @@ PKG_CMAKE_OPTS_TARGET="\ -DHAVE_DVBAPI=1 \ -DHAVE_LIBCRYPTO=1 \ -DSTATIC_LIBUSB=1 \ - -DTOUCH=ON \ -DWEBIF=1 \ -DWEBIF_LIVELOG=1 \ -DWEBIF_JQUERY=1 \ @@ -71,7 +70,10 @@ makeinstall_target() { } addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private} cp -P ${PKG_BUILD}/.${TARGET_NAME}/oscam ${ADDON_BUILD}/${PKG_ADDON_ID}/bin cp -P ${PKG_BUILD}/.${TARGET_NAME}/utils/list_smargo ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -L $(get_install_dir pcsc-lite)/usr/lib/libpcsclite.so.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + + patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/oscam } diff --git a/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch b/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch index 2334452850..e53f9cb145 100644 --- a/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch +++ b/packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch @@ -1,14 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -498,7 +498,7 @@ add_library (${csoscam} STATIC ${csoscam - - set (exe_name "oscam") +@@ -621,7 +621,7 @@ + set (exe_name "oscam-upx") + endif (NOT USE_COMPRESS EQUAL 1) add_executable (${exe_name} ${exe_srcs} ${exe_hdrs}) -target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo) +target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo udev) - if(HAVE_LIBRT AND HAVE_LIBUSB) - if (LIBUSBDIR) - set (libusb_link "imp_libusb") + if (WITH_SIGNING EQUAL 1) + SIGN_COMMAND_OSCAM() + endif (WITH_SIGNING EQUAL 1) --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -12,7 +12,7 @@ file (GLOB all_srcs ${exe_srcs}) diff --git a/packages/addons/service/podman/package.mk b/packages/addons/service/podman/package.mk index 99e8ba4dc5..26b28eec40 100644 --- a/packages/addons/service/podman/package.mk +++ b/packages/addons/service/podman/package.mk @@ -22,7 +22,7 @@ addon() { cp -P $(get_install_dir conmon)/usr/lib/podman/conmon ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # gpgme - cp -L $(get_install_dir gpgme)/usr/lib/libgpgme.so.11 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + cp -L $(get_install_dir gpgme)/usr/lib/libgpgme.so.45 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private # libseccomp cp -L $(get_install_dir libseccomp)/usr/lib/libseccomp.so.2 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk index a5240f2178..2fb7393ed2 100644 --- a/packages/addons/service/proftpd/package.mk +++ b/packages/addons/service/proftpd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="proftpd" -PKG_VERSION="1.3.8b" -PKG_SHA256="183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0" +PKG_VERSION="1.3.9" +PKG_SHA256="4a5f13b666226813b4da0ade34535d325e204ab16cf8008c7353b1b5a972f74b" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/service/prometheus-node-exporter/package.mk b/packages/addons/service/prometheus-node-exporter/package.mk index 437f1d8e04..b0e62baaf0 100644 --- a/packages/addons/service/prometheus-node-exporter/package.mk +++ b/packages/addons/service/prometheus-node-exporter/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="prometheus-node-exporter" -PKG_VERSION="1.8.2" -PKG_SHA256="f615c70be816550498dd6a505391dbed1a896705eff842628de13a1fa7654e8f" +PKG_VERSION="1.9.1" +PKG_SHA256="ac80b13ced462e88f243ad5e98c12bbcee2628bf552c0d19bb5ae125ce09730d" PKG_REV="0" PKG_LICENSE="Apache License 2.0" PKG_SITE="https://github.com/prometheus/node_exporter" diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk index c95f169aa3..f343924819 100644 --- a/packages/addons/service/rsyslog/package.mk +++ b/packages/addons/service/rsyslog/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rsyslog" -PKG_VERSION="8.2408.0" -PKG_SHA256="8bb2f15f9bf9bb7e635182e3d3e370bfc39d08bf35a367dce9714e186f787206" +PKG_VERSION="8.2506.0" +PKG_SHA256="6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index 9d8cfd2954..adbc35bbcd 100644 --- a/packages/addons/service/snapclient/package.mk +++ b/packages/addons/service/snapclient/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="snapclient" -PKG_VERSION="0.28.0" +PKG_VERSION="0.31.0" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPLv3" diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk index e79ea9f26d..39623b9dc0 100644 --- a/packages/addons/service/snapserver/package.mk +++ b/packages/addons/service/snapserver/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="snapserver" -PKG_VERSION="0.28.0" +PKG_VERSION="0.31.0" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPLv3" diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk index 32f6d92b1d..b34b5498fc 100644 --- a/packages/addons/service/syncthing/package.mk +++ b/packages/addons/service/syncthing/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="syncthing" -PKG_VERSION="1.27.12" -PKG_SHA256="5531f0e1bb81b824a2ab62f070e745c142e1328a15229de47b0cb596b5bae417" +PKG_VERSION="1.30.0" +PKG_SHA256="ef1be71c66753c04212ab1c9c548e678d468bad98dc5461e83540a4ef5c2fcba" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="MPLv2" diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk index d04495f61f..989ddc4d3f 100644 --- a/packages/addons/service/tinc/package.mk +++ b/packages/addons/service/tinc/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tinc" -PKG_VERSION="4c6a9a9611442f958c3049a566ac4369653978e9" -PKG_SHA256="409829f454fdfe87f7222f131de88006640709ff046e2241bfdb44a49a146059" +PKG_VERSION="f3d5e22592ed6d50e7023e517a2ec0c70af94066" +PKG_SHA256="6bc7cc8757ad00768bbd1c4f247f76cff24b507ebfec5db80658b292d5bc3c77" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPLv2" diff --git a/packages/addons/service/tinc/patches/tinc-459-fix-API-change.patch b/packages/addons/service/tinc/patches/tinc-459-fix-API-change.patch new file mode 100644 index 0000000000..5293bdff16 --- /dev/null +++ b/packages/addons/service/tinc/patches/tinc-459-fix-API-change.patch @@ -0,0 +1,31 @@ +From 8331467f15c948a251261a333d2a79022fa2b71e Mon Sep 17 00:00:00 2001 +From: Yixun Lan +Date: Mon, 8 Jul 2024 18:27:46 +0000 +Subject: [PATCH] upnp: fix API change issue + +adjust once update to miniupnpc-2.2.8 + +Closes: https://github.com/gsliepen/tinc/issues/458 +Signed-off-by: Yixun Lan +--- + src/upnp.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/upnp.c b/src/upnp.c +index 8223b2df2..e67a544fa 100644 +--- a/src/upnp.c ++++ b/src/upnp.c +@@ -122,8 +122,12 @@ static void upnp_refresh(void) { + struct IGDdatas data; + + char myaddr[64]; +- ++#if (MINIUPNPC_API_VERSION >= 18) ++ char wnaddr[64]; ++ int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr), wnaddr, sizeof(wnaddr)); ++#else + int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr)); ++#endif + + if(result <= 0) { + logger(DEBUG_PROTOCOL, LOG_WARNING, "[upnp] No IGD found"); diff --git a/packages/addons/service/touchscreen/addon.xml b/packages/addons/service/touchscreen/addon.xml deleted file mode 100644 index 78f0e7d878..0000000000 --- a/packages/addons/service/touchscreen/addon.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -@REQUIRES@ - - - - - - executable - - - @PKG_SHORTDESC@ - -@PKG_LONGDESC@ - - -@PKG_DISCLAIMER@ - - all - -@PKG_ADDON_NEWS@ - - - resources/icon.png - resources/fanart.png -@PKG_ADDON_SCREENSHOT@ - - - diff --git a/packages/addons/service/touchscreen/changelog.txt b/packages/addons/service/touchscreen/changelog.txt deleted file mode 100644 index 927b2407d4..0000000000 --- a/packages/addons/service/touchscreen/changelog.txt +++ /dev/null @@ -1 +0,0 @@ -initial release diff --git a/packages/addons/service/touchscreen/icon/icon.png b/packages/addons/service/touchscreen/icon/icon.png deleted file mode 100644 index df5358d5f2..0000000000 Binary files a/packages/addons/service/touchscreen/icon/icon.png and /dev/null differ diff --git a/packages/addons/service/touchscreen/package.mk b/packages/addons/service/touchscreen/package.mk index c4f84be812..080a09531a 100644 --- a/packages/addons/service/touchscreen/package.mk +++ b/packages/addons/service/touchscreen/package.mk @@ -9,27 +9,18 @@ PKG_ADDON_PROJECTS="Generic RPi ARM" PKG_LICENSE="GPL" PKG_SITE="" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain tslib evtest" +PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="service" -PKG_SHORTDESC="Touchscreen: support addon for Touchscreens" -PKG_LONGDESC="Touchscreen: addon creates new virtual input device and \ -converts data from touchscreen to Kodi. Short tap sends button press event \ -and long tap sends only xy coordinates. Also includes calibration program." +PKG_SHORTDESC="Add-on removed" +PKG_LONGDESC="Add-on removed" PKG_TOOLCHAIN="manual" +PKG_ADDON_BROKEN="Touchscreen no longer required thus removed." + PKG_IS_ADDON="yes" PKG_ADDON_NAME="Touchscreen" -PKG_ADDON_TYPE="xbmc.service" +PKG_ADDON_TYPE="xbmc.broken" addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - - cp ${PKG_DIR}/addon.xml ${ADDON_BUILD}/${PKG_ADDON_ID} - - # set only version (revision will be added by buildsystem) - sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \ - -i ${ADDON_BUILD}/${PKG_ADDON_ID}/addon.xml - - cp $(get_install_dir tslib)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - cp $(get_install_dir evtest)/usr/bin/evtest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + : } diff --git a/packages/addons/service/touchscreen/source/bin/ts_calibrate.sh b/packages/addons/service/touchscreen/source/bin/ts_calibrate.sh deleted file mode 100644 index 8b7394b0b2..0000000000 --- a/packages/addons/service/touchscreen/source/bin/ts_calibrate.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -. /etc/profile - -oe_setup_addon service.touchscreen - -if [ -d /usr/share/kodi/addons/service.touchscreen ]; then - # addon included in image - ADDON_DIR="/usr/share/kodi/addons/service.touchscreen" -fi - -. $ADDON_DIR/bin/ts_env.sh - -echo "touchscreen device: $TSLIB_TSDEVICE" - -if [ "$1" = "service" ]; then - # recalibrate from service if required - SETTINGS_XML="$ADDON_HOME/settings.xml" - if [ -f "$SETTINGS_XML" ]; then - mkdir -p /var/config - - # check settings version - XML_SETTINGS_VER="$(xmlstarlet sel -t -m settings -v @version $SETTINGS_XML)" - if [ "$XML_SETTINGS_VER" = "2" ]; then - xmlstarlet sel -t -m settings/setting -v @id -o "=\"" -v . -o "\"" -n "$SETTINGS_XML" > /var/config/ts_calibration_addon.conf - else - xmlstarlet sel -t -m settings -m setting -v @id -o "=\"" -v @value -o "\"" -n "$SETTINGS_XML" > /var/config/ts_calibration_addon.conf - fi - - . /var/config/ts_calibration_addon.conf - - if [ "$TS_RECALIBRATE" = "true" ]; then - sed -i 's|id="TS_RECALIBRATE"[ ]*value="true"|id="TS_RECALIBRATE" value="false"|g' "$SETTINGS_XML" - touch $ADDON_HOME/recalibrate - fi - fi - - if [ -f $ADDON_HOME/recalibrate ]; then - echo "recalibrating..." - rm -f $ADDON_HOME/recalibrate - ts_calibrate - fi -else - echo "Stopping Kodi and touchscreen daemon..." - systemctl stop kodi - systemctl stop ts_uinput_touch - - while pidof kodi.bin &>/dev/null; do - sleep 0.5 - done - - killall ts_uinput_touch &>/dev/null - - ts_calibrate - - # restart both if argument was set - if [ "$1" = "run" ]; then - echo "Starting touchscreen daemon and Kodi..." - systemctl start ts_uinput_touch - systemctl start kodi - fi -fi diff --git a/packages/addons/service/touchscreen/source/bin/ts_env.sh b/packages/addons/service/touchscreen/source/bin/ts_env.sh deleted file mode 100644 index 0c7219145a..0000000000 --- a/packages/addons/service/touchscreen/source/bin/ts_env.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -. /etc/profile - -oe_setup_addon service.touchscreen - -if [ -d /usr/share/kodi/addons/service.touchscreen ]; then - # addon included in image - ADDON_DIR=/usr/share/kodi/addons/service.touchscreen -fi - -if [ ! -f $ADDON_HOME/ts.conf-generic ]; then - cp $ADDON_DIR/config/* $ADDON_HOME -fi - -if [ -f $ADDON_HOME/ts_env.sh ]; then - # use user supplied script - if [ ! -x $ADDON_HOME/ts_env.sh ]; then - chmod +x $ADDON_HOME/ts_env.sh - fi - - dos2unix $ADDON_HOME/ts_env.sh - dos2unix $ADDON_HOME/ts.conf - - . $ADDON_HOME/ts_env.sh -else - # automatic start only on Udoo dual/quad for ldb screen - LDB="" - if grep -iq ":dev=ldb" /proc/cmdline; then - LDB="yes" - # maybe 7" LVDS display - modprobe st1232 >/dev/null 2>&1 - fi - - if [ -n "$LDB" ]; then - # find event# with command - # ls -l /dev/input/by-id - # or using evtest program - - # st1232 module is always loaded so check for 3M first - TS_DEVICE_1="3M 3M USB Touchscreen - EX II" - TS_DEVICE_2="st1232-touchscreen" - TS_DEVICE_CONF_1="ts.conf-udoo_15_6" - TS_DEVICE_CONF_2="ts.conf-udoo_7" - TS_DEVICE_CONF_GENERIC="ts.conf-generic" - - #TS_DEVICE="$TS_DEVICE_1" # use specified one, should exist ts.conf for it - TS_DEVICE="" # find one automatically - #echo "device: $TS_DEVICE" - - TS_DEVICE_CONF="" - if [ -n "$TS_DEVICE" ]; then - TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE" '$0 ~ TS_DEVICE {print $1}') - TS_DEVICE_CONF="$TS_DEVICE_CONF_GENERIC" - else - TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE_1" '$0 ~ TS_DEVICE {print $1}') - if [ -n "$TSLIB_TSDEVICE" ]; then - TS_DEVICE_CONF="$TS_DEVICE_CONF_1" - rmmod st1232 >/dev/null 2>&1 # it's not - else - TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE_2" '$0 ~ TS_DEVICE {print $1}') - if [ -n "$TSLIB_TSDEVICE" ]; then - TS_DEVICE_CONF="$TS_DEVICE_CONF_2" - fi - fi - fi - - if [ ! -f $ADDON_HOME/ts.conf -a -n "$TS_DEVICE_CONF" ]; then - cp "$ADDON_HOME/$TS_DEVICE_CONF" $ADDON_HOME/ts.conf - fi - - export TSLIB_TSDEVICE="$TSLIB_TSDEVICE" - export TSLIB_PLUGINDIR=$ADDON_DIR/lib - export TSLIB_CONSOLEDEVICE=none - export TSLIB_FBDEVICE=/dev/fb0 - export TSLIB_CALIBFILE=$ADDON_HOME/pointercal - export TSLIB_CONFFILE=$ADDON_HOME/ts.conf - - #export TSLIB_RES_X=800 - #export TSLIB_RES_Y=480 - fi -fi diff --git a/packages/addons/service/touchscreen/source/bin/ts_uinput_touch.sh b/packages/addons/service/touchscreen/source/bin/ts_uinput_touch.sh deleted file mode 100644 index ad378d509b..0000000000 --- a/packages/addons/service/touchscreen/source/bin/ts_uinput_touch.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -. /etc/profile - -oe_setup_addon service.touchscreen - -if [ -d /usr/share/kodi/addons/service.touchscreen ]; then - # addon included in image - ADDON_DIR="/usr/share/kodi/addons/service.touchscreen" -fi - -. $ADDON_DIR/bin/ts_env.sh - -params=$* - -if [ "$1" = "service" ]; then - # skip service parameter and daemonize - params="-d" -else - # started from command line - systemctl stop ts_uinput_touch >/dev/null 2>&1 - killall ts_uinput_touch >/dev/null 2>&1 -fi - -echo " touchscreen device: '$TSLIB_TSDEVICE'" - -if [ -n "$TSLIB_RES_X" -a -n "$TSLIB_RES_Y" ]; then - echo "touchscreen resolution: '${TSLIB_RES_X}x${TSLIB_RES_Y}'" - params="-x $TSLIB_RES_X -y $TSLIB_RES_Y $params" -fi - -echo "params: .$params." -if [ ! -x $ADDON_HOME/ts_uinput_touch ]; then - ts_uinput_touch $params -else - echo "Using $ADDON_HOME/ts_uinput_touch" - $ADDON_HOME/ts_uinput_touch $params -fi diff --git a/packages/addons/service/touchscreen/source/calibrate.py b/packages/addons/service/touchscreen/source/calibrate.py deleted file mode 100644 index 8dc6bd6629..0000000000 --- a/packages/addons/service/touchscreen/source/calibrate.py +++ /dev/null @@ -1,142 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -import os -import socket -import sys -from threading import Thread -import xbmc -import xbmcgui -import xbmcaddon - -TEXT_ALIGN_LEFT = 0 -TEXT_ALIGN_RIGHT = 1 -TEXT_ALIGN_CENTER_X = 2 -TEXT_ALIGN_CENTER_Y = 4 -TEXT_ALIGN_RIGHT_CENTER_Y = 5 -TEXT_ALIGN_LEFT_CENTER_X_CENTER_Y = 6 -ACTION_PREVIOUS_MENU = 10 -ACTION_BACKSPACE = 92 - -SOCK_PATH = "/tmp/ts_calibrate.socket" -TSLIB_EDGE_OFFEST = 50 -CROSSHAIR_IMAGE_SIZE = 23 -CROSSHAIR_IMAGE_OFFSET = 11 -SKIN_WIDTH = 1280 # we are using 720p skin -SKIN_HEIGHT = 720 - -class coordinates: - var_x = 0 - var_y = 0 - -def server_thread(conn, self): - while True: - data = conn.recv(128) - if not data: - break - - self.currentTarget = self.currentTarget + 1 - if self.currentTarget > 0: - self.removeControl(self.targetImage) - - if self.currentTarget == 5: - xbmcgui.Dialog().ok("Calibration", "Calibration done.") - break - - self.info.setLabel("Touch '" + data + "' crosshair") - self.targetImage = xbmcgui.ControlImage( - self.touch_points[self.currentTarget].var_x - CROSSHAIR_IMAGE_OFFSET, - self.touch_points[self.currentTarget].var_y - CROSSHAIR_IMAGE_OFFSET, - CROSSHAIR_IMAGE_SIZE, CROSSHAIR_IMAGE_SIZE, - self.crosshair_path, colorDiffuse='0x00000000') - self.addControl(self.targetImage) - - # out of loop, close connection - conn.close() - os.remove(SOCK_PATH) - self.retval = 0 - self.close() - -class ts_calibrate(xbmcgui.WindowDialog): - def __init__(self): - self.retval = 0 - self.media_path=os.path.join(addon.getAddonInfo('path'), 'resources','media') + '/' - self.crosshair_path = self.media_path + 'crosshair.png' - self.currentTarget = -1 - - self.edge_offset_x = TSLIB_EDGE_OFFEST * SKIN_WIDTH / self.getWidth() - self.edge_offset_y = TSLIB_EDGE_OFFEST * SKIN_HEIGHT / self.getHeight() - - self.touch_points = [coordinates() for i in range(5)] - self.touch_points[0].var_x = self.edge_offset_x - self.touch_points[0].var_y = self.edge_offset_y - self.touch_points[1].var_x = SKIN_WIDTH - self.edge_offset_x - self.touch_points[1].var_y = self.edge_offset_y - self.touch_points[2].var_x = SKIN_WIDTH - self.edge_offset_x - self.touch_points[2].var_y = SKIN_HEIGHT - self.edge_offset_y - self.touch_points[3].var_x = self.edge_offset_x - self.touch_points[3].var_y = SKIN_HEIGHT - self.edge_offset_y - self.touch_points[4].var_x = SKIN_WIDTH / 2 - self.touch_points[4].var_y = SKIN_HEIGHT / 2 - - self.background = xbmcgui.ControlImage(0, 0, SKIN_WIDTH, SKIN_HEIGHT, - self.media_path + 'background.jpg', colorDiffuse = '0xffffffff') - self.addControl(self.background) - - tmp_str = "Tslib/Kodi calibration utility\n\nTouch crosshair to calibrate" - tmp_str += "\n\nresolution: " + str(self.getWidth()) + "x" + str(self.getHeight()) - tmp_str += "\nskin: " + str(SKIN_WIDTH) + "x" + str(SKIN_HEIGHT) - - self.about = xbmcgui.ControlLabel( - 10, 80, SKIN_WIDTH, 400, - "", textColor = '0xffffffff', font = 'font25', alignment = TEXT_ALIGN_CENTER_X) - self.addControl(self.about) - self.about.setLabel(tmp_str) - - self.info = xbmcgui.ControlLabel( - 20, SKIN_HEIGHT/2 - 40, - 1000, 400, - "", textColor = '0xffffffff', font = 'font30', alignment = TEXT_ALIGN_LEFT) - self.addControl(self.info) - self.info.setLabel("") - - if os.path.exists(SOCK_PATH): - os.remove(SOCK_PATH) - - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.bind(SOCK_PATH) - sock.listen(1) - - # enter calibration mode - os.system("killall -SIGUSR1 ts_uinput_touch") - - print 'Waiting for calibration connection' - conn, addr = sock.accept() - print 'Calibration connection accepted' - - self.t = Thread(target=server_thread, args=(conn, self,)) - self.t.start() - - def onAction(self, action): - if action == ACTION_PREVIOUS_MENU or action == ACTION_BACKSPACE: - self.retval = 0 - self.close() - -addon = xbmcaddon.Addon(id = 'service.touchscreen') -finished = False - -while finished == False: - dialog = ts_calibrate() - dialog.doModal() - - if dialog.retval == 0: - finished = True - del dialog - -del addon -# exit calibration mode -os.system("killall -SIGUSR2 ts_uinput_touch") - -if os.path.exists(SOCK_PATH): - os.remove(SOCK_PATH) - \ No newline at end of file diff --git a/packages/addons/service/touchscreen/source/config/ts.conf-generic b/packages/addons/service/touchscreen/source/config/ts.conf-generic deleted file mode 100644 index a3aeb4d74b..0000000000 --- a/packages/addons/service/touchscreen/source/config/ts.conf-generic +++ /dev/null @@ -1,8 +0,0 @@ -module_raw input grab_events=1 -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 - -module linear -# or use swap_xy parameter to swap axes -#module linear swap_xy=1 diff --git a/packages/addons/service/touchscreen/source/config/ts.conf-udoo_15_6 b/packages/addons/service/touchscreen/source/config/ts.conf-udoo_15_6 deleted file mode 100644 index d71e4cf123..0000000000 --- a/packages/addons/service/touchscreen/source/config/ts.conf-udoo_15_6 +++ /dev/null @@ -1,6 +0,0 @@ -# Udoo with 15.6" 1366x768 display with 3M USB Touchscreen - EX II -module_raw input grab_events=1 -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/addons/service/touchscreen/source/config/ts.conf-udoo_7 b/packages/addons/service/touchscreen/source/config/ts.conf-udoo_7 deleted file mode 100644 index 6dedf89a97..0000000000 --- a/packages/addons/service/touchscreen/source/config/ts.conf-udoo_7 +++ /dev/null @@ -1,3 +0,0 @@ -# Udoo with 7" 800x480 display with ST1232 touch controler -# only st1232 raw input module is used -module_raw st1232 grab_events=1 invert_y=480 diff --git a/packages/addons/service/touchscreen/source/config/ts.conf-waveshare b/packages/addons/service/touchscreen/source/config/ts.conf-waveshare deleted file mode 100644 index 1cfd5ab95b..0000000000 --- a/packages/addons/service/touchscreen/source/config/ts.conf-waveshare +++ /dev/null @@ -1,6 +0,0 @@ -# len is hidraw data size -module_raw waveshare len=22 -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/addons/service/touchscreen/source/config/ts_env.sh-sample b/packages/addons/service/touchscreen/source/config/ts_env.sh-sample deleted file mode 100644 index 586e702c02..0000000000 --- a/packages/addons/service/touchscreen/source/config/ts_env.sh-sample +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -# find touchscreen device by name (substring) using evtest program - -# $ evtest -# No device specified, trying to scan all of /dev/input/event* -# Available devices: -# /dev/input/event0: Video Bus -# /dev/input/event1: Goodix Capacitive TouchScreen -# Select the device event number [0-1]: - -TOUCHSCREEN_NAME="Goodix Capacitive TouchScreen" - -TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_NAME="$TOUCHSCREEN_NAME" '$0 ~ TS_NAME {print $1; exit}') -export TSLIB_TSDEVICE - -export TSLIB_PLUGINDIR=$ADDON_DIR/lib -export TSLIB_CONSOLEDEVICE=none -export TSLIB_FBDEVICE=/dev/fb0 -export TSLIB_CALIBFILE=/storage/.kodi/userdata/addon_data/service.touchscreen/pointercal -export TSLIB_CONFFILE=/storage/.kodi/userdata/addon_data/service.touchscreen/ts.conf - -# sometimes needed -#export TSLIB_RES_X=800 -#export TSLIB_RES_Y=480 diff --git a/packages/addons/service/touchscreen/source/config/ts_env.sh-waveshare b/packages/addons/service/touchscreen/source/config/ts_env.sh-waveshare deleted file mode 100644 index 347ce70dc6..0000000000 --- a/packages/addons/service/touchscreen/source/config/ts_env.sh-waveshare +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -# change vid/pid for waveshare touchscreen device -PRODUCT_VID=0EEF -PRODUCT_PID=0005 - -# device set directly or find automaticaly at the end of this script -export TSLIB_TSDEVICE="" -#export TSLIB_TSDEVICE="/dev/hidrawN" - -export TSLIB_PLUGINDIR=$ADDON_DIR/lib -export TSLIB_CONSOLEDEVICE=none -export TSLIB_FBDEVICE=/dev/fb0 -export TSLIB_CALIBFILE=/storage/.kodi/userdata/addon_data/service.touchscreen/pointercal -export TSLIB_CONFFILE=/storage/.kodi/userdata/addon_data/service.touchscreen/ts.conf - -export TSLIB_RES_X=800 -export TSLIB_RES_Y=480 - - -# find touchscreen device -if [ "$TSLIB_TSDEVICE" = "" ]; then - PRODUCT_VID_PID="0000${PRODUCT_VID}:0000${PRODUCT_PID}" - echo "PRODUCT_VID_PID: $PRODUCT_VID_PID" - - hidrawN="" - for dev in /sys/class/hidraw/hidraw*/device/uevent; do - echo - echo "device: $dev" - - HID_ID=$(cat $dev | grep HID_ID | grep "$PRODUCT_VID_PID") - if [ -n "$HID_ID" ]; then - hidrawN=$(echo $dev | awk -F "/" '{print $5}') - hidrawN="/dev/$hidrawN" - echo "OK HID_ID: $HID_ID" - echo "OK hidrawN: $hidrawN" - break - fi - done - - if [ -n "$hidrawN" ]; then - echo "found hidrawN: $hidrawN" - export TSLIB_TSDEVICE=$hidrawN - fi -fi diff --git a/packages/addons/service/touchscreen/source/lock-screen.py b/packages/addons/service/touchscreen/source/lock-screen.py deleted file mode 100644 index 37849b578d..0000000000 --- a/packages/addons/service/touchscreen/source/lock-screen.py +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -import xbmc -import xbmcgui -import xbmcaddon - -__scriptid__ = 'service.touchscreen' -__addon__ = xbmcaddon.Addon(id=__scriptid__) -_ = __addon__.getLocalizedString - -# http://forum.kodi.tv/showthread.php?tid=230766 -def handle_wait(time_to_wait, title, text): - dialog = xbmcgui.DialogProgress() - ret = dialog.create(' ' + title) - secs = 0 - percent = 0 - increment = int(100 / time_to_wait) - - while secs < time_to_wait: - secs += 1 - percent = increment*secs - secs_left = time_to_wait - secs - remaining_display = (_(2030).encode('utf-8')) % secs_left - dialog.update(percent, text, "", remaining_display) - xbmc.sleep(1000) - - dialog.close() - return False - -# how long to lock the screen -lock_secs = 30 -handle_wait(lock_secs, _(2010).encode('utf-8'), _(2020).encode('utf-8')) diff --git a/packages/addons/service/touchscreen/source/resources/language/English/strings.xml b/packages/addons/service/touchscreen/source/resources/language/English/strings.xml deleted file mode 100644 index b4a33ff2cd..0000000000 --- a/packages/addons/service/touchscreen/source/resources/language/English/strings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - General - Recalibrate after reboot - Clean screen - - Touchscreen - Now you can safely clean the screen. - Still %d seconds left. - diff --git a/packages/addons/service/touchscreen/source/resources/language/German/strings.xml b/packages/addons/service/touchscreen/source/resources/language/German/strings.xml deleted file mode 100644 index 80feb80aa0..0000000000 --- a/packages/addons/service/touchscreen/source/resources/language/German/strings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - Allgemein - Nach einem Neustart neu kalibrieren - Touchscreen reinigen - - Touchscreen - Sie können jetzt den Touchscreen sicher reinigen. - Noch %d Sekunden übrig. - diff --git a/packages/addons/service/touchscreen/source/resources/media/background.jpg b/packages/addons/service/touchscreen/source/resources/media/background.jpg deleted file mode 100644 index 914a971308..0000000000 Binary files a/packages/addons/service/touchscreen/source/resources/media/background.jpg and /dev/null differ diff --git a/packages/addons/service/touchscreen/source/resources/media/crosshair.png b/packages/addons/service/touchscreen/source/resources/media/crosshair.png deleted file mode 100644 index 779f142538..0000000000 Binary files a/packages/addons/service/touchscreen/source/resources/media/crosshair.png and /dev/null differ diff --git a/packages/addons/service/touchscreen/source/resources/screenshot-001.png b/packages/addons/service/touchscreen/source/resources/screenshot-001.png deleted file mode 100644 index b1df8b518f..0000000000 Binary files a/packages/addons/service/touchscreen/source/resources/screenshot-001.png and /dev/null differ diff --git a/packages/addons/service/touchscreen/source/resources/screenshot-002.png b/packages/addons/service/touchscreen/source/resources/screenshot-002.png deleted file mode 100644 index 43d004c6f9..0000000000 Binary files a/packages/addons/service/touchscreen/source/resources/screenshot-002.png and /dev/null differ diff --git a/packages/addons/service/touchscreen/source/resources/screenshot-003.png b/packages/addons/service/touchscreen/source/resources/screenshot-003.png deleted file mode 100644 index dbc56e1f0c..0000000000 Binary files a/packages/addons/service/touchscreen/source/resources/screenshot-003.png and /dev/null differ diff --git a/packages/addons/service/touchscreen/source/resources/screenshot-004.png b/packages/addons/service/touchscreen/source/resources/screenshot-004.png deleted file mode 100644 index a8e2c16b3d..0000000000 Binary files a/packages/addons/service/touchscreen/source/resources/screenshot-004.png and /dev/null differ diff --git a/packages/addons/service/touchscreen/source/resources/settings.xml b/packages/addons/service/touchscreen/source/resources/settings.xml deleted file mode 100644 index da8fd60acb..0000000000 --- a/packages/addons/service/touchscreen/source/resources/settings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/packages/addons/service/touchscreen/source/service.py b/packages/addons/service/touchscreen/source/service.py deleted file mode 100644 index c1e44fbba6..0000000000 --- a/packages/addons/service/touchscreen/source/service.py +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) diff --git a/packages/addons/service/touchscreen/source/system.d/service.touchscreen.service b/packages/addons/service/touchscreen/source/system.d/service.touchscreen.service deleted file mode 100644 index 4d8a8c6064..0000000000 --- a/packages/addons/service/touchscreen/source/system.d/service.touchscreen.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Touchscreen support daemon -After=graphical.target -Before=kodi.target - -[Service] -Type=oneshot -Environment=HOME=/storage -ExecStartPre=-/bin/sh -c "exec /bin/sh /storage/.kodi/addons/service.touchscreen/bin/ts_calibrate.sh service" -ExecStart=-/bin/sh -c "exec /bin/sh /storage/.kodi/addons/service.touchscreen/bin/ts_uinput_touch.sh service" -RemainAfterExit=yes - -[Install] -WantedBy=kodi.target diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk index 9978ba7799..9e7583df24 100644 --- a/packages/addons/service/ttyd/package.mk +++ b/packages/addons/service/ttyd/package.mk @@ -24,7 +24,7 @@ addon() { mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private - cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.19 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.20 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets-evlib_uv.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private } diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk index f4a8264952..50f53f81ff 100644 --- a/packages/addons/service/tvheadend43/package.mk +++ b/packages/addons/service/tvheadend43/package.mk @@ -125,7 +125,7 @@ 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.212 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + cp -P $(get_install_dir x265)/usr/lib/libx265.so.215 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend} fi diff --git a/packages/addons/service/usbmuxd/package.mk b/packages/addons/service/usbmuxd/package.mk index 23b4c60b8a..8491003efa 100644 --- a/packages/addons/service/usbmuxd/package.mk +++ b/packages/addons/service/usbmuxd/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="usbmuxd" -PKG_VERSION="360619c5f721f93f0b9d8af1a2df0b926fbcf281" -PKG_SHA256="3f36b9f427f388c701798904ed2655867e0113ef3ac68e73f1a69a6e5e2940b2" +PKG_VERSION="523f7004dce885fe38b4f80e34a8f76dc8ea98b5" +PKG_SHA256="a51615bb17bcf04ea4caac1edc58227a006a37b940878d3466b56a73b8b37af0" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -26,7 +26,9 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ configure_package() { # if using a git hash as a package version - set RELEASE_VERSION - export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}" + if [ -f ${PKG_BUILD}/NEWS ]; then + export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}" + fi } post_configure_target() { diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index 17409fb393..ff5aa75ab7 100644 --- a/packages/addons/service/vdr-addon/package.mk +++ b/packages/addons/service/vdr-addon/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-addon" -PKG_VERSION="2.7.1" +PKG_VERSION="2.7.7" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/tools/btrfs-progs/package.mk b/packages/addons/tools/btrfs-progs/package.mk index e838b4334f..efab9b4972 100644 --- a/packages/addons/tools/btrfs-progs/package.mk +++ b/packages/addons/tools/btrfs-progs/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="btrfs-progs" -PKG_VERSION="6.10.1" -PKG_SHA256="ce7f1d1c33bf5b3acd418466e7e412026e435b05f187e779a1c5303ebf1b1f96" +PKG_VERSION="6.15" +PKG_SHA256="1f10d3f639595a041d64651fea9b0d593addb4057118b35f5938b5b4618548a4" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index b5694cfd36..bbcec20d71 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -26,7 +26,7 @@ addon() { # libs if [ "${TARGET_ARCH}" = "x86_64" ]; then - cp -PL $(get_install_dir x265)/usr/lib/libx265.so.212 \ + cp -PL $(get_install_dir x265)/usr/lib/libx265.so.215 \ ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private fi } diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 80fec33c2d..ef93320b1f 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -11,7 +11,7 @@ PKG_URL="" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="virtual" PKG_SHORTDESC="A bundle of system tools and programs" -PKG_LONGDESC="This bundle currently includes 7-zip, autossh, bottom, diffutils, dool, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, libgpiod, lm_sensors, lshw, mc, mmc-utils, mtpfs, nmon, patch, pv, screen, smartmontools, stress-ng, tree, unrar, usb-modeswitch and vim." +PKG_LONGDESC="This bundle currently includes 7-zip, autossh, bottom, diffutils, dool, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, libgpiod, lm_sensors, lshw, mc, mmc-utils, mtpfs, nmon, patch, pv, screen, smartmontools, stress-ng, tmux, tree, unrar, usb-modeswitch and vim." PKG_IS_ADDON="yes" PKG_ADDON_NAME="System Tools" @@ -49,6 +49,7 @@ PKG_DEPENDS_TARGET="toolchain \ sdparm \ smartmontools \ stress-ng \ + tmux \ tree \ unrar \ usb-modeswitch \ @@ -179,6 +180,9 @@ addon() { # stress-ng cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + # tmux + cp -P $(get_install_dir tmux)/usr/bin/tmux ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + # tree cp -P $(get_install_dir tree)/usr/bin/tree ${ADDON_BUILD}/${PKG_ADDON_ID}/bin diff --git a/packages/audio/libcdio/package.mk b/packages/audio/libcdio/package.mk index 727fb59a09..be32fcd227 100644 --- a/packages/audio/libcdio/package.mk +++ b/packages/audio/libcdio/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.1.0" PKG_SHA256="8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" PKG_LICENSE="GPLv3" PKG_SITE="https://www.gnu.org/software/libcdio/" -PKG_URL="http://ftpmirror.gnu.org/libcdio/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_URL="https://ftpmirror.gnu.org/libcdio/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A CD-ROM reading and control library." PKG_BUILD_FLAGS="+pic" diff --git a/packages/compress/7-zip/package.mk b/packages/compress/7-zip/package.mk index cba9aea3ad..d0a3272feb 100644 --- a/packages/compress/7-zip/package.mk +++ b/packages/compress/7-zip/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) PKG_NAME="7-zip" -PKG_VERSION="23.01" -PKG_SHA256="356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74" +PKG_VERSION="25.00" +PKG_SHA256="bff9e69b6ca73a5b8715d7623870a39dc90ad6ce1f4d1070685843987af1af9b" PKG_LICENSE="7-Zip" PKG_SITE="https://www.7-zip.org" PKG_URL="https://www.7-zip.org/a/7z${PKG_VERSION/./}-src.tar.xz" diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk index 02212115c5..3e657fc08a 100644 --- a/packages/devel/autoconf-archive/package.mk +++ b/packages/devel/autoconf-archive/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2023.02.20" PKG_SHA256="71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/software/autoconf-archive/" -PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="autoconf-archive is an package of m4 macros" diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk index c34acc5f2a..092b62650d 100644 --- a/packages/devel/automake/package.mk +++ b/packages/devel/automake/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.16.5" PKG_SHA256="f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469" PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/automake/" -PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host autoconf:host" PKG_LONGDESC="A GNU tool for automatically creating Makefiles." PKG_BUILD_FLAGS="-parallel" diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk index 00bce3137c..444ae46f90 100644 --- a/packages/devel/bison/package.mk +++ b/packages/devel/bison/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.8.2" PKG_SHA256="9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/bison/" -PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host m4:host" PKG_LONGDESC="A general-purpose parser generator." PKG_BUILD_FLAGS="-parallel" diff --git a/packages/devel/libplist/package.mk b/packages/devel/libplist/package.mk index 6eaf90bad6..a38f87c582 100644 --- a/packages/devel/libplist/package.mk +++ b/packages/devel/libplist/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) PKG_NAME="libplist" -PKG_VERSION="2.4.0" -PKG_SHA256="3f5868ae15b117320c1ff5e71be53d29469d4696c4085f89db1975705781a7cd" +PKG_VERSION="2.7.0" +PKG_SHA256="7ac42301e896b1ebe3c654634780c82baa7cb70df8554e683ff89f7c2643eb8b" PKG_LICENSE="GPL" PKG_SITE="http://www.libimobiledevice.org/" PKG_URL="https://github.com/libimobiledevice/libplist/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" diff --git a/packages/devel/m4/package.mk b/packages/devel/m4/package.mk index 328a79a8c8..d4205ed5fc 100644 --- a/packages/devel/m4/package.mk +++ b/packages/devel/m4/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.4.19" PKG_SHA256="b306a91c0fd93bc4280cfc2e98cb7ab3981ff75a187bea3293811f452c89a8c8" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/m4/" -PKG_URL="http://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_URL="https://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="The m4 macro processor." diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk index e9a4793e6f..169cdf459e 100644 --- a/packages/devel/make/package.mk +++ b/packages/devel/make/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.4.1" PKG_SHA256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3" PKG_LICENSE="GPLv3" PKG_SITE="https://www.gnu.org/software/make/" -PKG_URL="http://ftpmirror.gnu.org/make/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="https://ftpmirror.gnu.org/make/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="" PKG_LONGDESC="Utility to maintain groups of programs." PKG_BUILD_FLAGS="+local-cc" diff --git a/packages/devel/mpc/package.mk b/packages/devel/mpc/package.mk index 1965490da3..a544064663 100644 --- a/packages/devel/mpc/package.mk +++ b/packages/devel/mpc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.1" PKG_SHA256="ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8" PKG_LICENSE="LGPL" PKG_SITE="https://www.multiprecision.org" -PKG_URL="http://ftpmirror.gnu.org/mpc/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="https://ftpmirror.gnu.org/mpc/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="ccache:host gmp:host mpfr:host" PKG_LONGDESC="A C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result." diff --git a/packages/devel/mpfr/package.mk b/packages/devel/mpfr/package.mk index 41821ccf4d..5bfb18486d 100644 --- a/packages/devel/mpfr/package.mk +++ b/packages/devel/mpfr/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.2.1" PKG_SHA256="277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2" PKG_LICENSE="LGPL" PKG_SITE="http://www.mpfr.org/" -PKG_URL="http://ftpmirror.gnu.org/mpfr/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://ftpmirror.gnu.org/mpfr/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host gmp:host" PKG_DEPENDS_TARGET="gmp" PKG_LONGDESC="A C library for multiple-precision floating-point computations with exact rounding." diff --git a/packages/devel/readline/package.mk b/packages/devel/readline/package.mk index b44e04f822..f546744ef9 100644 --- a/packages/devel/readline/package.mk +++ b/packages/devel/readline/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="8.2" PKG_SHA256="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" PKG_LICENSE="MIT" PKG_SITE="http://www.gnu.org/software/readline/" -PKG_URL="http://ftpmirror.gnu.org/readline/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="https://ftpmirror.gnu.org/readline/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in." PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/gdk-pixbuf/package.mk b/packages/graphics/gdk-pixbuf/package.mk index 4ee41fb378..ab4480b948 100644 --- a/packages/graphics/gdk-pixbuf/package.mk +++ b/packages/graphics/gdk-pixbuf/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gdk-pixbuf" -PKG_VERSION="2.42.12" -PKG_SHA256="b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7" +PKG_VERSION="2.43.2" +PKG_SHA256="a386a85c74021fa62d22297db122d231cc68fdd342761fb978c446f73f2606dc" PKG_LICENSE="OSS" PKG_SITE="http://www.gtk.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-${PKG_VERSION}.tar.xz" @@ -20,8 +20,7 @@ configure_package() { pre_configure_target() { PKG_MESON_OPTS_TARGET="--wrap-mode=nodownload \ - -Dgtk_doc=false \ - -Ddocs=false \ + -Ddocumentation=false \ -Dintrospection=disabled \ -Dman=false \ -Drelocatable=false \ diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index 0ddc5f5e2d..44098aabd5 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="peripheral.joystick" diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk index 5c315b8fbf..046f8fa7a8 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="screensaver.asterwave" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk index b4292c41fd..1bdd6c09ca 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="visualization.pictureit" diff --git a/packages/network/libnl/package.mk b/packages/network/libnl/package.mk index be274f6cca..bceb151842 100644 --- a/packages/network/libnl/package.mk +++ b/packages/network/libnl/package.mk @@ -10,6 +10,7 @@ PKG_SITE="https://github.com/thom311/libnl" PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A library for applications dealing with netlink socket." +PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared \ diff --git a/packages/rust/bindgen-cli/package.mk b/packages/rust/bindgen-cli/package.mk new file mode 100644 index 0000000000..b97e80eb23 --- /dev/null +++ b/packages/rust/bindgen-cli/package.mk @@ -0,0 +1,27 @@ +# spdx-license-identifier: gpl-2.0-only +# copyright (c) 2024-present team libreelec (https://libreelec.tv) + +PKG_NAME="bindgen-cli" +PKG_VERSION="0.72.0" +PKG_SHA256="1da7050a17fdab0e20d5d8c20d48cddce2973e8b7cb0afc15185bfad22f8ce5b" +PKG_LICENSE="BSD-3-Clause" +PKG_SITE="https://rust-lang.github.io/rust-bindgen/" +PKG_URL="https://github.com/rust-lang/rust-bindgen/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_HOST="cargo:host" +PKG_LONGDESC="Automatically generates Rust FFI bindings to C and some C++ libraries" +PKG_TOOLCHAIN="manual" + +configure_host() { + cd ${PKG_BUILD} +} + +make_host() { + cd ${PKG_BUILD} + + cargo build -v --target ${RUST_HOST} --release +} + +makeinstall_host() { + mkdir -p ${TOOLCHAIN}/bin + cp -a ${PKG_BUILD}/.${RUST_HOST}/target/${RUST_HOST}/release/bindgen ${TOOLCHAIN}/bin/ +} diff --git a/packages/rust/cargo-snapshot/package.mk b/packages/rust/cargo-snapshot/package.mk index eefe93a86e..533b0ed1a5 100644 --- a/packages/rust/cargo-snapshot/package.mk +++ b/packages/rust/cargo-snapshot/package.mk @@ -10,15 +10,15 @@ PKG_TOOLCHAIN="manual" case "${MACHINE_HARDWARE_NAME}" in "aarch64") - PKG_SHA256="5173f84a07d4cc6b19f27eda7464999c5886232ce8e54bf61b06617635d43fb9" + PKG_SHA256="76f8927e4923c26c51b60ef99a29f3609843b3a2730f0bdf2ea6958626f11b11" PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" ;; "arm") - PKG_SHA256="3c69ce28099974d5b2698aca4c10c88b4f2e04a89f44627373d98a76f9b9efc7" + PKG_SHA256="4ccb670c1336c54fae917b045520793330d670cce953f49ce859da9dbbb8a28d" PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnueabihf.tar.xz" ;; "x86_64") - PKG_SHA256="f8aacf7a101eb10dc000b8bf26de90a9d0ce678d02ccf70430ed20dd31ecec6b" + PKG_SHA256="c50ee4b1ae8695461930e36d5465dddb7c7a0e0f0aa6cbd60de120b17c38b841" PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" ;; esac diff --git a/packages/rust/rust-std-snapshot/package.mk b/packages/rust/rust-std-snapshot/package.mk index 3f32c97902..cad986c581 100644 --- a/packages/rust/rust-std-snapshot/package.mk +++ b/packages/rust/rust-std-snapshot/package.mk @@ -10,15 +10,15 @@ PKG_TOOLCHAIN="manual" case "${MACHINE_HARDWARE_NAME}" in "aarch64") - PKG_SHA256="66cf114dcd8056a596bf169f824ff95ff1837bc065daaafdbcaa02ce92903304" + PKG_SHA256="85567f037cee338f8ec8f9b6287a7f200d221658a996cba254abc91606ece6f4" PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" ;; "arm") - PKG_SHA256="897271da9a11a6783b736f7d2a600e3a6782618ebe28cf24713986ab8f90c871" + PKG_SHA256="bb146097d9e5f2173cdd7afa4e813f5e68688da371171427d60778e7220e6ec5" PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnueabihf.tar.xz" ;; "x86_64") - PKG_SHA256="95aece42a336f237c5bac5c5d9aca051b7f0bd3e6a64fb3c5828e6d0d3af2e8c" + PKG_SHA256="6ddf80f254e8eea9956308ba89fd68e1ac7885853df9239b07bbc9f047b7562f" PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" ;; esac diff --git a/packages/rust/rust/package.mk b/packages/rust/rust/package.mk index 4b67bbb68d..9cb181880b 100644 --- a/packages/rust/rust/package.mk +++ b/packages/rust/rust/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rust" -PKG_VERSION="1.78.0" -PKG_SHA256="ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9" +PKG_VERSION="1.81.0" +PKG_SHA256="872448febdff32e50c3c90a7e15f9bb2db131d13c588fe9071b0ed88837ccfa7" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-src.tar.gz" diff --git a/packages/rust/rustc-snapshot/package.mk b/packages/rust/rustc-snapshot/package.mk index a24e6fe594..c2e1de426b 100644 --- a/packages/rust/rustc-snapshot/package.mk +++ b/packages/rust/rustc-snapshot/package.mk @@ -10,15 +10,15 @@ PKG_TOOLCHAIN="manual" case "${MACHINE_HARDWARE_NAME}" in "aarch64") - PKG_SHA256="e0450bef5537e6b0bb82872e9f837c3b3f6397cc8eba6f53211481c82426e1ce" + PKG_SHA256="301f651f38f8c52ebaad0ac7eb211a5ea25c3b690686d1c265febeee62d2c6fc" PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" ;; "arm") - PKG_SHA256="8e42581140e56ad55a67e2e8a3b562b86fa7571bbc394c0df8696f0276a8faf3" + PKG_SHA256="8296d253467270e0fea3ace51ee0f997f7614feb83337b319e51cd6d22026baa" PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnueabihf.tar.xz" ;; "x86_64") - PKG_SHA256="3994971e5923716d54e4b574ce238f04c4e20cda03990670f7cc3f87d36e5499" + PKG_SHA256="988a4e4cdecebe4f4a0c52ec4ade5a5bfc58d6958969f5b1e8aac033bda2613e" PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" ;; esac diff --git a/packages/addons/addon-depends/libseccomp/package.mk b/packages/security/libseccomp/package.mk similarity index 100% rename from packages/addons/addon-depends/libseccomp/package.mk rename to packages/security/libseccomp/package.mk diff --git a/packages/sysutils/fuse3/package.mk b/packages/sysutils/fuse3/package.mk index 652b157deb..9bf6657290 100644 --- a/packages/sysutils/fuse3/package.mk +++ b/packages/sysutils/fuse3/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fuse3" -PKG_VERSION="3.16.2" -PKG_SHA256="f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" +PKG_VERSION="3.17.3" +PKG_SHA256="de8190448909aa97a222d435bc130aae98331bed4215e9f4519b4b5b285a1d63" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libfuse/libfuse/" PKG_URL="https://github.com/libfuse/libfuse/releases/download/fuse-${PKG_VERSION}/fuse-${PKG_VERSION}.tar.gz" diff --git a/packages/sysutils/parted/package.mk b/packages/sysutils/parted/package.mk index 775eee1a15..e287e0e774 100644 --- a/packages/sysutils/parted/package.mk +++ b/packages/sysutils/parted/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.6" PKG_SHA256="3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/parted/" -PKG_URL="http://ftpmirror.gnu.org/parted/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://ftpmirror.gnu.org/parted/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host util-linux:host" PKG_DEPENDS_TARGET="toolchain util-linux parted:host" PKG_DEPENDS_INIT="toolchain util-linux:init parted" diff --git a/packages/addons/addon-depends/libiconv/package.mk b/packages/textproc/libiconv/package.mk similarity index 89% rename from packages/addons/addon-depends/libiconv/package.mk rename to packages/textproc/libiconv/package.mk index 4bfd397dd2..a9e866c472 100644 --- a/packages/addons/addon-depends/libiconv/package.mk +++ b/packages/textproc/libiconv/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libiconv" -PKG_VERSION="1.17" -PKG_SHA256="8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313" +PKG_VERSION="1.18" +PKG_SHA256="3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8" PKG_LICENSE="GPL" PKG_SITE="https://savannah.gnu.org/projects/libiconv/" PKG_URL="https://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk index 85351183e3..bd76742170 100644 --- a/packages/tools/mtools/package.mk +++ b/packages/tools/mtools/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.0.43" PKG_SHA256="541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/mtools/" -PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_URL="https://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="toolchain:host" PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks" PKG_TOOLCHAIN="autotools" diff --git a/packages/wayland/libxkbcommon/package.mk b/packages/wayland/libxkbcommon/package.mk index 23035a3899..7de2c2f32b 100644 --- a/packages/wayland/libxkbcommon/package.mk +++ b/packages/wayland/libxkbcommon/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxkbcommon" -PKG_VERSION="1.6.0" -PKG_SHA256="0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b" +PKG_VERSION="1.10.0" +PKG_SHA256="0427585a4d6ca17c9fc1ac4b539bf303348e9080af70c5ea402503bc370a9631" PKG_LICENSE="MIT" PKG_SITE="https://xkbcommon.org" -PKG_URL="https://xkbcommon.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain xkeyboard-config libxml2" PKG_LONGDESC="xkbcommon is a library to handle keyboard descriptions." diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk index e08385774d..7b9ba2fe35 100644 --- a/packages/web/libmicrohttpd/package.mk +++ b/packages/web/libmicrohttpd/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.1" PKG_SHA256="a89e09fc9b4de34dde19f4fcb4faaa1ce10299b9908db1132bbfa1de47882b94" PKG_LICENSE="LGPLv2.1" PKG_SITE="https://www.gnu.org/software/libmicrohttpd/" -PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="https://ftpmirror.gnu.org/libmicrohttpd/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain gnutls" PKG_LONGDESC="A small C library that is supposed to make it easy to run an HTTP server as part of another application." diff --git a/tools/download-tool b/tools/download-tool index 92f42bebaa..b854042a26 100755 --- a/tools/download-tool +++ b/tools/download-tool @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) +# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv) if [ -z "$PROJECT" -a -z "$ARCH" ]; then echo "Usage: PROJECT= ARCH= $0" diff --git a/tools/repo-tool b/tools/repo-tool index c1295aff01..ceb4ed1631 100755 --- a/tools/repo-tool +++ b/tools/repo-tool @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) +# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv) . config/options