jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 22:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5548 from antonlacon/zstd-fixup

Browse Source 
scripts/extract and zstd fixups
This commit is contained in:
CvH 2021-08-13 14:49:07 +02:00 committed by GitHub
commit df1d246616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/compress/zstd/patches/zstd-999.01-build-fix.patch
View File

@ -1,22 +0,0 @@
From edf2b1176df9302f6023d129e6379ffbe781885c Mon Sep 17 00:00:00 2001
From: SupervisedThinking <supervisedthinking@gmail.com>
Date: Fri, 19 Mar 2021 19:52:45 +0100
Subject: [PATCH] meson: fix build by adding missing files
fixes https://github.com/facebook/zstd/issues/2519
---
build/meson/lib/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build
index 17806c8dc..004888753 100644
--- a/build/meson/lib/meson.build
+++ b/build/meson/lib/meson.build
@@ -22,6 +22,7 @@ libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'),
join_paths(zstd_rootdir, 'lib/common/threading.c'),
join_paths(zstd_rootdir, 'lib/common/pool.c'),
join_paths(zstd_rootdir, 'lib/common/zstd_common.c'),
+ join_paths(zstd_rootdir, 'lib/common/zstd_trace.c'),
join_paths(zstd_rootdir, 'lib/common/error_private.c'),
join_paths(zstd_rootdir, 'lib/common/xxhash.c'),
join_paths(zstd_rootdir, 'lib/compress/hist.c'),

6
scripts/extract
View File

@ -49,11 +49,11 @@ fi
case "${PKG_SOURCE_NAME}" in
*.tar | *.tar.bz2 | *.tbz | *.tar.gz | *.tgz | *.tar.xz | *.txz)
mkdir -p "${DESTDIR}"
tar xf "${FULL_SOURCE_PATH}" "${TAR_OPTS}" -C "${DESTDIR}"
tar xf "${FULL_SOURCE_PATH}" ${TAR_OPTS} -C "${DESTDIR}"
;;
*.tar.zst | *.tzst)
mkdir -p "${DESTDIR}"
zstdcat "${FULL_SOURCE_PATH}" | tar xf - "${TAR_OPTS}" -C "${DESTDIR}"
zstdcat "${FULL_SOURCE_PATH}" | tar xf - ${TAR_OPTS} -C "${DESTDIR}"
;;
*.7z)
mkdir -p "${2}/${1}"
@ -74,6 +74,6 @@ case "${PKG_SOURCE_NAME}" in
*)
FULL_DEST_PATH="${2}/${PKG_NAME}-${PKG_VERSION}"
mkdir "${FULL_DEST_PATH}"
tar cf - -C "${FULL_SOURCE_PATH}" "${PKG_TAR_COPY_OPTS}" . | tar xf - -C "${FULL_DEST_PATH}"
tar cf - -C "${FULL_SOURCE_PATH}" ${PKG_TAR_COPY_OPTS} . | tar xf - -C "${FULL_DEST_PATH}"
;;
esac