diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-10-13 13:17:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 13:17:32 -0700 |
| commit | 75bd2efe0dce862dfa025209b8cecc61a00a1852 (patch) | |
| tree | 8f490bc7e3c4fffe5a1b3f641a6373a6ea341cc8 /ports/qt5-imageformats | |
| parent | e14917f04b2a79b22087cab67ab80c0e3d47c8ba (diff) | |
| download | vcpkg-75bd2efe0dce862dfa025209b8cecc61a00a1852.tar.gz vcpkg-75bd2efe0dce862dfa025209b8cecc61a00a1852.zip | |
[many ports] 2019.09.14 Updates (#13536)
* [many ports] 2019.09.14 Updates
* Revert failure ports
* Revert failure ports
* Revert failure ports
* [urdfdom] Fix find dependency console_bridge
* Revert failure ports
* [devil] Compatible with jasper 2.0.20
* [devil] Refix compatible with jasper functions declaration on different os
* Update ports/alembic/CONTROL
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Revert failure ports wangle
* [azure-kinect-sensor-sdk] Fix build with matroska 1.6.2
* Revert failure ports
* Revert failure ports
* [urdfdom-headers] Fix include path in config.cmake file
* upload patch
* [urdfdom-headers] Refix include path in config.cmake file
* [qt5-imageformats] Fix missing include math.h
* [urdfdom-headers] Refix include path in config.cmake file
* [qt5] Fix adding option PATCHES and other options when using qt_submodule_installation
* Remove updated ports version
* Commit suggestions
* [libideviceactivation] revert
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/qt5-imageformats')
| -rw-r--r-- | ports/qt5-imageformats/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-imageformats/fix-include-math.patch | 12 | ||||
| -rw-r--r-- | ports/qt5-imageformats/portfile.cmake | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index 6cc1b86ea..8f247686c 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,5 +1,5 @@ Source: qt5-imageformats
Version: 5.15.0
-Port-Version: 1
+Port-Version: 2
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
Build-Depends: qt5-base[core], tiff, libwebp, jasper
diff --git a/ports/qt5-imageformats/fix-include-math.patch b/ports/qt5-imageformats/fix-include-math.patch new file mode 100644 index 000000000..94ec86e4e --- /dev/null +++ b/ports/qt5-imageformats/fix-include-math.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp +index e9a470c..556fd2c 100644 +--- a/src/plugins/imageformats/jp2/qjp2handler.cpp ++++ b/src/plugins/imageformats/jp2/qjp2handler.cpp +@@ -45,6 +45,7 @@ + #include "qcolor.h" + + #include <jasper/jasper.h> ++#include <math.h> + + QT_BEGIN_NAMESPACE + diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index abd88a60c..b7ef46903 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -51,4 +51,4 @@ set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}" "JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] -qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})
\ No newline at end of file +qt_submodule_installation(PATCHES fix-include-math.patch BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})
\ No newline at end of file |