mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 01:07:02 +08:00
[gdk-pixbuf] update to 2.42.8 (#24427)
* [gdk-pixbuf] Update to 2.42.8 (microsoft#24426) * [gdk-pixbuf] Regenerate patch (microsoft#24426) * [gdk-pixbuf] Use enabled/disabled for features (microsoft#24426) * [gdk-pixbuf] Add glib-compile-resources to the used binary list (microsoft#24426) * [gdk-pixbuf] Remove obsolete patch (microsoft#24426) * [gdk-pixbuf] regenerate version registries (microsoft#24426)
This commit is contained in:
Alonso Schaich
GitHub
parent
0d71120fc2
commit
d1904c8625
@ -1,67 +0,0 @@
|
||||
diff --git a/build-aux/post-install.bat b/build-aux/post-install.bat
|
||||
index 6994d49e1..b4789dd62 100644
|
||||
--- a/build-aux/post-install.bat
|
||||
+++ b/build-aux/post-install.bat
|
||||
@@ -7,8 +7,8 @@ set binary_version=%3
|
||||
set libdir_windows=%libdir:/=\%
|
||||
|
||||
if not "%DESTDIR%" == "" goto warn_msg
|
||||
-if not exist %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\gdk-pixbuf-2.0\%binary_version%
|
||||
-%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
||||
+if not exist %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%
|
||||
+%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
||||
|
||||
goto end
|
||||
|
||||
@@ -18,7 +18,7 @@ echo *** Warning: loaders.cache not built
|
||||
echo ***
|
||||
echo *** You should generate this file manually on the host system
|
||||
echo *** using:
|
||||
-echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
||||
+echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache
|
||||
echo ***
|
||||
|
||||
:end
|
||||
diff --git a/build-aux/post-install.sh b/build-aux/post-install.sh
|
||||
index 661bceeef..0b1a46527 100644
|
||||
--- a/build-aux/post-install.sh
|
||||
+++ b/build-aux/post-install.sh
|
||||
@@ -5,14 +5,14 @@ libdir="$2"
|
||||
binary_version="$3"
|
||||
|
||||
if [ -z "$DESTDIR" ]; then
|
||||
- mkdir -p "$libdir/gdk-pixbuf-2.0/$binary_version"
|
||||
- $bindir/gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
||||
+ mkdir -p "$libdir/../gdk-pixbuf-2.0/$binary_version"
|
||||
+ $bindir/gdk-pixbuf-query-loaders > "$libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
||||
else
|
||||
echo "***"
|
||||
echo "*** Warning: loaders.cache not built"
|
||||
echo "***"
|
||||
echo "*** You should generate this file manually on the host system"
|
||||
echo "*** using:"
|
||||
- echo "*** gdk-pixbuf-query-loaders > $libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
||||
+ echo "*** gdk-pixbuf-query-loaders > $libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache"
|
||||
echo "***"
|
||||
fi
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c38607029..4b5df91ae 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -308,12 +310,12 @@ endif
|
||||
# Don't check and build the jpeg loader if native_windows_loaders is true
|
||||
if get_option('jpeg') and not native_windows_loaders
|
||||
if cc.has_header('jpeglib.h')
|
||||
- jpeg_dep = cc.find_library('jpeg', required: false)
|
||||
- if cc.get_id() == 'msvc' and not jpeg_dep.found()
|
||||
+ jpeg_dep = dependency('libjpeg', required: false)
|
||||
+ #if cc.get_id() == 'msvc' and not jpeg_dep.found()
|
||||
# The IJG JPEG library builds the .lib file as libjpeg.lib in its MSVC build system,
|
||||
# so look for it as well when jpeg.lib cannot be found
|
||||
- jpeg_dep = cc.find_library('libjpeg', required: false)
|
||||
- endif
|
||||
+ # jpeg_dep = cc.find_library('libjpeg', required: false)
|
||||
+ #endif
|
||||
if jpeg_dep.found() and cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep)
|
||||
enabled_loaders += 'jpeg'
|
||||
loaders_deps += jpeg_dep
|
||||
@ -1,8 +1,6 @@
|
||||
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)
|
||||
@@ -90,8 +90,14 @@
|
||||
gdk_pixbuf_conf.set('HAVE_ROUND', 1)
|
||||
endif
|
||||
|
||||
@ -18,4 +16,4 @@ index b39c55d..4b050c7 100644
|
||||
+ endif
|
||||
endif
|
||||
|
||||
if cc.has_function('bind_textdomain_codeset', prefix: '#include <libintl.h>')
|
||||
intl_dep = cc.find_library('intl', required: false)
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
set(GDK_PIXBUF_VERSION 2.42)
|
||||
set(GDK_PIXBUF_PATCH 2)
|
||||
set(GDK_PIXBUF_PATCH 8)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
|
||||
FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
|
||||
SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2
|
||||
SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
fix_build.patch
|
||||
fix_build_error_windows.patch
|
||||
)
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
@ -23,18 +22,20 @@ vcpkg_configure_meson(
|
||||
-Dman=false # Whether to generate man pages (requires xlstproc)
|
||||
-Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc)
|
||||
-Ddocs=false
|
||||
-Dpng=true # Enable PNG loader (requires libpng)
|
||||
-Dtiff=true # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used
|
||||
-Djpeg=true # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used
|
||||
-Dpng=enabled # Enable PNG loader (requires libpng)
|
||||
-Dtiff=enabled # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used
|
||||
-Djpeg=enabled # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used
|
||||
-Dintrospection=disabled # Whether to generate the API introspection data (requires GObject-Introspection)
|
||||
-Drelocatable=true # Whether to enable application bundle relocation support
|
||||
-Dinstalled_tests=false
|
||||
-Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows)
|
||||
-Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located;
|
||||
# Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf
|
||||
ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
|
||||
ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources'
|
||||
glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
|
||||
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
|
||||
ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
|
||||
ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources'
|
||||
glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
|
||||
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
|
||||
)
|
||||
vcpkg_install_meson(ADD_BIN_TO_PATH)
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "gdk-pixbuf",
|
||||
"version": "2.42.2",
|
||||
"port-version": 2,
|
||||
"version": "2.42.8",
|
||||
"description": "Image loading library.",
|
||||
"homepage": "https://developer.gnome.org/gdk-pixbuf/",
|
||||
"dependencies": [
|
||||
|
||||
@ -2437,8 +2437,8 @@
|
||||
"port-version": 1
|
||||
},
|
||||
"gdk-pixbuf": {
|
||||
"baseline": "2.42.2",
|
||||
"port-version": 2
|
||||
"baseline": "2.42.8",
|
||||
"port-version": 0
|
||||
},
|
||||
"gemmlowp": {
|
||||
"baseline": "2021-09-28",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "ad94c8b8ea1bd1f66085e17b9763b22080d6bf6b",
|
||||
"version": "2.42.8",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "c6274b79c119e29062eaaa6ad99271fe868f0288",
|
||||
"version": "2.42.2",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user