Conan/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-983][DO-985] add tiff and zstd packages (!14)

Browse Source 
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/14
This commit is contained in:
Aleksandr Vodyanov
2024-12-26 16:03:17 +03:00
parent 70e3dea3f3
commit 60445ac09e
55 changed files with 1662 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
recipes/jbig/all/patches/0001-add-missing-export.patch Normal file
View File

@@ -0,0 +1,9 @@
--- a/libjbig/jbig.h
+++ b/libjbig/jbig.h
@@ -307,5 +309,6 @@
const unsigned char *src, unsigned char **dest,
int use_graycode);
extern JBIGEXPORT int jbg_newlen(unsigned char *bie, size_t len);
+extern JBIGEXPORT unsigned char *jbg_next_pscdms(unsigned char *p, size_t len);
#endif /* JBG_H */

41
recipes/jbig/all/patches/0002-fix-msvc-export.patch Normal file
View File

@@ -0,0 +1,41 @@
diff --git a/libjbig/jbig.h b/libjbig/jbig.h
index 214105a..a4f7781 100644
--- a/libjbig/jbig.h
+++ b/libjbig/jbig.h
@@ -246,24 +246,26 @@ struct jbg_dec_state {
* Under VISUALC we have single threaded static libraries, or
* multi-threaded DLLs using the multithreaded runtime DLLs.
**/
-
-#if defined(_MT) && defined(_DLL) && !defined(_JBIGDLL_) && !defined(_LIB)
-# define _JBIGDLL_
+
+#if defined(_MSC_VER)
+# if defined(jbig_EXPORTS)
+# define SHARED_EXPORT_PREFIX __declspec(dllexport)
+# else
+# define SHARED_EXPORT_PREFIX __declspec(dllimport)
+# endif
+#else
+# define SHARED_EXPORT_PREFIX
#endif
#if defined(_JBIGDLL_)
-# if defined(_VISUALC_)
+# if defined(_MSC_VER)
# pragma warning( disable : 4273 )
# endif
-# if !defined(_JBIGLIB_)
-# define JBIGEXPORT __declspec(dllimport)
-# else
-# define JBIGEXPORT __declspec(dllexport)
-# endif
+# define JBIGEXPORT SHARED_EXPORT_PREFIX
#else
# define JBIGEXPORT
#endif
-#if defined(_VISUALC_)
+#if defined(_MSC_VER)
# pragma warning( disable : 4018 )
# pragma warning( disable : 4244 )
# pragma warning( disable : 4142 )