7b86251bef
* Add Lizard (LZ5) Add a new package for Lizard, formerly LZ5, a very fast compressor and decompressor library. * c-blosc2: use external lizard Use an external Lizard (LZ5) dependency and add missing "when="s for other compressor dependents.
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
From 02c35c25e565a090ec6b49fbc6210f6593519b44 Mon Sep 17 00:00:00 2001
|
|
From: Przemyslaw Skibinski <przemyslaw.skibinski@percona.com>
|
|
Date: Fri, 25 Oct 2019 10:03:39 +0200
|
|
Subject: [PATCH] Fix missing `lizard_decompress.h` after `make install`.
|
|
|
|
---
|
|
lib/Makefile | 2 ++
|
|
lib/lizard_common.h | 7 +++++++
|
|
lib/lizard_decompress.h | 9 +--------
|
|
3 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/lib/Makefile b/lib/Makefile
|
|
index 64c07dd..9484056 100644
|
|
--- a/lib/Makefile
|
|
+++ b/lib/Makefile
|
|
@@ -143,6 +143,7 @@ endif
|
|
@ln -sf liblizard.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblizard.$(SHARED_EXT)
|
|
@echo Installing includes
|
|
@$(INSTALL_DATA) lizard_compress.h $(DESTDIR)$(INCLUDEDIR)/lizard_compress.h
|
|
+ @$(INSTALL_DATA) lizard_decompress.h $(DESTDIR)$(INCLUDEDIR)/lizard_decompress.h
|
|
@$(INSTALL_DATA) lizard_common.h $(DESTDIR)$(INCLUDEDIR)/lizard_common.h
|
|
@$(INSTALL_DATA) lizard_frame.h $(DESTDIR)$(INCLUDEDIR)/lizard_frame.h
|
|
@echo lizard static and shared libraries installed
|
|
@@ -154,6 +155,7 @@ uninstall:
|
|
@$(RM) $(DESTDIR)$(LIBDIR)/liblizard.$(SHARED_EXT_VER)
|
|
@$(RM) $(DESTDIR)$(LIBDIR)/liblizard.a
|
|
@$(RM) $(DESTDIR)$(INCLUDEDIR)/lizard_compress.h
|
|
+ @$(RM) $(DESTDIR)$(INCLUDEDIR)/lizard_decompress.h
|
|
@$(RM) $(DESTDIR)$(INCLUDEDIR)/lizard_common.h
|
|
@$(RM) $(DESTDIR)$(INCLUDEDIR)/lizard_frame.h
|
|
@echo lizard libraries successfully uninstalled
|
|
diff --git a/lib/lizard_common.h b/lib/lizard_common.h
|
|
index 1677abb..45730cf 100644
|
|
--- a/lib/lizard_common.h
|
|
+++ b/lib/lizard_common.h
|
|
@@ -192,6 +192,13 @@ struct Lizard_stream_s
|
|
const BYTE* destBase;
|
|
};
|
|
|
|
+struct Lizard_streamDecode_s {
|
|
+ const BYTE* externalDict;
|
|
+ size_t extDictSize;
|
|
+ const BYTE* prefixEnd;
|
|
+ size_t prefixSize;
|
|
+};
|
|
+
|
|
struct Lizard_dstream_s
|
|
{
|
|
const BYTE* offset16Ptr;
|
|
diff --git a/lib/lizard_decompress.h b/lib/lizard_decompress.h
|
|
index 5453b4d..ad9fc8e 100644
|
|
--- a/lib/lizard_decompress.h
|
|
+++ b/lib/lizard_decompress.h
|
|
@@ -39,8 +39,6 @@
|
|
extern "C" {
|
|
#endif
|
|
|
|
-#include "entropy/mem.h" /* U32 */
|
|
-
|
|
|
|
/*^***************************************************************
|
|
* Export parameters
|
|
@@ -95,12 +93,7 @@ LIZARDDLIB_API int Lizard_decompress_safe_partial (const char* source, char* des
|
|
/*-**********************************************
|
|
* Streaming Decompression Functions
|
|
************************************************/
|
|
-typedef struct {
|
|
- const BYTE* externalDict;
|
|
- size_t extDictSize;
|
|
- const BYTE* prefixEnd;
|
|
- size_t prefixSize;
|
|
-} Lizard_streamDecode_t;
|
|
+typedef struct Lizard_streamDecode_s Lizard_streamDecode_t;
|
|
|
|
/*
|
|
* Lizard_streamDecode_t
|