zstd: update to 1.4.8 14315/head
authorRosen Penev <rosenp@gmail.com>
Mon, 21 Dec 2020 03:56:24 +0000 (19:56 -0800)
committerRosen Penev <rosenp@gmail.com>
Wed, 23 Dec 2020 03:27:21 +0000 (19:27 -0800)
Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
utils/zstd/Makefile
utils/zstd/patches/010-python.patch [deleted file]

index 06030ec75b2dcdb9c0d2728e746f25cff4801443..c25a2f231891099fffe6a72bd8e306c4a4a67b06 100644 (file)
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zstd
-PKG_VERSION:=1.4.5
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.zst
 PKG_SOURCE_URL:=https://github.com/facebook/zstd/releases/download/v$(PKG_VERSION)
-PKG_HASH:=2c2366874bc449ff539614266d8c0d6ecdb4baf30bb65609c239ab4ed23c03c7
+PKG_HASH:=c7ea10e20dd61b457220455e3cf553069987b968b7c63d1b9d46acbdb45623eb
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/utils/zstd/patches/010-python.patch b/utils/zstd/patches/010-python.patch
deleted file mode 100644 (file)
index c35c515..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/build/meson/meson.build
-+++ b/build/meson/meson.build
-@@ -22,7 +22,6 @@ project('zstd',
- cc = meson.get_compiler('c')
- cxx = meson.get_compiler('cpp')
- pkgconfig = import('pkgconfig')
--python3 = import('python').find_installation()
- windows_mod = import('windows')
- host_machine_os = host_machine.system()
-@@ -40,8 +39,8 @@ compiler_msvc = 'msvc'
- zstd_version = meson.project_version()
- zstd_h_file = join_paths(meson.current_source_dir(), '../../lib/zstd.h')
--GetZstdLibraryVersion_py = files('GetZstdLibraryVersion.py')
--r = run_command(python3, GetZstdLibraryVersion_py, zstd_h_file)
-+GetZstdLibraryVersion_py = find_program('GetZstdLibraryVersion.py', native : true)
-+r = run_command(GetZstdLibraryVersion_py, zstd_h_file)
- if r.returncode() == 0
-   zstd_version = r.stdout().strip()
-   message('Project version is now: @0@'.format(zstd_version))