mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
CvH
GitHub
commit
8db8ac4ea5
@ -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
|
||||
@@ -108,7 +108,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())
|
||||
decoder_features.set('HAVE_LIBOPENMPT_VERSION_0_5', libopenmpt_dep.version().version_compare('>= 0.5'))
|
||||
if libopenmpt_dep.found()
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/libopenmpt/libopenmpt.pc.in 2016-07-09 18:17:00.000000000 +0000
|
||||
+++ b/libopenmpt/libopenmpt.pc.in 2021-12-25 00:53:54.189008995 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
Description: Tracker module player based on OpenMPT
|
||||
Version: @VERSION@
|
||||
Requires.private: @LIBOPENMPT_REQUIRES_PRIVATE@
|
||||
-Libs: -L${libdir} -lopenmpt
|
||||
+Libs: -L${libdir} -lopenmpt -lvorbisfile
|
||||
Libs.private: @LIBOPENMPT_LIBS_PRIVATE@
|
||||
Cflags: -I${includedir}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xxHash"
|
||||
PKG_VERSION="0.8.2"
|
||||
PKG_SHA256="baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4"
|
||||
PKG_VERSION="0.8.3"
|
||||
PKG_SHA256="aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80"
|
||||
PKG_LICENSE="BSD-2-Clause"
|
||||
PKG_SITE="https://xxhash.com"
|
||||
PKG_URL="https://github.com/Cyan4973/xxHash/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libxcrypt"
|
||||
PKG_VERSION="4.4.36"
|
||||
PKG_SHA256="e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943"
|
||||
PKG_VERSION="4.4.37"
|
||||
PKG_SHA256="902aa2976f959b5ebe55679b1722b8479f8f13cd4ce2ef432b0a84ae298fffd0"
|
||||
PKG_LICENSE="LGPL-2.1"
|
||||
PKG_SITE="https://github.com/besser82/libxcrypt"
|
||||
PKG_URL="https://github.com/besser82/libxcrypt/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="nettle"
|
||||
PKG_VERSION="3.10"
|
||||
PKG_SHA256="b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c"
|
||||
PKG_VERSION="3.10.1"
|
||||
PKG_SHA256="b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132"
|
||||
PKG_LICENSE="GPL2"
|
||||
PKG_SITE="http://www.lysator.liu.se/~nisse/nettle"
|
||||
PKG_URL="https://ftp.gnu.org/gnu/nettle/nettle-${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="fuse"
|
||||
PKG_VERSION="2.9.9"
|
||||
PKG_SHA256="d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5"
|
||||
PKG_VERSION="5a43d0f724c56f8836f3f92411e0de1b5f82db32" # 2.9.9+
|
||||
PKG_SHA256="1df88a204e1673e29112f1ee4efe6b3cd4de2ae78945838e406ead0fe24ec5f1"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/libfuse/libfuse/"
|
||||
PKG_URL="https://github.com/libfuse/libfuse/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="https://github.com/libfuse/libfuse/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export a virtual filesystem to the Linux kernel."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/util/Makefile.in 2017-06-23 22:47:36.762827097 +0200
|
||||
+++ b/util/Makefile.in 2017-06-23 22:47:47.358852950 +0200
|
||||
@@ -734,10 +734,6 @@
|
||||
--- a/util/Makefile.am 2017-06-23 22:47:36.762827097 +0200
|
||||
+++ b/util/Makefile.am 2017-06-23 22:47:47.358852950 +0200
|
||||
@@ -39,10 +39,6 @@
|
||||
$(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
|
||||
$(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
|
||||
$(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sat, 24 Jul 2021 22:02:45 +0100
|
||||
Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
|
||||
glibc-2.34+)
|
||||
|
||||
closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
|
||||
it's available in glibc 2.34+, we want to detect it and only define our
|
||||
fallback if the libc doesn't provide it.
|
||||
|
||||
Bug: https://bugs.gentoo.org/803923
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
util/ulockmgr_server.c | 6 ++++++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9946a0efa..a2d481aa9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -55,6 +55,7 @@ fi
|
||||
|
||||
AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
|
||||
AC_CHECK_FUNCS([posix_fallocate])
|
||||
+AC_CHECK_FUNCS([closefrom])
|
||||
AC_CHECK_MEMBERS([struct stat.st_atim])
|
||||
AC_CHECK_MEMBERS([struct stat.st_atimespec])
|
||||
|
||||
diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
|
||||
index 273c7d923..a04dac5c6 100644
|
||||
--- a/util/ulockmgr_server.c
|
||||
+++ b/util/ulockmgr_server.c
|
||||
@@ -22,6 +22,10 @@
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+ #include "config.h"
|
||||
+#endif
|
||||
+
|
||||
struct message {
|
||||
unsigned intr : 1;
|
||||
unsigned nofd : 1;
|
||||
@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
|
||||
return res;
|
||||
}
|
||||
|
||||
+#if !defined(HAVE_CLOSEFROM)
|
||||
static int closefrom(int minfd)
|
||||
{
|
||||
DIR *dir = opendir("/proc/self/fd");
|
||||
@@ -141,6 +146,7 @@ static int closefrom(int minfd)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void send_reply(int cfd, struct message *msg)
|
||||
{
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/configure.ac 2021-07-25 10:21:45.000000000 +0000
|
||||
+++ b/configure.ac 2024-12-30 12:29:55.969242866 +0000
|
||||
@@ -72,6 +72,8 @@
|
||||
done
|
||||
])
|
||||
AM_ICONV
|
||||
+AM_GNU_GETTEXT([external])
|
||||
+AM_GNU_GETTEXT_VERSION([0.14.4])
|
||||
libfuse_libs="$libfuse_libs $LTLIBICONV"
|
||||
AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
|
||||
AC_SUBST(libfuse_libs)
|
||||
Loading…
x
Reference in New Issue
Block a user