Skip to content

[vcpkg baseline][gdk-pixbuf] Fix build error on windows #17528

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

Merged
BillyONeal merged 10 commits into from
Apr 28, 2021
Merged

[vcpkg baseline][gdk-pixbuf] Fix build error on windows #17528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4be224e
[vcpkg baseline][gdk-pixbuf] Fix build error on windows
PhoebeHui Apr 27, 2021
1b0c41c
Format the vcpkg.json
PhoebeHui Apr 27, 2021
3bfa473
Update the baseline version
PhoebeHui Apr 27, 2021
2889b21
Update the patch
PhoebeHui Apr 27, 2021
5883cf9
Update the baseline version
PhoebeHui Apr 27, 2021
04dbcea
Apply suggestions from code review
strega-nil-ms Apr 27, 2021
d6a5b9f
Apply suggestions from code review
PhoebeHui Apr 28, 2021
e7994c5
Update the baseline version
PhoebeHui Apr 28, 2021
053abc2
Update the patch
PhoebeHui Apr 28, 2021
7085064
Update the baseline version
PhoebeHui Apr 28, 2021
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
21 changes: 21 additions & 0 deletions ports/gdk-pixbuf/fix_build_error_windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/meson.build b/meson.build
index b39c55d..4b050c7 100644
--- a/meson.build
+++ b/meson.build
@@ -89,8 +89,14 @@ if cc.has_function('round', dependencies: mathlib_dep)
gdk_pixbuf_conf.set('HAVE_ROUND', 1)
endif

-if cc.has_function('lrint', dependencies: mathlib_dep)
- gdk_pixbuf_conf.set('HAVE_LRINT', 1)
+if cc.get_id() == 'msvc'
+ if cc.has_function('lrint', dependencies: mathlib_dep, args: '-Oi-')
+ gdk_pixbuf_conf.set('HAVE_LRINT', 1)
+ endif
+else
+ if cc.has_function('lrint', dependencies: mathlib_dep)
+ gdk_pixbuf_conf.set('HAVE_LRINT', 1)
+ endif
endif

if cc.has_function('bind_textdomain_codeset', prefix: '#include <libintl.h>')
4 changes: 3 additions & 1 deletion ports/gdk-pixbuf/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES fix_build.patch
PATCHES
fix_build.patch
fix_build_error_windows.patch
)
if(VCPKG_TARGET_IS_WINDOWS)
#list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option
Expand Down
1 change: 1 addition & 0 deletions ports/gdk-pixbuf/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "gdk-pixbuf",
"version": "2.42.2",
"port-version": 1,
"description": "Image loading library.",
"homepage": "https://developer.gnome.org/gdk-pixbuf/",
"dependencies": [
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 @@ -2170,7 +2170,7 @@
},
"gdk-pixbuf": {
"baseline": "2.42.2",
"port-version": 0
"port-version": 1
},
"genann": {
"baseline": "2019-07-10",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gdk-pixbuf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f90cd0dd11fd312fe803519706f422a9207336d0",
"version": "2.42.2",
"port-version": 1
},
{
"git-tree": "609b77f244ec0d76aac5616cd8654dfcbc608297",
"version": "2.42.2",
Expand Down