forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[OpenJPEG] Update to 2.5.0 (microsoft#24734)
* update openjpeg * update openjpeg * add arm patch and license * reduce to version * update db * fix fastcgi to always use make * remove from baseline * openjpeg add tools feature * vdb * add supports statement. fastcgi uses stuff which only is allowed in desktop apps. * format manfiest * ver db Co-authored-by: Billy Robert O'Neal III <[email protected]>
- Loading branch information
1 parent
12b018e
commit 8da5d2b
Showing
15 changed files
with
274 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h | ||
| index 6d242f36f..ec57131ce 100644 | ||
| --- a/include/fcgi_stdio.h | ||
| +++ b/include/fcgi_stdio.h | ||
| @@ -23,14 +23,6 @@ | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| -#ifndef DLLAPI | ||
| -#if defined (_WIN32) && defined (_MSC_VER) | ||
| -#define DLLAPI __declspec(dllimport) | ||
| -#else | ||
| -#define DLLAPI | ||
| -#endif | ||
| -#endif | ||
| - | ||
| /* | ||
| * Wrapper type for FILE | ||
| */ | ||
| diff --git a/include/fcgiapp.h b/include/fcgiapp.h | ||
| index 8cadde16d..9b034def3 100644 | ||
| --- a/include/fcgiapp.h | ||
| +++ b/include/fcgiapp.h | ||
| @@ -23,11 +23,19 @@ | ||
| #endif | ||
|
|
||
| #ifndef DLLAPI | ||
| -#if defined (_WIN32) && defined (_MSC_VER) | ||
| -#define DLLAPI __declspec(dllimport) | ||
| -#else | ||
| -#define DLLAPI | ||
| -#endif | ||
| +# if defined (_WIN32) && defined (_MSC_VER) | ||
| +# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) | ||
| +# define DLLAPI __declspec(dllexport) | ||
| +# else | ||
| +# ifdef LIBFCGI_DLL_IMPORT | ||
| +# define DLLAPI extern __declspec(dllimport) | ||
| +# else | ||
| +# define DLLAPI | ||
| +# endif | ||
| +# endif | ||
| +# else | ||
| +# define DLLAPI | ||
| +# endif | ||
| #endif | ||
|
|
||
| #if defined (c_plusplus) || defined (__cplusplus) | ||
| diff --git a/include/fcgio.h b/include/fcgio.h | ||
| index ce8b930a8..81981974a 100644 | ||
| --- a/include/fcgio.h | ||
| +++ b/include/fcgio.h | ||
| @@ -34,14 +34,6 @@ | ||
|
|
||
| #include "fcgiapp.h" | ||
|
|
||
| -#ifndef DLLAPI | ||
| -#if defined (_WIN32) && defined (_MSC_VER) | ||
| -#define DLLAPI __declspec(dllimport) | ||
| -#else | ||
| -#define DLLAPI | ||
| -#endif | ||
| -#endif | ||
| - | ||
| #if ! HAVE_STREAMBUF_CHAR_TYPE | ||
| typedef char char_type; | ||
| #endif | ||
| diff --git a/include/fcgios.h b/include/fcgios.h | ||
| index 206973137..7a2f5333a 100644 | ||
| --- a/include/fcgios.h | ||
| +++ b/include/fcgios.h | ||
| @@ -50,11 +50,19 @@ extern "C" { | ||
| #endif /* !_WIN32 */ | ||
|
|
||
| #ifndef DLLAPI | ||
| -#if defined (_WIN32) && defined (_MSC_VER) | ||
| -#define DLLAPI __declspec(dllimport) | ||
| -#else | ||
| -#define DLLAPI | ||
| -#endif | ||
| +# if defined (_WIN32) && defined (_MSC_VER) | ||
| +# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) | ||
| +# define DLLAPI __declspec(dllexport) | ||
| +# else | ||
| +# ifdef LIBFCGI_DLL_IMPORT | ||
| +# define DLLAPI extern __declspec(dllimport) | ||
| +# else | ||
| +# define DLLAPI | ||
| +# endif | ||
| +# endif | ||
| +# else | ||
| +# define DLLAPI | ||
| +# endif | ||
| #endif | ||
|
|
||
|
|
||
| diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am | ||
| index 42d507253..26f06f550 100644 | ||
| --- a/libfcgi/Makefile.am | ||
| +++ b/libfcgi/Makefile.am | ||
| @@ -1,7 +1,7 @@ | ||
| # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ | ||
|
|
||
| INCLUDEDIR = ../include | ||
| -AM_CPPFLAGS = -I$(top_srcdir)/include -W -Wall -pedantic -Wno-unused-parameter | ||
| +AM_CPPFLAGS = -I$(top_srcdir)/include -DLIBFCGI_BUILD | ||
|
|
||
| INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ | ||
| $(INCLUDEDIR)/fcgiapp.h \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| { | ||
| "name": "fastcgi", | ||
| "version-date": "2020-09-11", | ||
| "port-version": 4, | ||
| "port-version": 5, | ||
| "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", | ||
| "homepage": "https://fastcgi-archives.github.io/", | ||
| "license": "OML" | ||
| "license": "OML", | ||
| "supports": "!uwp" | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c | ||
| index 1eb4d525f..e2f3afd6a 100644 | ||
| --- a/src/lib/openjp2/ht_dec.c | ||
| +++ b/src/lib/openjp2/ht_dec.c | ||
| @@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE; | ||
| static INLINE | ||
| OPJ_UINT32 population_count(OPJ_UINT32 val) | ||
| { | ||
| -#ifdef OPJ_COMPILER_MSVC | ||
| +#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64)) | ||
| return (OPJ_UINT32)__popcnt(val); | ||
| #elif (defined OPJ_COMPILER_GNUC) | ||
| return (OPJ_UINT32)__builtin_popcount(val); |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt | ||
| index 4d4bd952f..e14b5a692 100644 | ||
| --- a/src/bin/jp2/CMakeLists.txt | ||
| +++ b/src/bin/jp2/CMakeLists.txt | ||
| @@ -33,14 +33,6 @@ include_directories( | ||
| ${TIFF_INCLUDE_DIRNAME} | ||
| ) | ||
|
|
||
| -if(WIN32) | ||
| - if(BUILD_SHARED_LIBS) | ||
| - add_definitions(-DOPJ_EXPORTS) | ||
| - else() | ||
| - add_definitions(-DOPJ_STATIC) | ||
| - endif() | ||
| -endif() | ||
| - | ||
| # Loop over all executables: | ||
| foreach(exe opj_decompress opj_compress opj_dump) | ||
| add_executable(${exe} ${exe}.c ${common_SRCS}) | ||
| diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt | ||
| index ea4131a3e..dc63f49dd 100644 | ||
| --- a/src/lib/openjp2/CMakeLists.txt | ||
| +++ b/src/lib/openjp2/CMakeLists.txt | ||
| @@ -84,12 +84,12 @@ endif() | ||
|
|
||
| # Build the library | ||
| if(WIN32) | ||
| + add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) | ||
| if(BUILD_SHARED_LIBS) | ||
| add_definitions(-DOPJ_EXPORTS) | ||
| else() | ||
| - add_definitions(-DOPJ_STATIC) | ||
| + target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) | ||
| endif() | ||
| - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) | ||
| set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) | ||
| else() | ||
| if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) | ||
| diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt | ||
| index b3cb8ce88..fc6a9dde3 100644 | ||
| --- a/src/lib/openjpip/CMakeLists.txt | ||
| +++ b/src/lib/openjpip/CMakeLists.txt | ||
| @@ -52,14 +52,14 @@ set(LOCAL_SRCS | ||
| ) | ||
|
|
||
| # Build the library | ||
| +add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) | ||
| if(WIN32) | ||
| if(BUILD_SHARED_LIBS) | ||
| add_definitions(-DOPJ_EXPORTS) | ||
| else() | ||
| - add_definitions(-DOPJ_STATIC) | ||
| + target_compile_definitions(openjpip PUBLIC OPJ_STATIC) | ||
| endif() | ||
| endif() | ||
| -add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) | ||
| set_target_properties(openjpip | ||
| PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) | ||
| if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt | ||
| index 292fe5a71..bcbe94160 100644 | ||
| --- a/src/bin/CMakeLists.txt | ||
| +++ b/src/bin/CMakeLists.txt | ||
| @@ -9,4 +9,4 @@ if(BUILD_JPIP) | ||
| endif() | ||
|
|
||
| # wx apps: | ||
| -add_subdirectory(wx) | ||
| +# add_subdirectory(wx) |
Oops, something went wrong.