Skip to content

Commit f6ed7fd

Browse files
authored
Merge pull request #11132 from heitbaum/pkg
Package updates
2 parents 14b0c24 + b4adc85 commit f6ed7fd

8 files changed

Lines changed: 44 additions & 112 deletions

File tree

packages/devel/cmake/package.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
44

55
PKG_NAME="cmake"
6-
PKG_VERSION="4.3.0"
7-
PKG_SHA256="f51b3c729f85d8dde46a92c071d2826ea6afb77d850f46894125de7cc51baa77"
6+
PKG_VERSION="4.3.1"
7+
PKG_SHA256="0798f4be7a1a406a419ac32db90c2956936fecbf50db3057d7af47d69a2d7edb"
88
PKG_LICENSE="BSD"
99
PKG_SITE="https://cmake.org/"
1010
PKG_URL="https://cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz"

packages/graphics/libjpeg-turbo/package.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
44

55
PKG_NAME="libjpeg-turbo"
6-
PKG_VERSION="3.1.4"
7-
PKG_SHA256="e23d3ebb2c6ee4d0e2a5823dbb55b614845df5ea3435c956fed5cf04041a87ad"
6+
PKG_VERSION="3.1.4.1"
7+
PKG_SHA256="ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022"
88
PKG_LICENSE="GPL"
99
PKG_SITE="https://libjpeg-turbo.org/"
1010
PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/python/devel/pyinstaller/package.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
33

44
PKG_NAME="pyinstaller"
5-
PKG_VERSION="0.7.0"
6-
PKG_SHA256="a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631"
5+
PKG_VERSION="1.0.0"
6+
PKG_SHA256="c6d691331621cf3fec4822f5c6f83cab3705f79b316225dc454127411677c71f"
77
PKG_LICENSE="MIT"
88
PKG_SITE="https://pypi.org/project/installer/"
99
PKG_URL="https://files.pythonhosted.org/packages/source/i/installer/installer-${PKG_VERSION}.tar.gz"

packages/python/devel/pyinstaller/patches/pyinstaller-0216-Add-overwrite-existing-option-that-overwrites-existi.patch

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

packages/x11/app/setxkbmap/package.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
44

55
PKG_NAME="setxkbmap"
6-
PKG_VERSION="1.3.4"
7-
PKG_SHA256="be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade"
6+
PKG_VERSION="1.3.5"
7+
PKG_SHA256="360193cecc93f906d8383a8fb5c1f3a7eed35e6ced0e118a64ee56ae13c88cac"
88
PKG_LICENSE="OSS"
99
PKG_SITE="https://www.X.org"
1010
PKG_URL="https://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.xz"
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From bba910c394ae0f70e01ca9237055c887c7271296 Mon Sep 17 00:00:00 2001
2+
From: Stephan Raue <stephan@openelec.tv>
3+
Date: Wed, 5 Jun 2013 05:12:24 +0200
4+
Subject: [PATCH] disable nls tests
5+
6+
---
7+
nls/Makefile.am | 8 ++++----
8+
1 file changed, 4 insertions(+), 4 deletions(-)
9+
10+
diff --git a/nls/Makefile.am b/nls/Makefile.am
11+
index 7eda58e44b..6b03567a4c 100644
12+
--- a/nls/Makefile.am
13+
+++ b/nls/Makefile.am
14+
@@ -36,10 +36,10 @@ locale.dir: locale.dir.pre
15+
< locale.dir.l1 > locale.dir.l2
16+
cat locale.dir.l2 locale.dir.l1 > locale.dir
17+
18+
-if HAVE_PERL
19+
-LOG_COMPILER = $(PERL)
20+
-TESTS = compose-check.pl
21+
-endif HAVE_PERL
22+
+# if HAVE_PERL
23+
+# LOG_COMPILER = $(PERL)
24+
+# TESTS = compose-check.pl
25+
+# endif HAVE_PERL
26+
27+
28+
# Per-locale data files
29+
--
30+
2.53.0
31+

packages/x11/lib/libX11/patches/libX11-disable_nls_tests.patch

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

tools/docker/resolute/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ RUN apt-get update \
1919
&& apt-get install -y \
2020
curl bash bc gcc-15 cpp-15 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
2121
unzip diffutils lzop make file g++-15 xfonts-utils xsltproc default-jre-headless python3 \
22-
libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
23-
golang-1.25-go git openssh-client rsync upx-ucl \
22+
libc6-dev libcrypt-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
23+
golang-1.26-go git openssh-client rsync upx-ucl \
2424
--no-install-recommends \
25-
&& ln -s /usr/lib/go-1.25 /usr/lib/go \
26-
&& ln -s /usr/lib/go-1.25/bin/go /usr/bin/go \
27-
&& ln -s /usr/lib/go-1.25/bin/gofmt /usr/bin/gofmt
25+
&& ln -s /usr/lib/go-1.26 /usr/lib/go \
26+
&& ln -s /usr/lib/go-1.26/bin/go /usr/bin/go \
27+
&& ln -s /usr/lib/go-1.26/bin/gofmt /usr/bin/gofmt
2828

2929
RUN if [ "$(uname -m)" = "aarch64" ]; then \
3030
apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \

0 commit comments

Comments
 (0)