[pixman] update to 0.42.2 (microsoft#28240)

* [pixman] update to 0.42.2 * v db * disable neon intrinsics * v db * remove deprecated function * v db * fix function call * v db * v db Co-authored-by: Monica <[email protected]>
sarvex · Jan 16, 2023 · 05f3f36 · 05f3f36
1 parent 17b405b
commit 05f3f36
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 30 deletions.
diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake
@@ -4,7 +4,7 @@ if(VCPKG_TARGET_IS_UWP)
             -Dsse2=disabled
             -Dssse3=disabled)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-    set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}")
+    set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}") # TODO: /arch: flag requires compiler check. needs to be MSVC
     set(VCPKG_C_FLAGS "/arch:SSE2 ${VCPKG_C_FLAGS}")
     list(APPEND OPTIONS
             -Dmmx=enabled
@@ -30,23 +30,24 @@ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips")
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
-   list(APPEND OPTIONS
-               -Darm-simd=disabled
-               -Dneon=disabled)
+    list(APPEND OPTIONS
+                -Da64-neon=disabled
+                -Darm-simd=disabled
+                -Dneon=disabled
+                )
 endif()
 
-set(PIXMAN_VERSION 0.40.0)
+set(PIXMAN_VERSION "${VERSION}")
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
     FILENAME "pixman-${PIXMAN_VERSION}.tar.gz"
-    SHA512 063776e132f5d59a6d3f94497da41d6fc1c7dca0d269149c78247f0e0d7f520a25208d908cf5e421d1564889a91da44267b12d61c0bd7934cd54261729a7de5f
+    SHA512 0a4e327aef89c25f8cb474fbd01de834fd2a1b13fdf7db11ab72072082e45881cd16060673b59d02054b1711ae69c6e2395f6ae9214225ee7153939efcd2fa5d
 )
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${PIXMAN_VERSION}
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
     PATCHES
-        remove_test_demos.patch
         no-host-cpu-checks.patch
         fix_clang-cl.patch
         missing_intrin_include.patch
@@ -56,6 +57,7 @@ vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${OPTIONS}
         -Dlibpng=enabled
+        -Dtests=disabled
 )
 vcpkg_install_meson()
 vcpkg_fixup_pkgconfig()

diff --git a/ports/pixman/remove_test_demos.patch b/ports/pixman/remove_test_demos.patch
diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "pixman",
-  "version": "0.40.0",
-  "port-version": 5,
+  "version": "0.42.2",
   "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.",
   "homepage": "https://www.cairographics.org/releases",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5901,8 +5901,8 @@
       "port-version": 1
     },
     "pixman": {
-      "baseline": "0.40.0",
-      "port-version": 5
+      "baseline": "0.42.2",
+      "port-version": 0
     },
     "pkgconf": {
       "baseline": "1.8.0",

diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a6bc25e07965cb8f3fb609900729d58c1f222457",
+      "version": "0.42.2",
+      "port-version": 0
+    },
     {
       "git-tree": "f26230558cb33582de396b799e90a9046672b151",
       "version": "0.40.0",