Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pixman] Fix x86 builds not using MSVC #38851

Merged
merged 2 commits into from
Jun 4, 2024
Merged

[pixman] Fix x86 builds not using MSVC #38851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dcb2d0
[pixman] Fix x86 builds not using MSVC
Flole998 May 21, 2024
e883977
Update version database
Flole998 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ports/pixman/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ if(VCPKG_TARGET_IS_UWP)
-Dsse2=disabled
-Dssse3=disabled)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
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}")
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(VCPKG_C_FLAGS "/arch:SSE2 ${VCPKG_C_FLAGS}")
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(VCPKG_CXX_FLAGS "/arch:SSE2 ${VCPKG_CXX_FLAGS}")
endif()
list(APPEND OPTIONS
-Dmmx=enabled
-Dsse2=enabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this isn't enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently the missing flag breaks the build, so I can remove the CFLAGS on my next attempt and we can see if the CI runs through.

Expand Down
1 change: 1 addition & 0 deletions ports/pixman/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "pixman",
"version": "0.43.4",
"port-version": 1,
"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
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6802,7 +6802,7 @@
},
"pixman": {
"baseline": "0.43.4",
"port-version": 0
"port-version": 1
},
"pkgconf": {
"baseline": "2.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/pixman.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6b62aac8f96d7fe4e407759601cfdbc350afa9ae",
"version": "0.43.4",
"port-version": 1
},
{
"git-tree": "f7e1a97a6af1ad657489f901a6ca14db24652eff",
"version": "0.43.4",
Expand Down