aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
Diffstat (limited to 'ports')
-rw-r--r--ports/libpng/CONTROL2
-rw-r--r--ports/libpng/portfile.cmake6
-rw-r--r--ports/pcre2/CONTROL2
-rw-r--r--ports/pcre2/portfile.cmake2
4 files changed, 9 insertions, 3 deletions
diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL
index d03709b00..173c3a0d3 100644
--- a/ports/libpng/CONTROL
+++ b/ports/libpng/CONTROL
@@ -1,5 +1,5 @@
Source: libpng
-Version: 1.6.37-6
+Version: 1.6.37-7
Build-Depends: zlib
Homepage: https://github.com/glennrp/libpng
Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files.
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index e9a200455..cc3ee459c 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -47,11 +47,17 @@ else()
set(PNG_SHARED_LIBS OFF)
endif()
+set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION )
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL iOS)
+ set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF")
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
${LIBPNG_APNG_OPTION}
+ ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION}
-DPNG_STATIC=${PNG_STATIC_LIBS}
-DPNG_SHARED=${PNG_SHARED_LIBS}
-DPNG_TESTS=OFF
diff --git a/ports/pcre2/CONTROL b/ports/pcre2/CONTROL
index be71b866e..044bb81d3 100644
--- a/ports/pcre2/CONTROL
+++ b/ports/pcre2/CONTROL
@@ -1,4 +1,4 @@
Source: pcre2
-Version: 10.30-6
+Version: 10.30-7
Homepage: https://pcre.org/
Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library
diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake
index 199f72a59..9057ede47 100644
--- a/ports/pcre2/portfile.cmake
+++ b/ports/pcre2/portfile.cmake
@@ -14,7 +14,7 @@ vcpkg_extract_source_archive_ex(
fix-uwp.patch
)
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS")
set(JIT OFF)
else()
set(JIT ON)