lz4: update to 1.9.3

Remove upstreamed patches.

Switch PKG_NAME to lz4 to get rid of PKG_BUILD_DIR.

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/liblz4/Makefile b/libs/liblz4/Makefile
index d1312f5b66bddd2d92c4d4dea868759d5063ff2e..45ec539119cb1f968f3fa6a53fc71e16144fadff 100644 (file)
--- a/libs/liblz4/Makefile
+++ b/libs/liblz4/Makefile
@@ -7,14 +7,13 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=liblz4
-PKG_VERSION:=1.9.2
-PKG_RELEASE:=4
+PKG_NAME:=lz4
+PKG_VERSION:=1.9.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/lz4/lz4/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc
-PKG_BUILD_DIR:=$(BUILD_DIR)/lz4-$(PKG_VERSION)
+PKG_HASH:=030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1
 
 PKG_MAINTAINER:=Darik Horn <dajhorn@vanadac.com>
 

diff --git a/libs/liblz4/patches/010-utime.patch b/libs/liblz4/patches/010-utime.patch
deleted file mode 100644 (file)
index 6c21c33..0000000
--- a/libs/liblz4/patches/010-utime.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e9d5a3cbbb47eb0f785a409d836225b592b250f3 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Tue, 30 Jul 2019 22:13:51 -0700
-Subject: [PATCH] util.h: Remove deprecated utime for non-Windows
-
-utime was deprecated in POSIX 2008.
----
- programs/platform.h |  2 +-
- programs/util.h     | 17 ++++++++++++++++-
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/programs/platform.h b/programs/platform.h
-index c0b38402..7e2cb58f 100644
---- a/programs/platform.h
-+++ b/programs/platform.h
-@@ -86,7 +86,7 @@ extern "C" {
- #  else
- #    if defined(__linux__) || defined(__linux)
- #      ifndef _POSIX_C_SOURCE
--#        define _POSIX_C_SOURCE 200112L  /* use feature test macro */
-+#        define _POSIX_C_SOURCE 200809L  /* use feature test macro */
- #      endif
- #    endif
- #    include <unistd.h>  /* declares _POSIX_VERSION */
-diff --git a/programs/util.h b/programs/util.h
-index 1dd515ce..112dddbf 100644
---- a/programs/util.h
-+++ b/programs/util.h
-@@ -37,12 +37,17 @@ extern "C" {
- #include <assert.h>
- #include <sys/types.h>    /* stat, utime */
- #include <sys/stat.h>     /* stat */
--#if defined(_MSC_VER)
-+#if defined(_WIN32)
- #  include <sys/utime.h>  /* utime */
- #  include <io.h>         /* _chmod */
- #else
- #  include <unistd.h>     /* chown, stat */
-+#if PLATFORM_POSIX_VERSION < 200809L
- #  include <utime.h>      /* utime */
-+#else
-+#  include <fcntl.h>      /* AT_FDCWD */
-+#  include <sys/stat.h>   /* for utimensat */
-+#endif
- #endif
- #include <time.h>         /* time */
- #include <limits.h>       /* INT_MAX */
-@@ -287,14 +292,24 @@ UTIL_STATIC int UTIL_isRegFile(const char* infilename);
- UTIL_STATIC int UTIL_setFileStat(const char *filename, stat_t *statbuf)
- {
-     int res = 0;
-+#if defined(_WIN32) || (PLATFORM_POSIX_VERSION < 200809L)
-     struct utimbuf timebuf;
-+#else
-+    struct timespec timebuf[2] = {};
-+#endif
- 
-     if (!UTIL_isRegFile(filename))
-         return -1;
- 
-+#if defined(_WIN32) || (PLATFORM_POSIX_VERSION < 200809L)
-     timebuf.actime = time(NULL);
-     timebuf.modtime = statbuf->st_mtime;
-     res += utime(filename, &timebuf);  /* set access and modification times */
-+#else
-+    timebuf[0].tv_nsec = UTIME_NOW;
-+    timebuf[1].tv_sec = statbuf->st_mtime;
-+    res += utimensat(AT_FDCWD, filename, timebuf, 0);  /* set access and modification times */
-+#endif
- 
- #if !defined(_WIN32)
-     res += chown(filename, statbuf->st_uid, statbuf->st_gid);  /* Copy ownership */

diff --git a/libs/liblz4/patches/020-distutils.patch b/libs/liblz4/patches/020-distutils.patch
deleted file mode 100644 (file)
index 5bcd25c..0000000
--- a/libs/liblz4/patches/020-distutils.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/contrib/meson/meson.build
-+++ b/contrib/meson/meson.build
-@@ -16,7 +16,6 @@ project('lz4', ['c'],
- 
- cc = meson.get_compiler('c')
- pkgconfig = import('pkgconfig')
--python3 = import('python').find_installation()
- c_std = get_option('c_std')
- default_library = get_option('default_library')
- 
-@@ -35,8 +34,8 @@ compiler_msvc = 'msvc'
- lz4_version = meson.project_version()
- 
- lz4_h_file = join_paths(meson.current_source_dir(), '../../lib/lz4.h')
--GetLz4LibraryVersion_py = files('GetLz4LibraryVersion.py')
--r = run_command(python3, GetLz4LibraryVersion_py, lz4_h_file)
-+GetLz4LibraryVersion_py = find_program('GetLz4LibraryVersion.py', native : true)
-+r = run_command(GetLz4LibraryVersion_py, lz4_h_file)
- if r.returncode() == 0
-   lz4_version = r.stdout().strip()
-   message('Project version is now: @0@'.format(lz4_version))