diff --git a/.gitignore b/.gitignore index 338b56f..a8def49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zstd-sys-1.4.15+zstd.1.4.4.crate +/zstd-sys-1.4.16+zstd.1.4.5.crate diff --git a/0001-Upgrade-bindgen-to-0.53.1.patch b/0001-Upgrade-bindgen-to-0.53.1.patch deleted file mode 100644 index 45ed099..0000000 --- a/0001-Upgrade-bindgen-to-0.53.1.patch +++ /dev/null @@ -1,989 +0,0 @@ -From 0a7e0af423f2821e016ddef043629b049d88d7ed Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 27 Feb 2020 15:33:57 -0800 -Subject: [PATCH] Upgrade bindgen to 0.53.1 - ---- - zstd-safe/zstd-sys/build.rs | 1 + - zstd-safe/zstd-sys/src/bindings_std.rs | 72 +++---- - .../zstd-sys/src/bindings_std_experimental.rs | 198 +++++++++--------- - 3 files changed, 136 insertions(+), 135 deletions(-) - -diff --git a/zstd-safe/zstd-sys/build.rs b/zstd-safe/zstd-sys/build.rs -index 955f3e8f4b60..508c9f8ba22d 100644 ---- a/build.rs -+++ b/build.rs -@@ -18,6 +18,7 @@ fn generate_bindings(defs: Vec<&str>, headerpaths: Vec) { - let bindings = bindgen::Builder::default() - .header("zstd.h") - .blacklist_type("max_align_t") -+ .size_t_is_usize(true) - .use_core() - .rustified_enum(".*") - .clang_args( -diff --git a/zstd-safe/zstd-sys/src/bindings_std.rs b/zstd-safe/zstd-sys/src/bindings_std.rs -index a535426cb987..78a7a68015aa 100644 ---- a/src/bindings_std.rs -+++ b/src/bindings_std.rs -@@ -142,9 +142,9 @@ extern "C" { - #[doc = " @return : compressed size written into `dst` (<= `dstCapacity),"] - #[doc = " or an error code if it fails (which can be tested using ZSTD_isError())."] - pub fn ZSTD_compress( -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -157,15 +157,15 @@ extern "C" { - #[doc = " @return : the number of bytes decompressed into `dst` (<= `dstCapacity`),"] - #[doc = " or an errorCode if it fails (which can be tested using ZSTD_isError())."] - pub fn ZSTD_decompress( -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - compressedSize: usize, - ) -> usize; - } - extern "C" { - pub fn ZSTD_getFrameContentSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_ulonglong; - } -@@ -177,7 +177,7 @@ extern "C" { - #[doc = " while ZSTD_getFrameContentSize() gives them separate return values."] - #[doc = " @return : decompressed size of `src` frame content _if known and not empty_, 0 otherwise."] - pub fn ZSTD_getDecompressedSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_ulonglong; - } -@@ -189,7 +189,7 @@ extern "C" { - #[doc = " suitable to pass as `srcSize` to `ZSTD_decompress` or similar,"] - #[doc = " or an error code if input is invalid"] - pub fn ZSTD_findFrameCompressedSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -231,9 +231,9 @@ extern "C" { - #[doc = " they will all be reset. Only `compressionLevel` remains."] - pub fn ZSTD_compressCCtx( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -257,9 +257,9 @@ extern "C" { - #[doc = " Compatible with sticky parameters."] - pub fn ZSTD_decompressDCtx( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -449,9 +449,9 @@ extern "C" { - #[doc = " or an error code if it fails (which can be tested using ZSTD_isError())."] - pub fn ZSTD_compress2( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -500,7 +500,7 @@ extern "C" { - #[derive(Debug, Copy, Clone)] - pub struct ZSTD_inBuffer_s { - #[doc = "< start of input buffer"] -- pub src: *const ::std::os::raw::c_void, -+ pub src: *const ::core::ffi::c_void, - #[doc = "< size of input buffer"] - pub size: usize, - #[doc = "< position where reading stopped. Will be updated. Necessarily 0 <= pos <= size"] -@@ -563,7 +563,7 @@ pub type ZSTD_inBuffer = ZSTD_inBuffer_s; - #[derive(Debug, Copy, Clone)] - pub struct ZSTD_outBuffer_s { - #[doc = "< start of output buffer"] -- pub dst: *mut ::std::os::raw::c_void, -+ pub dst: *mut ::core::ffi::c_void, - #[doc = "< size of output buffer"] - pub size: usize, - #[doc = "< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size"] -@@ -739,11 +739,11 @@ extern "C" { - #[doc = " Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used."] - pub fn ZSTD_compress_usingDict( - ctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -757,11 +757,11 @@ extern "C" { - #[doc = " Note : When `dict == NULL || dictSize < 8` no dictionary is used."] - pub fn ZSTD_decompress_usingDict( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -786,7 +786,7 @@ extern "C" { - #[doc = " This can be useful in a pipeline featuring ZSTD_compress_usingCDict() exclusively,"] - #[doc = " expecting a ZSTD_CDict parameter with any data, including those without a known dictionary."] - pub fn ZSTD_createCDict( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> *mut ZSTD_CDict; -@@ -804,9 +804,9 @@ extern "C" { - #[doc = " and frame parameters are hardcoded (dictID=yes, contentSize=yes, checksum=no)"] - pub fn ZSTD_compress_usingCDict( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - cdict: *const ZSTD_CDict, - ) -> usize; -@@ -822,7 +822,7 @@ extern "C" { - #[doc = " Create a digested dictionary, ready to start decompression operation without startup delay."] - #[doc = " dictBuffer can be released after DDict creation, as its content is copied inside DDict."] - pub fn ZSTD_createDDict( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - ) -> *mut ZSTD_DDict; - } -@@ -837,9 +837,9 @@ extern "C" { - #[doc = " Recommended when same dictionary is used multiple times."] - pub fn ZSTD_decompress_usingDDict( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ddict: *const ZSTD_DDict, - ) -> usize; -@@ -850,7 +850,7 @@ extern "C" { - #[doc = " if @return == 0, the dictionary is not conformant with Zstandard specification."] - #[doc = " It can still be loaded, but as a content-only dictionary."] - pub fn ZSTD_getDictID_fromDict( -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> ::std::os::raw::c_uint; - } -@@ -875,7 +875,7 @@ extern "C" { - #[doc = " - This is not a Zstandard frame."] - #[doc = " When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code."] - pub fn ZSTD_getDictID_fromFrame( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_uint; - } -@@ -899,7 +899,7 @@ extern "C" { - #[doc = " to precisely select how dictionary content must be interpreted."] - pub fn ZSTD_CCtx_loadDictionary( - cctx: *mut ZSTD_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -942,7 +942,7 @@ extern "C" { - #[doc = " Use experimental ZSTD_CCtx_refPrefix_advanced() to alter dictionary interpretation."] - pub fn ZSTD_CCtx_refPrefix( - cctx: *mut ZSTD_CCtx, -- prefix: *const ::std::os::raw::c_void, -+ prefix: *const ::core::ffi::c_void, - prefixSize: usize, - ) -> usize; - } -@@ -963,7 +963,7 @@ extern "C" { - #[doc = " how dictionary content is loaded and interpreted."] - pub fn ZSTD_DCtx_loadDictionary( - dctx: *mut ZSTD_DCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -999,7 +999,7 @@ extern "C" { - #[doc = " A full dictionary is more costly, as it requires building tables."] - pub fn ZSTD_DCtx_refPrefix( - dctx: *mut ZSTD_DCtx, -- prefix: *const ::std::os::raw::c_void, -+ prefix: *const ::core::ffi::c_void, - prefixSize: usize, - ) -> usize; - } -@@ -1045,16 +1045,16 @@ extern "C" { - #[doc = " In general, it's recommended to provide a few thousands samples, though this can vary a lot."] - #[doc = " It's recommended that total size of all samples be about ~x100 times the target size of dictionary."] - pub fn ZDICT_trainFromBuffer( -- dictBuffer: *mut ::std::os::raw::c_void, -+ dictBuffer: *mut ::core::ffi::c_void, - dictBufferCapacity: usize, -- samplesBuffer: *const ::std::os::raw::c_void, -+ samplesBuffer: *const ::core::ffi::c_void, - samplesSizes: *const usize, - nbSamples: ::std::os::raw::c_uint, - ) -> usize; - } - extern "C" { - pub fn ZDICT_getDictID( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - ) -> ::std::os::raw::c_uint; - } -diff --git a/zstd-safe/zstd-sys/src/bindings_std_experimental.rs b/zstd-safe/zstd-sys/src/bindings_std_experimental.rs -index bb6f8fb809b3..30320e44685e 100644 ---- a/src/bindings_std_experimental.rs -+++ b/src/bindings_std_experimental.rs -@@ -170,9 +170,9 @@ extern "C" { - #[doc = " @return : compressed size written into `dst` (<= `dstCapacity),"] - #[doc = " or an error code if it fails (which can be tested using ZSTD_isError())."] - pub fn ZSTD_compress( -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -185,15 +185,15 @@ extern "C" { - #[doc = " @return : the number of bytes decompressed into `dst` (<= `dstCapacity`),"] - #[doc = " or an errorCode if it fails (which can be tested using ZSTD_isError())."] - pub fn ZSTD_decompress( -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - compressedSize: usize, - ) -> usize; - } - extern "C" { - pub fn ZSTD_getFrameContentSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_ulonglong; - } -@@ -205,7 +205,7 @@ extern "C" { - #[doc = " while ZSTD_getFrameContentSize() gives them separate return values."] - #[doc = " @return : decompressed size of `src` frame content _if known and not empty_, 0 otherwise."] - pub fn ZSTD_getDecompressedSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_ulonglong; - } -@@ -217,7 +217,7 @@ extern "C" { - #[doc = " suitable to pass as `srcSize` to `ZSTD_decompress` or similar,"] - #[doc = " or an error code if input is invalid"] - pub fn ZSTD_findFrameCompressedSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -259,9 +259,9 @@ extern "C" { - #[doc = " they will all be reset. Only `compressionLevel` remains."] - pub fn ZSTD_compressCCtx( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -285,9 +285,9 @@ extern "C" { - #[doc = " Compatible with sticky parameters."] - pub fn ZSTD_decompressDCtx( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -477,9 +477,9 @@ extern "C" { - #[doc = " or an error code if it fails (which can be tested using ZSTD_isError())."] - pub fn ZSTD_compress2( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -528,7 +528,7 @@ extern "C" { - #[derive(Debug, Copy, Clone)] - pub struct ZSTD_inBuffer_s { - #[doc = "< start of input buffer"] -- pub src: *const ::std::os::raw::c_void, -+ pub src: *const ::core::ffi::c_void, - #[doc = "< size of input buffer"] - pub size: usize, - #[doc = "< position where reading stopped. Will be updated. Necessarily 0 <= pos <= size"] -@@ -591,7 +591,7 @@ pub type ZSTD_inBuffer = ZSTD_inBuffer_s; - #[derive(Debug, Copy, Clone)] - pub struct ZSTD_outBuffer_s { - #[doc = "< start of output buffer"] -- pub dst: *mut ::std::os::raw::c_void, -+ pub dst: *mut ::core::ffi::c_void, - #[doc = "< size of output buffer"] - pub size: usize, - #[doc = "< position where writing stopped. Will be updated. Necessarily 0 <= pos <= size"] -@@ -767,11 +767,11 @@ extern "C" { - #[doc = " Note 2 : When `dict == NULL || dictSize < 8` no dictionary is used."] - pub fn ZSTD_compress_usingDict( - ctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -785,11 +785,11 @@ extern "C" { - #[doc = " Note : When `dict == NULL || dictSize < 8` no dictionary is used."] - pub fn ZSTD_decompress_usingDict( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -814,7 +814,7 @@ extern "C" { - #[doc = " This can be useful in a pipeline featuring ZSTD_compress_usingCDict() exclusively,"] - #[doc = " expecting a ZSTD_CDict parameter with any data, including those without a known dictionary."] - pub fn ZSTD_createCDict( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> *mut ZSTD_CDict; -@@ -832,9 +832,9 @@ extern "C" { - #[doc = " and frame parameters are hardcoded (dictID=yes, contentSize=yes, checksum=no)"] - pub fn ZSTD_compress_usingCDict( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - cdict: *const ZSTD_CDict, - ) -> usize; -@@ -850,7 +850,7 @@ extern "C" { - #[doc = " Create a digested dictionary, ready to start decompression operation without startup delay."] - #[doc = " dictBuffer can be released after DDict creation, as its content is copied inside DDict."] - pub fn ZSTD_createDDict( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - ) -> *mut ZSTD_DDict; - } -@@ -865,9 +865,9 @@ extern "C" { - #[doc = " Recommended when same dictionary is used multiple times."] - pub fn ZSTD_decompress_usingDDict( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ddict: *const ZSTD_DDict, - ) -> usize; -@@ -878,7 +878,7 @@ extern "C" { - #[doc = " if @return == 0, the dictionary is not conformant with Zstandard specification."] - #[doc = " It can still be loaded, but as a content-only dictionary."] - pub fn ZSTD_getDictID_fromDict( -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> ::std::os::raw::c_uint; - } -@@ -903,7 +903,7 @@ extern "C" { - #[doc = " - This is not a Zstandard frame."] - #[doc = " When identifying the exact failure cause, it's possible to use ZSTD_getFrameHeader(), which will provide a more precise error code."] - pub fn ZSTD_getDictID_fromFrame( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_uint; - } -@@ -927,7 +927,7 @@ extern "C" { - #[doc = " to precisely select how dictionary content must be interpreted."] - pub fn ZSTD_CCtx_loadDictionary( - cctx: *mut ZSTD_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -970,7 +970,7 @@ extern "C" { - #[doc = " Use experimental ZSTD_CCtx_refPrefix_advanced() to alter dictionary interpretation."] - pub fn ZSTD_CCtx_refPrefix( - cctx: *mut ZSTD_CCtx, -- prefix: *const ::std::os::raw::c_void, -+ prefix: *const ::core::ffi::c_void, - prefixSize: usize, - ) -> usize; - } -@@ -991,7 +991,7 @@ extern "C" { - #[doc = " how dictionary content is loaded and interpreted."] - pub fn ZSTD_DCtx_loadDictionary( - dctx: *mut ZSTD_DCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -1027,7 +1027,7 @@ extern "C" { - #[doc = " A full dictionary is more costly, as it requires building tables."] - pub fn ZSTD_DCtx_refPrefix( - dctx: *mut ZSTD_DCtx, -- prefix: *const ::std::os::raw::c_void, -+ prefix: *const ::core::ffi::c_void, - prefixSize: usize, - ) -> usize; - } -@@ -1438,7 +1438,7 @@ extern "C" { - #[doc = " read each contained frame header. This is fast as most of the data is skipped,"] - #[doc = " however it does mean that all frame data must be present and valid."] - pub fn ZSTD_findDecompressedSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_ulonglong; - } -@@ -1456,7 +1456,7 @@ extern "C" { - #[doc = " note 3 : when the decompressed size field isn't available, the upper-bound for that frame is calculated by:"] - #[doc = " upper-bound = # blocks * min(128 KB, Window_Size)"] - pub fn ZSTD_decompressBound( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> ::std::os::raw::c_ulonglong; - } -@@ -1466,7 +1466,7 @@ extern "C" { - #[doc = " @return : size of the Frame Header,"] - #[doc = " or an error code (if srcSize is too small)"] - pub fn ZSTD_frameHeaderSize( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -1480,7 +1480,7 @@ extern "C" { - zc: *mut ZSTD_CCtx, - outSeqs: *mut ZSTD_Sequence, - outSeqsSize: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -1553,7 +1553,7 @@ extern "C" { - } - extern "C" { - pub fn ZSTD_estimateDStreamSize_fromFrame( -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -1602,33 +1602,33 @@ extern "C" { - #[doc = " Limitation 2 : static cctx currently not compatible with multi-threading."] - #[doc = " Limitation 3 : static dctx is incompatible with legacy support."] - pub fn ZSTD_initStaticCCtx( -- workspace: *mut ::std::os::raw::c_void, -+ workspace: *mut ::core::ffi::c_void, - workspaceSize: usize, - ) -> *mut ZSTD_CCtx; - } - extern "C" { - pub fn ZSTD_initStaticCStream( -- workspace: *mut ::std::os::raw::c_void, -+ workspace: *mut ::core::ffi::c_void, - workspaceSize: usize, - ) -> *mut ZSTD_CStream; - } - extern "C" { - pub fn ZSTD_initStaticDCtx( -- workspace: *mut ::std::os::raw::c_void, -+ workspace: *mut ::core::ffi::c_void, - workspaceSize: usize, - ) -> *mut ZSTD_DCtx; - } - extern "C" { - pub fn ZSTD_initStaticDStream( -- workspace: *mut ::std::os::raw::c_void, -+ workspace: *mut ::core::ffi::c_void, - workspaceSize: usize, - ) -> *mut ZSTD_DStream; - } - extern "C" { - pub fn ZSTD_initStaticCDict( -- workspace: *mut ::std::os::raw::c_void, -+ workspace: *mut ::core::ffi::c_void, - workspaceSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictLoadMethod: ZSTD_dictLoadMethod_e, - dictContentType: ZSTD_dictContentType_e, -@@ -1637,9 +1637,9 @@ extern "C" { - } - extern "C" { - pub fn ZSTD_initStaticDDict( -- workspace: *mut ::std::os::raw::c_void, -+ workspace: *mut ::core::ffi::c_void, - workspaceSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictLoadMethod: ZSTD_dictLoadMethod_e, - dictContentType: ZSTD_dictContentType_e, -@@ -1651,14 +1651,14 @@ extern "C" { - #[doc = " All allocation/free operations will be completed using these custom variants instead of regular ones."] - pub type ZSTD_allocFunction = ::core::option::Option< - unsafe extern "C" fn( -- opaque: *mut ::std::os::raw::c_void, -+ opaque: *mut ::core::ffi::c_void, - size: usize, -- ) -> *mut ::std::os::raw::c_void, -+ ) -> *mut ::core::ffi::c_void, - >; - pub type ZSTD_freeFunction = ::core::option::Option< - unsafe extern "C" fn( -- opaque: *mut ::std::os::raw::c_void, -- address: *mut ::std::os::raw::c_void, -+ opaque: *mut ::core::ffi::c_void, -+ address: *mut ::core::ffi::c_void, - ), - >; - #[repr(C)] -@@ -1666,7 +1666,7 @@ pub type ZSTD_freeFunction = ::core::option::Option< - pub struct ZSTD_customMem { - pub customAlloc: ZSTD_allocFunction, - pub customFree: ZSTD_freeFunction, -- pub opaque: *mut ::std::os::raw::c_void, -+ pub opaque: *mut ::core::ffi::c_void, - } - #[test] - fn bindgen_test_layout_ZSTD_customMem() { -@@ -1745,7 +1745,7 @@ extern "C" { - } - extern "C" { - pub fn ZSTD_createCDict_advanced( -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictLoadMethod: ZSTD_dictLoadMethod_e, - dictContentType: ZSTD_dictContentType_e, -@@ -1755,7 +1755,7 @@ extern "C" { - } - extern "C" { - pub fn ZSTD_createDDict_advanced( -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictLoadMethod: ZSTD_dictLoadMethod_e, - dictContentType: ZSTD_dictContentType_e, -@@ -1770,7 +1770,7 @@ extern "C" { - #[doc = " and its content must remain unmodified throughout the lifetime of CDict."] - #[doc = " note: equivalent to ZSTD_createCDict_advanced(), with dictLoadMethod==ZSTD_dlm_byRef"] - pub fn ZSTD_createCDict_byReference( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> *mut ZSTD_CDict; -@@ -1821,11 +1821,11 @@ extern "C" { - #[doc = " This prototype will be marked as deprecated and generate compilation warning on reaching v1.5.x"] - pub fn ZSTD_compress_advanced( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - params: ZSTD_parameters, - ) -> usize; -@@ -1837,9 +1837,9 @@ extern "C" { - #[doc = " This prototype will be marked as deprecated and generate compilation warning in some future version"] - pub fn ZSTD_compress_usingCDict_advanced( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - cdict: *const ZSTD_CDict, - fParams: ZSTD_frameParameters, -@@ -1851,7 +1851,7 @@ extern "C" { - #[doc = " It saves some memory, but also requires that `dict` outlives its usage within `cctx`"] - pub fn ZSTD_CCtx_loadDictionary_byReference( - cctx: *mut ZSTD_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -1862,7 +1862,7 @@ extern "C" { - #[doc = " and how to interpret it (automatic ? force raw mode ? full mode only ?)"] - pub fn ZSTD_CCtx_loadDictionary_advanced( - cctx: *mut ZSTD_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictLoadMethod: ZSTD_dictLoadMethod_e, - dictContentType: ZSTD_dictContentType_e, -@@ -1874,7 +1874,7 @@ extern "C" { - #[doc = " how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?)"] - pub fn ZSTD_CCtx_refPrefix_advanced( - cctx: *mut ZSTD_CCtx, -- prefix: *const ::std::os::raw::c_void, -+ prefix: *const ::core::ffi::c_void, - prefixSize: usize, - dictContentType: ZSTD_dictContentType_e, - ) -> usize; -@@ -1978,10 +1978,10 @@ extern "C" { - #[doc = " which have troubles handling structures containing memory pointers."] - pub fn ZSTD_compressStream2_simpleArgs( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, - dstPos: *mut usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - srcPos: *mut usize, - endOp: ZSTD_EndDirective, -@@ -1994,7 +1994,7 @@ extern "C" { - #[doc = " Note 2 : Legacy Frame Identifiers are considered valid only if Legacy Support is enabled."] - #[doc = " Note 3 : Skippable Frame Identifiers are considered valid."] - pub fn ZSTD_isFrame( -- buffer: *const ::std::os::raw::c_void, -+ buffer: *const ::core::ffi::c_void, - size: usize, - ) -> ::std::os::raw::c_uint; - } -@@ -2005,7 +2005,7 @@ extern "C" { - #[doc = " It is important that dictBuffer outlives DDict,"] - #[doc = " it must remain read accessible throughout the lifetime of DDict"] - pub fn ZSTD_createDDict_byReference( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - ) -> *mut ZSTD_DDict; - } -@@ -2017,7 +2017,7 @@ extern "C" { - #[doc = " However, it's imperative that `dict` remains accessible (and unmodified) while being used, so it must outlive decompression."] - pub fn ZSTD_DCtx_loadDictionary_byReference( - dctx: *mut ZSTD_DCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -2029,7 +2029,7 @@ extern "C" { - #[doc = " and how to interpret it (automatic ? force raw mode ? full mode only ?)."] - pub fn ZSTD_DCtx_loadDictionary_advanced( - dctx: *mut ZSTD_DCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictLoadMethod: ZSTD_dictLoadMethod_e, - dictContentType: ZSTD_dictContentType_e, -@@ -2041,7 +2041,7 @@ extern "C" { - #[doc = " how to interpret prefix content (automatic ? force raw mode (default) ? full mode only ?)"] - pub fn ZSTD_DCtx_refPrefix_advanced( - dctx: *mut ZSTD_DCtx, -- prefix: *const ::std::os::raw::c_void, -+ prefix: *const ::core::ffi::c_void, - prefixSize: usize, - dictContentType: ZSTD_dictContentType_e, - ) -> usize; -@@ -2077,10 +2077,10 @@ extern "C" { - #[doc = " which have troubles handling structures containing memory pointers."] - pub fn ZSTD_decompressStream_simpleArgs( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, - dstPos: *mut usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - srcPos: *mut usize, - ) -> usize; -@@ -2117,7 +2117,7 @@ extern "C" { - #[doc = " Note : this prototype will be marked as deprecated and generate compilation warnings on reaching v1.5.x"] - pub fn ZSTD_initCStream_usingDict( - zcs: *mut ZSTD_CStream, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -2139,7 +2139,7 @@ extern "C" { - #[doc = " Note : this prototype will be marked as deprecated and generate compilation warnings on reaching v1.5.x"] - pub fn ZSTD_initCStream_advanced( - zcs: *mut ZSTD_CStream, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - params: ZSTD_parameters, - pledgedSrcSize: ::std::os::raw::c_ulonglong, -@@ -2331,7 +2331,7 @@ extern "C" { - #[doc = " Note : this prototype will be marked as deprecated and generate compilation warnings on reaching v1.5.x"] - pub fn ZSTD_initDStream_usingDict( - zds: *mut ZSTD_DStream, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -2394,7 +2394,7 @@ extern "C" { - extern "C" { - pub fn ZSTD_compressBegin_usingDict( - cctx: *mut ZSTD_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -2402,7 +2402,7 @@ extern "C" { - extern "C" { - pub fn ZSTD_compressBegin_advanced( - cctx: *mut ZSTD_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - params: ZSTD_parameters, - pledgedSrcSize: ::std::os::raw::c_ulonglong, -@@ -2432,18 +2432,18 @@ extern "C" { - extern "C" { - pub fn ZSTD_compressContinue( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } - extern "C" { - pub fn ZSTD_compressEnd( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -2576,7 +2576,7 @@ extern "C" { - #[doc = " or an error code, which can be tested using ZSTD_isError()"] - pub fn ZSTD_getFrameHeader( - zfhPtr: *mut ZSTD_frameHeader, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -2586,7 +2586,7 @@ extern "C" { - #[doc = " with added capability to select a format (like ZSTD_f_zstd1_magicless)"] - pub fn ZSTD_getFrameHeader_advanced( - zfhPtr: *mut ZSTD_frameHeader, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - format: ZSTD_format_e, - ) -> usize; -@@ -2603,7 +2603,7 @@ extern "C" { - extern "C" { - pub fn ZSTD_decompressBegin_usingDict( - dctx: *mut ZSTD_DCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - ) -> usize; - } -@@ -2619,9 +2619,9 @@ extern "C" { - extern "C" { - pub fn ZSTD_decompressContinue( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } -@@ -2671,25 +2671,25 @@ extern "C" { - extern "C" { - pub fn ZSTD_compressBlock( - cctx: *mut ZSTD_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } - extern "C" { - pub fn ZSTD_decompressBlock( - dctx: *mut ZSTD_DCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - ) -> usize; - } - extern "C" { - pub fn ZSTD_insertBlock( - dctx: *mut ZSTD_DCtx, -- blockStart: *const ::std::os::raw::c_void, -+ blockStart: *const ::core::ffi::c_void, - blockSize: usize, - ) -> usize; - } -@@ -2714,16 +2714,16 @@ extern "C" { - #[doc = " In general, it's recommended to provide a few thousands samples, though this can vary a lot."] - #[doc = " It's recommended that total size of all samples be about ~x100 times the target size of dictionary."] - pub fn ZDICT_trainFromBuffer( -- dictBuffer: *mut ::std::os::raw::c_void, -+ dictBuffer: *mut ::core::ffi::c_void, - dictBufferCapacity: usize, -- samplesBuffer: *const ::std::os::raw::c_void, -+ samplesBuffer: *const ::core::ffi::c_void, - samplesSizes: *const usize, - nbSamples: ::std::os::raw::c_uint, - ) -> usize; - } - extern "C" { - pub fn ZDICT_getDictID( -- dictBuffer: *const ::std::os::raw::c_void, -+ dictBuffer: *const ::core::ffi::c_void, - dictSize: usize, - ) -> ::std::os::raw::c_uint; - } -@@ -2761,9 +2761,9 @@ extern "C" { - extern "C" { - pub fn ZSTDMT_compressCCtx( - mtctx: *mut ZSTDMT_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - compressionLevel: ::std::os::raw::c_int, - ) -> usize; -@@ -2805,9 +2805,9 @@ extern "C" { - extern "C" { - pub fn ZSTDMT_compress_advanced( - mtctx: *mut ZSTDMT_CCtx, -- dst: *mut ::std::os::raw::c_void, -+ dst: *mut ::core::ffi::c_void, - dstCapacity: usize, -- src: *const ::std::os::raw::c_void, -+ src: *const ::core::ffi::c_void, - srcSize: usize, - cdict: *const ZSTD_CDict, - params: ZSTD_parameters, -@@ -2817,7 +2817,7 @@ extern "C" { - extern "C" { - pub fn ZSTDMT_initCStream_advanced( - mtctx: *mut ZSTDMT_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - params: ZSTD_parameters, - pledgedSrcSize: ::std::os::raw::c_ulonglong, -@@ -2919,7 +2919,7 @@ extern "C" { - #[doc = " @return : 0, or an error code"] - pub fn ZSTDMT_initCStream_internal( - zcs: *mut ZSTDMT_CCtx, -- dict: *const ::std::os::raw::c_void, -+ dict: *const ::core::ffi::c_void, - dictSize: usize, - dictContentType: ZSTD_dictContentType_e, - cdict: *const ZSTD_CDict, --- -2.24.1 - diff --git a/rust-zstd-sys.spec b/rust-zstd-sys.spec index e22ac8e..7164843 100644 --- a/rust-zstd-sys.spec +++ b/rust-zstd-sys.spec @@ -1,28 +1,23 @@ -# Generated by rust2rpm 12 +# Generated by rust2rpm 13 %bcond_without check %global debug_package %{nil} %global crate zstd-sys -%global upstream_version 1.4.15+zstd.1.4.4 +%global upstream_version 1.4.16+zstd.1.4.5 Name: rust-%{crate} -Version: 1.4.15 -Release: 3%{?dist} +Version: 1.4.16 +Release: 1%{?dist} Summary: Low-level bindings for the zstd compression library # Upstream license specification: MIT/Apache-2.0 -# included in next release License: MIT or ASL 2.0 URL: https://crates.io/crates/zstd-sys Source: %{crates_source %{crate} %{upstream_version}} # Initial patched metadata # * Remove zstd version from version field # * Make pkg-config default -# * Bump bindgen to 0.53.1, https://github.com/gyscos/zstd-rs/pull/81 Patch0: zstd-sys-fix-metadata.diff -# * Disable check of zstd/ -Patch1: zstd-sys-Disable-zstd-verification.patch -Patch2: 0001-Upgrade-bindgen-to-0.53.1.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -47,7 +42,7 @@ This package contains library source intended for building other packages which use "%{crate}" crate. %files devel -#%%license LICENSE +%license LICENSE %doc Readme.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ @@ -63,16 +58,16 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+pkgconfig-devel +%package -n %{name}+bindgen-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+pkgconfig-devel %{_description} +%description -n %{name}+bindgen-devel %{_description} This package contains library source intended for building other packages -which use "pkgconfig" feature of "%{crate}" crate. +which use "bindgen" feature of "%{crate}" crate. -%files -n %{name}+pkgconfig-devel +%files -n %{name}+bindgen-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+experimental-devel @@ -111,6 +106,18 @@ which use "non-cargo" feature of "%{crate}" crate. %files -n %{name}+non-cargo-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+pkg-config-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+pkg-config-devel %{_description} + +This package contains library source intended for building other packages +which use "pkg-config" feature of "%{crate}" crate. + +%files -n %{name}+pkg-config-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch @@ -163,6 +170,9 @@ export LLVM_CONFIG_PATH=/usr/bin/llvm-config-%{__isa_bits} %endif %changelog +* Sat May 30 2020 Josh Stone - 1.4.16+zstd.1.4.5-1 +- Update to 1.4.16+zstd.1.4.5 + * Thu Feb 27 2020 Josh Stone - 1.4.15-3 - Bump to bindgen 0.53.1 diff --git a/sources b/sources index 2d5ee05..d5ff45c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zstd-sys-1.4.15+zstd.1.4.4.crate) = 523eb1f4183deca8be3cb018e43b9e51f1910b9e04b42795fb23e036c6f13e2b81ac70ea11837200dc3061622562d360499ed3b939fd8ff23c486fbcc35ec779 +SHA512 (zstd-sys-1.4.16+zstd.1.4.5.crate) = 3541bd75d9a0fecd33495a1f9976317e3d915623cf6edc507ec61b39371208e0c7fc4a9ea1fc7ec195da8cfc2d21f92cc3a2d4c5c3297814034ac4fff7dc493b diff --git a/zstd-sys-Disable-zstd-verification.patch b/zstd-sys-Disable-zstd-verification.patch deleted file mode 100644 index 3e9d109..0000000 --- a/zstd-sys-Disable-zstd-verification.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up zstd-sys-1.4.15+zstd.1.4.4/build.rs.orig2 zstd-sys-1.4.15+zstd.1.4.4/build.rs ---- zstd-sys-1.4.15+zstd.1.4.4/build.rs.orig2 2019-11-01 03:22:22.000000000 +0100 -+++ zstd-sys-1.4.15+zstd.1.4.4/build.rs 2019-12-16 00:04:48.548762859 +0100 -@@ -134,9 +134,9 @@ fn compile_zstd() { - fn main() { - // println!("cargo:rustc-link-lib=zstd"); - -- if !PathBuf::from("zstd/lib").exists() { -- panic!("Folder 'zstd/lib' does not exists. Maybe you forget clone 'zstd' submodule?"); -- } -+ //if !PathBuf::from("zstd/lib").exists() { -+ // panic!("Folder 'zstd/lib' does not exists. Maybe you forget clone 'zstd' submodule?"); -+ //} - - let (defs, headerpaths) = if cfg!(feature = "pkg-config") { - pkg_config() diff --git a/zstd-sys-fix-metadata.diff b/zstd-sys-fix-metadata.diff index 9588008..5bc1dd7 100644 --- a/zstd-sys-fix-metadata.diff +++ b/zstd-sys-fix-metadata.diff @@ -1,32 +1,20 @@ ---- zstd-sys-1.4.15+zstd.1.4.4/Cargo.toml 2019-11-05T19:38:26+00:00 -+++ zstd-sys-1.4.15+zstd.1.4.4/Cargo.toml 2019-12-16T04:04:59.254547+00:00 +--- zstd-sys-1.4.16+zstd.1.4.5/Cargo.toml 2020-05-24T04:16:00+00:00 ++++ zstd-sys-1.4.16+zstd.1.4.5/Cargo.toml 2020-05-30T00:35:40.576094+00:00 @@ -12,7 +12,7 @@ [package] name = "zstd-sys" --version = "1.4.15+zstd.1.4.4" -+version = "1.4.15" +-version = "1.4.16+zstd.1.4.5" ++version = "1.4.16" authors = ["Alexandre Bury "] build = "build.rs" links = "zstd" -@@ -25,7 +25,7 @@ - [dependencies.libc] - version = "0.2.45" - [build-dependencies.bindgen] --version = "0.51" -+version = "0.53.1" - optional = true - - [build-dependencies.cc] -@@ -40,9 +40,10 @@ +@@ -48,7 +48,7 @@ optional = true [features] -default = ["legacy"] -+default = ["legacy", "pkgconfig"] ++default = ["legacy", "pkg-config", "bindgen"] experimental = [] legacy = [] non-cargo = [] - std = [] - zstdmt = [] -+pkgconfig = ["pkg-config", "bindgen"]