mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 14:16:40 +00:00
Merge pull request #10264 from heitbaum/pkg12
[le12.2] Selective Package Updates
This commit is contained in:
commit
fb315d45bf
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="gdb"
|
||||
PKG_VERSION="14.2"
|
||||
PKG_SHA256="2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772"
|
||||
PKG_VERSION="16.3"
|
||||
PKG_SHA256="bcfcd095528a987917acf9fff3f1672181694926cc18d609c99d0042c00224c5"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.gnu.org/software/gdb/"
|
||||
PKG_URL="https://ftp.gnu.org/gnu/gdb/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libbpf"
|
||||
PKG_VERSION="1.3.0"
|
||||
PKG_SHA256="11db86acd627e468bc48b7258c1130aba41a12c4d364f78e184fd2f5a913d861"
|
||||
PKG_VERSION="1.6.1"
|
||||
PKG_SHA256="f6fa65c86f20d6d2d5d958f8bb8203a580a1c7496173714582300b724e37e338"
|
||||
PKG_LICENSE="LGPL-2.1"
|
||||
PKG_SITE="https://github.com/libbpf/libbpf"
|
||||
PKG_URL="https://github.com/libbpf/libbpf/archive/refs/tags/v${PKG_VERSION}.tar.gz"
|
||||
|
@ -23,7 +23,7 @@ index 81ea6b8..7ab5f13 100644
|
||||
@@ -106,7 +103,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
|
||||
$^ $(ALL_LDFLAGS) -o $@
|
||||
|
||||
$(OBJDIR)/libbpf.pc: force
|
||||
$(OBJDIR)/libbpf.pc: force | $(OBJDIR)
|
||||
- $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
|
||||
+ $(Q)sed -e "s|@PREFIX@|$(PREFIX_PC)|" \
|
||||
-e "s|@LIBDIR@|$(LIBDIR_PC)|" \
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libcec"
|
||||
PKG_VERSION="4.0.7"
|
||||
PKG_SHA256="bcd92c376993a5721d346edcc09eb17289451f9156b1d1d113c9663c2046315a"
|
||||
PKG_VERSION="7.1.1"
|
||||
PKG_SHA256="7f7da95a4c1e7160d42ca37a3ac80cf6f389b317e14816949e0fa5e2edf4cc64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://libcec.pulse-eight.com/"
|
||||
PKG_URL="https://github.com/Pulse-Eight/libcec/archive/libcec-${PKG_VERSION}.tar.gz"
|
||||
@ -13,11 +13,10 @@ PKG_LONGDESC="libCEC is an open-source dual licensed library designed for commun
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=1 \
|
||||
-DCMAKE_INSTALL_LIBDIR:STRING=lib \
|
||||
-DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \
|
||||
-DSKIP_PYTHON_WRAPPER=1 \
|
||||
-DHAVE_IMX_API=0 \
|
||||
-DHAVE_AOCEC_API=0 -DHAVE_AMLOGIC_API=0 \
|
||||
-DHAVE_GIT_BIN=0 \
|
||||
-DHAVE_AOCEC_API=0 \
|
||||
-DGIT_BIN=0 \
|
||||
-DHAVE_RPI_LIB=0"
|
||||
|
||||
# libX11 and xrandr to read the sink's EDID, used to determine the PC's HDMI physical address
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="brcmfmac_sdio-firmware"
|
||||
PKG_VERSION="d4382f99141ef7bc0a9a9e65ab5fa3d90e8fe968"
|
||||
PKG_SHA256="2bbe39941c97ae3713f219002e5d6d692e3d47fc167fe642be1d9f2f014d4f05"
|
||||
PKG_VERSION="88e46425ef489513c0b8bf7c2747d262367be1cc"
|
||||
PKG_SHA256="53a264536cd9531e94117f8fe2906bcb85efd201612f5f7e467bf4fbf2d6d864"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/LibreELEC/brcmfmac_sdio-firmware"
|
||||
PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/${PKG_VERSION}.tar.gz"
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="bluez"
|
||||
PKG_VERSION="5.75"
|
||||
PKG_SHA256="988cb3c4551f6e3a667708a578f5ca9f93fc896508f98f08709be4f8ab033c2f"
|
||||
PKG_VERSION="5.83"
|
||||
PKG_SHA256="108522d909d220581399bfec93daab62035539ceef3dda3e79970785c63bd24c"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.bluez.org/"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
@ -2,7 +2,7 @@ diff --git a/src/bluetooth.conf b/src/bluetooth.conf
|
||||
index 8a1e258..31b7542 100644
|
||||
--- a/src/bluetooth.conf
|
||||
+++ b/src/bluetooth.conf
|
||||
@@ -20,10 +20,24 @@
|
||||
@@ -21,10 +21,24 @@
|
||||
<allow send_interface="org.freedesktop.DBus.ObjectManager"/>
|
||||
<allow send_interface="org.freedesktop.DBus.Properties"/>
|
||||
<allow send_interface="org.mpris.MediaPlayer2.Player"/>
|
||||
|
@ -1,25 +0,0 @@
|
||||
From 20dfa1079c088236bcd63f1a986956b488177ebf Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Tue, 6 Aug 2013 11:18:09 +0300
|
||||
Subject: [PATCH] obexd: use system bus
|
||||
|
||||
---
|
||||
obexd/src/manager.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
|
||||
index dbfbef8..9a29f8c 100644
|
||||
--- a/obexd/src/manager.c
|
||||
+++ b/obexd/src/manager.c
|
||||
@@ -569,7 +569,7 @@ gboolean manager_init(void)
|
||||
|
||||
dbus_error_init(&err);
|
||||
|
||||
- connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OBEXD_SERVICE, &err);
|
||||
+ connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OBEXD_SERVICE, &err);
|
||||
if (connection == NULL) {
|
||||
if (dbus_error_is_set(&err) == TRUE) {
|
||||
fprintf(stderr, "%s\n", err.message);
|
||||
--
|
||||
1.7.2.5
|
||||
|
@ -17,7 +17,7 @@ diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
|
||||
index 939fed7..f6baea7 100644
|
||||
--- a/plugins/sixaxis.c
|
||||
+++ b/plugins/sixaxis.c
|
||||
@@ -364,7 +364,13 @@ static bool setup_device(int fd, const char *sysfs_path,
|
||||
@@ -354,7 +354,13 @@ static bool setup_device(int fd, const char *sysfs_path,
|
||||
info("sixaxis: setting up new device");
|
||||
|
||||
btd_device_device_set_name(device, cp->name);
|
||||
@ -36,7 +36,7 @@ diff --git a/profiles/input/sixaxis.h b/profiles/input/sixaxis.h
|
||||
index 8e6f3cc..321a918 100644
|
||||
--- a/profiles/input/sixaxis.h
|
||||
+++ b/profiles/input/sixaxis.h
|
||||
@@ -38,6 +38,7 @@ struct cable_pairing {
|
||||
@@ -25,6 +25,7 @@ struct cable_pairing {
|
||||
uint16_t vid;
|
||||
uint16_t pid;
|
||||
uint16_t version;
|
||||
@ -44,7 +44,7 @@ index 8e6f3cc..321a918 100644
|
||||
CablePairingType type;
|
||||
};
|
||||
|
||||
@@ -59,6 +60,7 @@ get_pairing(uint16_t vid, uint16_t pid)
|
||||
@@ -54,6 +55,7 @@ get_pairing(uint16_t vid, uint16_t pid)
|
||||
.vid = 0x054c,
|
||||
.pid = 0x042f,
|
||||
.version = 0x0000,
|
||||
|
@ -7,9 +7,9 @@ index b7e9f2d33..9a9e9a0a0 100644
|
||||
-if OBEX
|
||||
-
|
||||
if SYSTEMD
|
||||
systemduserunitdir = $(SYSTEMD_USERUNITDIR)
|
||||
systemduserunit_DATA = obexd/src/obex.service
|
||||
@@ -41,6 +39,8 @@ obexd_builtin_sources += obexd/plugins/opp.c
|
||||
systemduserunit_DATA += obexd/src/obex.service
|
||||
|
||||
@@ -40,6 +38,8 @@ obexd_builtin_sources += obexd/plugins/opp.c
|
||||
obexd_builtin_modules += ftp
|
||||
obexd_builtin_sources += obexd/plugins/ftp.c obexd/plugins/ftp.h
|
||||
|
||||
@ -18,7 +18,7 @@ index b7e9f2d33..9a9e9a0a0 100644
|
||||
obexd_builtin_modules += irmc
|
||||
obexd_builtin_sources += obexd/plugins/irmc.c
|
||||
|
||||
@@ -57,6 +57,8 @@ obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
|
||||
@@ -56,6 +56,8 @@ obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
|
||||
obexd/plugins/messages.h \
|
||||
obexd/plugins/messages-dummy.c
|
||||
|
||||
@ -27,7 +27,7 @@ index b7e9f2d33..9a9e9a0a0 100644
|
||||
obexd_builtin_modules += mns
|
||||
obexd_builtin_sources += obexd/client/mns.c obexd/src/map_ap.h \
|
||||
obexd/client/map-event.h
|
||||
@@ -103,11 +105,6 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
|
||||
@@ -107,11 +109,6 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
||||
-I$(builddir)/obexd/src
|
||||
|
||||
@ -36,6 +36,6 @@ index b7e9f2d33..9a9e9a0a0 100644
|
||||
-obexd-remove-service-symlink:
|
||||
-endif
|
||||
-
|
||||
obexd_src_obexd_SHORTNAME = obexd
|
||||
|
||||
obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist)
|
||||
if OBEX
|
||||
if SYSTEMD
|
||||
obexd_src_obexd_CPPFLAGS += -DSYSTEMD
|
||||
|
@ -33,7 +33,7 @@ diff --git a/Makefile.tools b/Makefile.tools
|
||||
index b7b422506..e0e995089 100644
|
||||
--- a/Makefile.tools
|
||||
+++ b/Makefile.tools
|
||||
@@ -304,6 +304,7 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
|
||||
@@ -417,6 +417,7 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
|
||||
tools/hciattach_ti.c \
|
||||
tools/hciattach_tialt.c \
|
||||
tools/hciattach_ath3k.c \
|
||||
@ -45,7 +45,7 @@ diff --git a/android/Android.mk b/android/Android.mk
|
||||
index 76a826b47..01599c04b 100644
|
||||
--- a/android/Android.mk
|
||||
+++ b/android/Android.mk
|
||||
@@ -696,6 +696,7 @@ LOCAL_SRC_FILES := \
|
||||
@@ -697,6 +697,7 @@ LOCAL_SRC_FILES := \
|
||||
bluez/tools/hciattach_ti.c \
|
||||
bluez/tools/hciattach_tialt.c \
|
||||
bluez/tools/hciattach_ath3k.c \
|
||||
@ -57,7 +57,7 @@ diff --git a/tools/hciattach.c b/tools/hciattach.c
|
||||
index fad176c9b..02a65c692 100644
|
||||
--- a/tools/hciattach.c
|
||||
+++ b/tools/hciattach.c
|
||||
@@ -263,6 +263,11 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti)
|
||||
@@ -252,6 +252,11 @@ static int ath3k_pm(int fd, struct uart_t *u, struct termios *ti)
|
||||
return ath3k_post(fd, u->pm);
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ index fad176c9b..02a65c692 100644
|
||||
static int qualcomm(int fd, struct uart_t *u, struct termios *ti)
|
||||
{
|
||||
return qualcomm_init(fd, u->speed, ti, u->bdaddr);
|
||||
@@ -1093,6 +1098,10 @@ struct uart_t uart[] = {
|
||||
@@ -1082,6 +1087,10 @@ struct uart_t uart[] = {
|
||||
{ "ath3k", 0x0000, 0x0000, HCI_UART_ATH3K, 115200, 115200,
|
||||
FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm },
|
||||
|
||||
@ -80,7 +80,7 @@ index fad176c9b..02a65c692 100644
|
||||
/* QUALCOMM BTS */
|
||||
{ "qualcomm", 0x0000, 0x0000, HCI_UART_H4, 115200, 115200,
|
||||
FLOW_CTL, DISABLE_PM, NULL, qualcomm, NULL },
|
||||
@@ -1145,6 +1154,9 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
|
||||
@@ -1134,6 +1143,9 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
|
||||
if (u->flags & AMP_DEV)
|
||||
flags |= 1 << HCI_UART_CREATE_AMP;
|
||||
|
||||
@ -94,7 +94,7 @@ diff --git a/tools/hciattach.h b/tools/hciattach.h
|
||||
index 249aab49e..85c801ccf 100644
|
||||
--- a/tools/hciattach.h
|
||||
+++ b/tools/hciattach.h
|
||||
@@ -65,6 +65,7 @@ int bgb2xx_init(int dd, bdaddr_t *bdaddr);
|
||||
@@ -56,6 +56,7 @@ int bgb2xx_init(int dd, bdaddr_t *bdaddr);
|
||||
int ath3k_init(int fd, int speed, int init_speed, char *bdaddr,
|
||||
struct termios *ti);
|
||||
int ath3k_post(int fd, int pm);
|
||||
@ -953,7 +953,7 @@ index 000000000..9a7f222c4
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ while (getline(&line, &bytes_read, pfile) > 0 ) {
|
||||
+ while (getline(&line, (size_t *)&bytes_read, pfile) > 0 ) {
|
||||
+ if (line[0] != '#' && line[0] != '\n') {
|
||||
+ pch = memchr(line, '=', strlen(line));
|
||||
+ if (pch != NULL) {
|
||||
|
@ -1,50 +0,0 @@
|
||||
From e679b29bcf4890d61294e4110bace5f783632e5a Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Sat, 9 Mar 2024 08:55:24 +0000
|
||||
Subject: [PATCH] Revert "build: Fix distcheck"
|
||||
|
||||
This reverts commit d5a9195a6269e703c6e3a47c40982ec94d8cc838.
|
||||
---
|
||||
Makefile.tools | 6 +-----
|
||||
configure.ac | 8 +-------
|
||||
2 files changed, 2 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/Makefile.tools b/Makefile.tools
|
||||
index 27a753762..c17244677 100644
|
||||
--- a/Makefile.tools
|
||||
+++ b/Makefile.tools
|
||||
@@ -539,11 +539,7 @@ endif
|
||||
|
||||
if CUPS
|
||||
|
||||
-if CUPS_SERVERBIN
|
||||
-cupsdir = $(CUPS_SERVERBIN)/backend
|
||||
-else
|
||||
-cupsdir = $(libdir)/cups/backend
|
||||
-endif
|
||||
+cupsdir = $(CUPSDIR)
|
||||
|
||||
cups_PROGRAMS = profiles/cups/bluetooth
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9ebc250cf..0190e8271 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -247,13 +247,7 @@ AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups],
|
||||
[disable CUPS printer support]), [enable_cups=${enableval}])
|
||||
AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no")
|
||||
if (test "${enable_cups}" != "no"); then
|
||||
- AC_MSG_CHECKING([cups directory])
|
||||
- cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin`
|
||||
- AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "")
|
||||
- if (test "${cups_serverbin}" != ""); then
|
||||
- AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin})
|
||||
- fi
|
||||
- AC_MSG_RESULT([${cups_serverbin}])
|
||||
+ AC_SUBST(CUPSDIR, `$PKG_CONFIG cups --variable=cups_serverbin`/backend)
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh],
|
||||
--
|
||||
2.43.0
|
||||
|
@ -1,45 +0,0 @@
|
||||
From b94f1be656f34ea1363f5566ef63b847234c6dea Mon Sep 17 00:00:00 2001
|
||||
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||||
Date: Mon, 15 Apr 2024 10:48:58 -0400
|
||||
Subject: [PATCH] shared/uhid: Fix crash if bt_uhid_destroy free replay
|
||||
structure
|
||||
|
||||
Id replay structured has been allocated it shall be set back to NULL
|
||||
after calling uhid_replay_free otherwise it may cause the following
|
||||
crash:
|
||||
|
||||
Invalid read of size 1
|
||||
at 0x1D8FC4: bt_uhid_record (uhid.c:116)
|
||||
by 0x1D912C: uhid_read_handler (uhid.c:158)
|
||||
by 0x201A64: watch_callback (io-glib.c:157)
|
||||
by 0x48D4198: g_main_dispatch.lto_priv.0 (gmain.c:3344)
|
||||
by 0x49333BE: UnknownInlinedFun (gmain.c:4152)
|
||||
by 0x49333BE: g_main_context_iterate_unlocked.isra.0 (gmain.c:4217)
|
||||
by 0x48D4DC6: g_main_loop_run (gmain.c:4419)
|
||||
by 0x2020F4: mainloop_run (mainloop-glib.c:66)
|
||||
by 0x20254B: mainloop_run_with_signal (mainloop-notify.c:188)
|
||||
by 0x12D6D4: main (main.c:1456)
|
||||
Address 0x53ae9c0 is 0 bytes inside a block of size 40 free'd
|
||||
at 0x48468CF: free (vg_replace_malloc.c:985)
|
||||
by 0x1D8E19: uhid_replay_free (uhid.c:68)
|
||||
by 0x1D8E19: uhid_replay_free (uhid.c:59)
|
||||
by 0x1D8E19: bt_uhid_destroy (uhid.c:509)
|
||||
by 0x1591F5: uhid_disconnect (device.c:183)
|
||||
|
||||
Fixes: https://github.com/bluez/bluez/issues/815
|
||||
---
|
||||
src/shared/uhid.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/shared/uhid.c b/src/shared/uhid.c
|
||||
index c1092b707..1f071b958 100644
|
||||
--- a/src/shared/uhid.c
|
||||
+++ b/src/shared/uhid.c
|
||||
@@ -507,6 +507,7 @@ int bt_uhid_destroy(struct bt_uhid *uhid)
|
||||
|
||||
uhid->created = false;
|
||||
uhid_replay_free(uhid->replay);
|
||||
+ uhid->replay = NULL;
|
||||
|
||||
return err;
|
||||
}
|
@ -10,7 +10,7 @@ ConditionPathExists=/storage/.cache/services/bluez.conf
|
||||
EnvironmentFile=/storage/.cache/services/obexd.conf
|
||||
EnvironmentFile=-/run/libreelec/debug/obexd.conf
|
||||
ExecStartPre=/bin/sh -c 'mkdir -p $OBEXD_ROOT'
|
||||
ExecStart=/usr/lib/bluetooth/obexd -r $OBEXD_ROOT $OBEXD_DEBUG
|
||||
ExecStart=/usr/lib/bluetooth/obexd -s -r $OBEXD_ROOT $OBEXD_DEBUG
|
||||
TimeoutStopSec=1s
|
||||
|
||||
[Install]
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="ethtool"
|
||||
PKG_VERSION="6.7"
|
||||
PKG_SHA256="c3ae526b01ce4d8df6c794ab170de4a4104d111ea8d8db3f1fd7c25fcb905619"
|
||||
PKG_VERSION="6.15"
|
||||
PKG_SHA256="9477c365114d910120aaec5336a1d16196c833d8486f7c6da67bedef57880ade"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.kernel.org/pub/software/network/ethtool/"
|
||||
PKG_URL="https://www.kernel.org/pub/software/network/ethtool/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="iw"
|
||||
PKG_VERSION="6.7"
|
||||
PKG_SHA256="aacf49c266b29d500d73086798a1c652e760c19126a8599fd811850430789a35"
|
||||
PKG_VERSION="6.9"
|
||||
PKG_SHA256="3f2db22ad41c675242b98ae3942dbf3112548c60a42ff739210f2de4e98e4894"
|
||||
PKG_LICENSE="PUBLIC_DOMAIN"
|
||||
PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw"
|
||||
PKG_URL="https://www.kernel.org/pub/software/network/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="wireguard-tools"
|
||||
PKG_VERSION="1.0.20210914"
|
||||
PKG_SHA256="69de713458a887cddb46b2fd1d43bf20548f693136af95792e65ec925538c770"
|
||||
PKG_VERSION="1.0.20250521"
|
||||
PKG_SHA256="6afe492647c3b0b2f68ab6df524e9e4290d03c34c3027e069e5bbc486949960e"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://www.wireguard.com"
|
||||
PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-v${PKG_VERSION}.tar.xz"
|
||||
|
@ -2,39 +2,41 @@
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
|
||||
PKG_NAME="kmod"
|
||||
PKG_VERSION="32"
|
||||
PKG_SHA256="630ed0d92275a88cb9a7bf68f5700e911fdadaf02e051cf2e4680ff8480bd492"
|
||||
PKG_VERSION="34.2"
|
||||
PKG_SHA256="5a5d5073070cc7e0c7a7a3c6ec2a0e1780850c8b47b3e3892226b93ffcb9cb54"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_HOST="toolchain:host"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_HOST="meson:host ninja:host"
|
||||
PKG_DEPENDS_TARGET="meson:host gcc:host openssl"
|
||||
PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
|
||||
PKG_BUILD_FLAGS="-gold -mold"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--enable-tools \
|
||||
--disable-logging \
|
||||
--disable-debug \
|
||||
--disable-manpages \
|
||||
--with-gnu-ld \
|
||||
--without-xz \
|
||||
--without-zlib \
|
||||
--without-zstd"
|
||||
PKG_MESON_OPTS_COMMON="-Dbashcompletiondir=no \
|
||||
-Dfishcompletiondir=no \
|
||||
-Dzshcompletiondir=no \
|
||||
-Dzstd=disabled \
|
||||
-Dxz=disabled \
|
||||
-Dzlib=disabled \
|
||||
-Dopenssl=enabled \
|
||||
-Dtools=true \
|
||||
-Ddebug-messages=false \
|
||||
-Dbuild-tests=false \
|
||||
-Dmanpages=false \
|
||||
-Ddocs=false"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-tools \
|
||||
--enable-logging \
|
||||
--disable-debug \
|
||||
--disable-manpages \
|
||||
--with-gnu-ld \
|
||||
--without-xz \
|
||||
--without-zlib \
|
||||
--without-zstd"
|
||||
PKG_MESON_OPTS_HOST="${PKG_MESON_OPTS_COMMON} \
|
||||
-Dlogging=false"
|
||||
|
||||
PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_COMMON} \
|
||||
-Dlogging=true"
|
||||
|
||||
post_makeinstall_host() {
|
||||
ln -sf kmod ${TOOLCHAIN}/bin/depmod
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
# make symlinks for compatibility
|
||||
# make symlinks for compatibility
|
||||
mkdir -p ${INSTALL}/usr/sbin
|
||||
ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/lsmod
|
||||
ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/insmod
|
||||
@ -44,8 +46,9 @@ post_makeinstall_target() {
|
||||
ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/depmod
|
||||
|
||||
mkdir -p ${INSTALL}/etc
|
||||
rmdir ${INSTALL}/etc/modprobe.d
|
||||
ln -sf /storage/.config/modprobe.d ${INSTALL}/etc/modprobe.d
|
||||
|
||||
# add user modprobe.d dir
|
||||
# add user modprobe.d dir
|
||||
mkdir -p ${INSTALL}/usr/config/modprobe.d
|
||||
}
|
||||
|
@ -4,12 +4,12 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="open-vm-tools"
|
||||
PKG_VERSION="12.4.0"
|
||||
PKG_SHA256="ba091c58f0d61c2896418c7d04506a7ea44c7594401209928270576fa018c23a"
|
||||
PKG_VERSION="13.0.0"
|
||||
PKG_SHA256="ce855a7d9a0a6561e6009784eb2a34f6a1d98b2a883afce5290cd426f78e7a6d"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/vmware/open-vm-tools"
|
||||
PKG_URL="https://github.com/vmware/open-vm-tools/archive/stable-${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="https://github.com/vmware/open-vm-tools/releases/download/stable-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-24696409.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain fuse3 glib libdnet libtirpc"
|
||||
PKG_LONGDESC="open-vm-tools: open source implementation of VMware Tools"
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
@ -23,17 +23,12 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
|
||||
--without-gtkmm \
|
||||
--without-ssl \
|
||||
--without-x \
|
||||
--without-xerces \
|
||||
--without-icu \
|
||||
--without-kernel-modules \
|
||||
--with-fuse=fuse3 \
|
||||
--with-udev-rules-dir=/usr/lib/udev/rules.d/ \
|
||||
--with-sysroot=${SYSROOT_PREFIX}"
|
||||
|
||||
configure_package() {
|
||||
PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/open-vm-tools/configure"
|
||||
}
|
||||
|
||||
post_unpack() {
|
||||
# Hack to allow package to be bumped without linking against old libraries
|
||||
rm -f ${SYSROOT_PREFIX}/usr/lib/libvmtools*
|
||||
|
@ -3,13 +3,13 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="util-linux"
|
||||
PKG_VERSION="2.39.3"
|
||||
PKG_SHA256="7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f"
|
||||
PKG_VERSION="2.41"
|
||||
PKG_SHA256="81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host pkg-config:host"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
PKG_DEPENDS_TARGET="autotools:host gcc:host"
|
||||
PKG_DEPENDS_INIT="autotools:host gcc:host"
|
||||
PKG_LONGDESC="A large variety of low-level system utilities that are necessary for a Linux system to function."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_BUILD_FLAGS="+pic:host"
|
||||
@ -56,7 +56,8 @@ PKG_CONFIGURE_OPTS_TARGET="${UTILLINUX_CONFIG_DEFAULT} \
|
||||
--enable-blkid \
|
||||
--enable-lscpu \
|
||||
--enable-lsfd \
|
||||
--enable-mount"
|
||||
--enable-mount \
|
||||
--enable-nologin"
|
||||
|
||||
if [ "${SWAP_SUPPORT}" = "yes" ]; then
|
||||
PKG_CONFIGURE_OPTS_TARGET+=" --enable-swapon"
|
||||
@ -85,14 +86,14 @@ post_makeinstall_target() {
|
||||
cp -PR ${PKG_DIR}/scripts/mount-swap ${INSTALL}/usr/lib/libreelec
|
||||
|
||||
mkdir -p ${INSTALL}/etc
|
||||
cat ${PKG_DIR}/config/swap.conf | \
|
||||
cat ${PKG_DIR}/config/swap.conf |
|
||||
sed -e "s,@SWAPFILESIZE@,${SWAPFILESIZE},g" \
|
||||
-e "s,@SWAP_ENABLED_DEFAULT@,${SWAP_ENABLED_DEFAULT},g" \
|
||||
> ${INSTALL}/etc/swap.conf
|
||||
>${INSTALL}/etc/swap.conf
|
||||
fi
|
||||
}
|
||||
|
||||
post_install () {
|
||||
post_install() {
|
||||
if [ "${SWAP_SUPPORT}" = "yes" ]; then
|
||||
enable_service swap.service
|
||||
fi
|
||||
|
@ -11,12 +11,12 @@ if [ -f /storage/.config/swap.conf ]; then
|
||||
. /storage/.config/swap.conf
|
||||
fi
|
||||
|
||||
if [ -e /dev/.storage_netboot ] ; then
|
||||
if [ -e /dev/.storage_netboot ]; then
|
||||
logger -t Boot "### netbooting... swap disabled ###"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "${SWAP_ENABLED}" = "yes" ] ; then
|
||||
if [ ! "${SWAP_ENABLED}" = "yes" ]; then
|
||||
logger -t Boot "### swap disabled via configfile ###"
|
||||
exit 0
|
||||
fi
|
||||
|
44
packages/sysutils/v4l-utils/keymaps/xoro_hrk_7660.toml
Normal file
44
packages/sysutils/v4l-utils/keymaps/xoro_hrk_7660.toml
Normal file
@ -0,0 +1,44 @@
|
||||
[[protocols]]
|
||||
name = "xoro_hrk_7660"
|
||||
protocol = "nec"
|
||||
variant = "nec"
|
||||
[protocols.scancodes]
|
||||
0xbf16 = "KEY_DOWN"
|
||||
0xbf06 = "KEY_UP"
|
||||
0xbf5a = "KEY_LEFT"
|
||||
0xbf1b = "KEY_RIGHT"
|
||||
0xbf0f = "KEY_NUMERIC_0"
|
||||
0xbf52 = "KEY_NUMERIC_1"
|
||||
0xbf50 = "KEY_NUMERIC_2"
|
||||
0xbf10 = "KEY_NUMERIC_3"
|
||||
0xbf56 = "KEY_NUMERIC_4"
|
||||
0xbf54 = "KEY_NUMERIC_5"
|
||||
0xbf14 = "KEY_NUMERIC_6"
|
||||
0xbf4e = "KEY_NUMERIC_7"
|
||||
0xbf4c = "KEY_NUMERIC_8"
|
||||
0xbf0c = "KEY_NUMERIC_9"
|
||||
0xbf01 = "KEY_VOLUMEUP"
|
||||
0xbf02 = "KEY_VOLUMEDOWN"
|
||||
0xbf0d = "KEY_CHANNELUP"
|
||||
0xbf11 = "KEY_CHANNELDOWN"
|
||||
0xbf1a = "KEY_OK"
|
||||
0xbf04 = "KEY_STOP"
|
||||
0xbf07 = "KEY_RECORD"
|
||||
0xbf46 = "KEY_PLAY"
|
||||
0xbf44 = "KEY_PAUSE"
|
||||
0xbf4d = "KEY_EPG"
|
||||
0xbf18 = "KEY_TEXT"
|
||||
0xbf19 = "KEY_MUTE"
|
||||
0xbf03 = "KEY_BLUE"
|
||||
0xbf00 = "KEY_YELLOW"
|
||||
0xbf42 = "KEY_RED"
|
||||
0xbf40 = "KEY_GREEN"
|
||||
0xbf15 = "KEY_RADIO"
|
||||
0xbf59 = "KEY_POWER"
|
||||
0xbf05 = "KEY_EXIT"
|
||||
0xbf45 = "KEY_MENU"
|
||||
0xbf08 = "KEY_PREVIOUS"
|
||||
0xbf0b = "KEY_NEXT"
|
||||
0xbf48 = "KEY_FASTFORWARD"
|
||||
0xbf4a = "KEY_REWIND"
|
||||
0xbf0e = "KEY_GOTO"
|
@ -5,19 +5,19 @@
|
||||
# with 1.0.0 repeat delay is broken. test on upgrade
|
||||
|
||||
PKG_NAME="v4l-utils"
|
||||
PKG_VERSION="1.26.1"
|
||||
PKG_SHA256="4a71608c0ef7df2931176989e6d32b445c0bdc1030a2376d929c8ca6e550ec4e"
|
||||
PKG_VERSION="1.30.1"
|
||||
PKG_SHA256="c1cf549c2ec3cf39eb5ec7bf15731349e61b26a21b5e963922db422333bae197"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://linuxtv.org/"
|
||||
PKG_URL="http://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_SITE="https://linuxtv.org/"
|
||||
PKG_URL="https://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain alsa-lib elfutils ir-bpf-decoders libbpf systemd zlib"
|
||||
PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
|
||||
|
||||
PKG_MESON_OPTS_TARGET="-Ddefault_library=static \
|
||||
-Dprefer_static=true \
|
||||
-Dbpf=enabled \
|
||||
PKG_MESON_OPTS_TARGET="-Dbpf=enabled \
|
||||
-Dgconv=disabled \
|
||||
-Djpeg=disabled \
|
||||
-Dqvidcap=disabled \
|
||||
-Dqv4l2=disabled \
|
||||
-Ddoxygen-doc=disabled"
|
||||
|
||||
create_multi_keymap() {
|
||||
@ -43,7 +43,6 @@ post_makeinstall_target() {
|
||||
|
||||
rm -rf ${INSTALL}/usr/include
|
||||
rm -rf ${INSTALL}/usr/lib/gconv
|
||||
rm -rf ${INSTALL}/usr/lib/lib*
|
||||
rm -rf ${INSTALL}/usr/lib/pkgconfig
|
||||
|
||||
rm -rf ${INSTALL}/etc/rc_keymaps
|
||||
|
@ -1,47 +0,0 @@
|
||||
From f39acb7f375887e5ecf09128609318d717eda51d Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Wed, 20 Dec 2023 16:28:26 +0100
|
||||
Subject: [PATCH] keytable: fix segfault when reading legacy keymaps
|
||||
|
||||
Since commit ae1492611432 ("keytable: remove line length limits")
|
||||
ir-keytable crashes when reading keymaps in legacy (non-toml) format
|
||||
and valgrind reports an UMR:
|
||||
|
||||
valgrind ir-keytable -w /etc/rc_keymaps/hiastest
|
||||
...
|
||||
==83788== Conditional jump or move depends on uninitialised value(s)
|
||||
==83788== at 0x48E8B8C: getdelim (iogetdelim.c:59)
|
||||
==83788== by 0x1105C6: getline (stdio.h:120)
|
||||
==83788== by 0x1105C6: parse_plain_keymap (keymap.c:98)
|
||||
==83788== by 0x1105C6: parse_keymap (keymap.c:533)
|
||||
==83788== by 0x112798: parse_opt (keytable.c:569)
|
||||
==83788== by 0x4986E50: group_parse (argp-parse.c:257)
|
||||
==83788== by 0x4986E50: parser_parse_opt (argp-parse.c:747)
|
||||
==83788== by 0x4986E50: parser_parse_next (argp-parse.c:867)
|
||||
==83788== by 0x4986E50: argp_parse (argp-parse.c:921)
|
||||
==83788== by 0x10E470: main (keytable.c:2071)
|
||||
|
||||
Fix this by properly initializing line to NULL so getline will allocate
|
||||
a buffer instead of using some random memory locations.
|
||||
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
---
|
||||
utils/common/keymap.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/common/keymap.c b/utils/common/keymap.c
|
||||
index 04c5ef54723c..21c1c0b5d581 100644
|
||||
--- a/utils/common/keymap.c
|
||||
+++ b/utils/common/keymap.c
|
||||
@@ -75,7 +75,7 @@ static error_t parse_plain_keymap(char *fname, struct keymap **keymap, bool verb
|
||||
{
|
||||
FILE *fin;
|
||||
int line_no = 0;
|
||||
- char *scancode, *keycode, *line;
|
||||
+ char *scancode, *keycode, *line = NULL;
|
||||
size_t line_size;
|
||||
struct scancode_entry *se;
|
||||
struct keymap *map;
|
||||
--
|
||||
2.39.2
|
||||
|
Loading…
x
Reference in New Issue
Block a user