Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
28 changes: 28 additions & 0 deletions ports/gdk-pixbuf/fix_build_error_windows.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/meson.build b/meson.build
index b39c55d..3abf53b 100644
--- a/meson.build
+++ b/meson.build
@@ -85,11 +85,21 @@ endforeach
mathlib_dep = cc.find_library('m', required: false)

# XXX: Remove the checks for round() and lrint() once GDK-Pixbuf is declared C99
-if cc.has_function('round', dependencies: mathlib_dep)
+if cc.compiles('''
+ #include <math.h>
+ int main () {
+ return round(0);
+ }''',
+ name : 'round Support')
Comment thread
strega-nil-ms marked this conversation as resolved.
Outdated
gdk_pixbuf_conf.set('HAVE_ROUND', 1)
endif

-if cc.has_function('lrint', dependencies: mathlib_dep)
+if cc.compiles('''
+ #include <math.h>
+ int main () {
+ return lrint(0);
+ }''',
+ name : 'lrint Support')
Comment thread
strega-nil-ms marked this conversation as resolved.
Outdated
gdk_pixbuf_conf.set('HAVE_LRINT', 1)
endif

4 changes: 3 additions & 1 deletion ports/gdk-pixbuf/portfile.cmake
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
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
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bd1dbe2aeb1e9aa06b5723c62970f3c81392205c",
"version": "2.42.2",
"port-version": 1
},
{
"git-tree": "609b77f244ec0d76aac5616cd8654dfcbc608297",
"version": "2.42.2",
Expand Down