Skip to content

Commit

Permalink
[pixman] build fix for arm-windows and arm-uwp (#28024)
Browse files Browse the repository at this point in the history
* [pixman] fix arm-uwp triplet

* [pixman] Fix both arm-windows and arm-uwp triplets

* [pixman] bump port version

* [pixman] update ci.baseline.txt

* [pixman] add-version
  • Loading branch information
paoldev committed Dec 28, 2022
1 parent b7eaf99 commit c14c029
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
6 changes: 6 additions & 0 deletions ports/pixman/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips")
-Dssse3=disabled)
endif()

if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
list(APPEND OPTIONS
-Darm-simd=disabled
-Dneon=disabled)
endif()

set(PIXMAN_VERSION 0.40.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion ports/pixman/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pixman",
"version": "0.40.0",
"port-version": 4,
"port-version": 5,
"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",
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,6 @@ pfring:arm64-osx=fail
# pfring on Linux currently fails because its build scripts enable warnings as
# errors, and warnings trigger with the Linux kernel headers in the Azure images.
pfring:x64-linux=fail
pixman:arm-uwp=fail
platform-folders:arm-uwp=fail
platform-folders:x64-uwp=fail
plibsys:arm-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5842,7 +5842,7 @@
},
"pixman": {
"baseline": "0.40.0",
"port-version": 4
"port-version": 5
},
"pkgconf": {
"baseline": "1.8.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pixman.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f26230558cb33582de396b799e90a9046672b151",
"version": "0.40.0",
"port-version": 5
},
{
"git-tree": "d0209cb23d5ca18cd74fa4a67e7ca80f7e81c0cd",
"version": "0.40.0",
Expand Down

0 comments on commit c14c029

Please sign in to comment.