From 7367141210a10673cb58d86a4a08b21c9c25630d Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 12 Jul 2022 14:08:35 +0200 Subject: [PATCH] Update for 8.13.0-rc2 - Update Pango to 1.50.8. - Update ImageMagick to 6.9.12-58. MXE Updates: - Update HarfBuzz to 4.4.1. - Update Poppler to 22.07.0. --- README.md | 12 +- build/build.sh | 2 +- build/nifticlib.mk | 15 -- build/overrides.mk | 8 +- ....62-fixes.patch => meson-0.63-fixes.patch} | 2 +- build/patches/nifticlib-3-fixes.patch | 215 ++++++++++++++++++ .../llvm-mingw/patches/rust-1-fixes.patch | 5 +- build/plugins/llvm-mingw/rust.mk | 8 +- build/variables.sh | 2 +- build/vips-all.mk | 7 +- build/vips-web.mk | 7 +- 11 files changed, 241 insertions(+), 42 deletions(-) rename build/patches/{meson-0.62-fixes.patch => meson-0.63-fixes.patch} (97%) create mode 100644 build/patches/nifticlib-3-fixes.patch diff --git a/README.md b/README.md index 4cd4258d..7f7ce527 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [fribidi] | 1.0.12 | LGPLv3 | | [gdk-pixbuf] | 2.42.8 | LGPLv3 | | [glib] | 2.73.1 | LGPLv3 | -| [harfbuzz] | 4.3.0 | MIT Licence | +| [harfbuzz] | 4.4.1 | MIT Licence | | [lcms] | 2.13.1 | MIT Licence | | [libexif] | 0.6.24 | LGPLv3 | | [libffi] | 3.4.2 | MIT Licence | @@ -42,14 +42,14 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [libxml2] | 2.9.14 | MIT Licence | | [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] | | [orc] | 0.4.32 | [orc License] (BSD-like) | -| [pango] | 1.50.7 | LGPLv3 | +| [pango] | 1.50.8 | LGPLv3 | | [pixman] | 0.40.0 | MIT Licence | | [proxy-libintl] | 0.4 | LGPLv3 | | [zlib-ng] | 2.0.6 | [zlib-ng Licence] | ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used. -² libvips is built from the [`v8.13.0-rc1`](https://github.com/libvips/libvips/tree/v8.13.0-rc1) tag, see: -https://github.com/libvips/libvips/releases/tag/v8.13.0-rc1 +² libvips is built from the [`v8.13.0-rc2`](https://github.com/libvips/libvips/tree/v8.13.0-rc2) tag, see: +https://github.com/libvips/libvips/releases/tag/v8.13.0-rc2 [aom]: https://aomedia.googlesource.com/aom/ [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/ @@ -99,7 +99,7 @@ Same as libvips-web + these extra dependencies: | [cfitsio] | 4.1.0 | BSD-like | | [fftw] | 3.3.10 | GPLv2 | | [highway] | 0.17.0 | Apache-2.0 License | -| [imagemagick] | 6.9.12-54 | [ImageMagick License] (Apache-2.0-like) | +| [imagemagick] | 6.9.12-58 | [ImageMagick License] (Apache-2.0-like) | | [imath] | 3.1.5 | BSD 3-Clause | | [libjxl] | 0.6.1 | BSD 3-Clause | | [matio] | 1.5.23 | BSD 2-Clause | @@ -107,7 +107,7 @@ Same as libvips-web + these extra dependencies: | [openexr] | 3.1.5 | BSD 3-Clause | | [openjpeg] | 2.5.0 | BSD 2-Clause | | [openslide] | 3.4.1 | LGPLv3 | -| [poppler] | 22.06.0 | GPLv2 | +| [poppler] | 22.07.0 | GPLv2 | | [sqlite] | 3.39.0 | Public domain | [brotli]: https://github.com/google/brotli diff --git a/build/build.sh b/build/build.sh index 5bc2b412..b05ced94 100755 --- a/build/build.sh +++ b/build/build.sh @@ -51,7 +51,7 @@ fi # Always checkout a particular revision which will successfully build. # This ensures that it will not suddenly break a build. # Note: Must be regularly updated. -revision="3e8d0071d384f5b76e2ccdaf26b4f1fa89b85aa7" +revision="95649828bc29334d5f9abef2718d49a55d9a5407" initialize=false if [ -f "$mxe_dir/Makefile" ]; then diff --git a/build/nifticlib.mk b/build/nifticlib.mk index cc2dd3be..387dbcc1 100644 --- a/build/nifticlib.mk +++ b/build/nifticlib.mk @@ -19,19 +19,4 @@ define $(PKG)_BUILD '$(SOURCE_DIR)' $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) $(MAKE) -C '$(BUILD_DIR)' -j 1 $(subst -,/,$(INSTALL_STRIP_LIB)) - - # create pkg-config file - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' - (echo 'prefix=$(PREFIX)/$(TARGET)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/lib'; \ - echo 'includedir=$${prefix}/include/nifti'; \ - echo ''; \ - echo 'Name: niftiio'; \ - echo 'Version: $($(PKG)_VERSION)'; \ - echo 'Description: Core i/o routines for reading and writing nifti-1 format files'; \ - echo 'Requires.private: zlib'; \ - echo 'Libs: -L$${libdir} -lniftiio -lznz'; \ - echo 'Cflags: -I$${includedir}';) \ - > '$(PREFIX)/$(TARGET)/lib/pkgconfig/niftiio.pc' endef diff --git a/build/overrides.mk b/build/overrides.mk index 4a0e60c9..89350fc1 100644 --- a/build/overrides.mk +++ b/build/overrides.mk @@ -39,8 +39,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE) # upstream version is 7, we want ImageMagick 6 -imagemagick_VERSION := 6.9.12-54 -imagemagick_CHECKSUM := af0d88cdbfd814cea231e950367c4d1251e11371b84aeabda5ddf63dc5be760a +imagemagick_VERSION := 6.9.12-58 +imagemagick_CHECKSUM := 6f7774b5a1bd06a6d67da00252ad88da2197d0d88959c599fff6c4fc81628973 imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch))) imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags @@ -61,8 +61,8 @@ librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE) # upstream version is 1.50.0 -pango_VERSION := 1.50.7 -pango_CHECKSUM := 0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33 +pango_VERSION := 1.50.8 +pango_CHECKSUM := cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch))) pango_SUBDIR := pango-$(pango_VERSION) pango_FILE := pango-$(pango_VERSION).tar.xz diff --git a/build/patches/meson-0.62-fixes.patch b/build/patches/meson-0.63-fixes.patch similarity index 97% rename from build/patches/meson-0.62-fixes.patch rename to build/patches/meson-0.63-fixes.patch index b1e16289..61555c3e 100644 --- a/build/patches/meson-0.62-fixes.patch +++ b/build/patches/meson-0.63-fixes.patch @@ -8,7 +8,7 @@ diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/ index 1111111..2222222 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -1191,7 +1191,7 @@ class CLikeCompiler: +@@ -1258,7 +1258,7 @@ class CLikeCompiler: def thread_flags(self, env: 'Environment') -> T.List[str]: # TODO: does this belong here or in GnuLike or maybe PosixLike? host_m = env.machines[self.for_machine] diff --git a/build/patches/nifticlib-3-fixes.patch b/build/patches/nifticlib-3-fixes.patch new file mode 100644 index 00000000..2340f7d6 --- /dev/null +++ b/build/patches/nifticlib-3-fixes.patch @@ -0,0 +1,215 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kleis Auke Wolthuizen +Date: Tue, 28 Jun 2022 15:45:17 +0200 +Subject: [PATCH 1/2] Set PROJECT_VERSION manually + +Upstream-Status: Pending + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,24 +11,8 @@ endif() + cmake_policy(VERSION ${NIFTI_CMAKE_POLICY_VERSION}) + + set(NIFTI_HOMEPAGE_URL "https://nifti-imaging.github.io") +-execute_process(COMMAND git "describe" "--tags" +- OUTPUT_VARIABLE GIT_REPO_VERSION_UNCLEANED +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +- +-#Extract the GIT_REPO_VERSION as composed of non-negative integer components, +-# i.e. [.[.[.]]] +-string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+((beta.*)?(alpha.*)?\\.[0-9]+(\\.g[0-9a-f]+)?)?" +- GIT_REPO_VERSION "${GIT_REPO_VERSION_UNCLEANED}") +- +-if( NOT GIT_REPO_VERSION ) +- message(NOTE "Invalid git tag does not match required regular expression, " +- "can not extract version information from '${GIT_REPO_VERSION_UNCLEANED}'") +- # NOTE: cmake -DGIT_REPO_VERSION:STRING=[.[.[.]]] can be used +- # to set the repo string for non-git repos. +- set(GIT_REPO_VERSION "0.0.0.0") #Manually set the version string for testing purposes +-endif() + project(NIFTI +- VERSION ${GIT_REPO_VERSION} ++ VERSION 3.0.1 + DESCRIPTION "Niftilib is a set of i/o libraries for reading and writing files in the nifti-1 data format. nifti-1 is a binary file format for storing medical image data, e.g. magnetic resonance image (MRI) and functional MRI (fMRI) brain images." + LANGUAGES C) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Wed, 2 Feb 2022 18:00:39 +0100 +Subject: [PATCH 2/2] Generate pkgconfig files + +This allow to easily include the libraries in other projects. + +See https://www.freedesktop.org/wiki/Software/pkg-config/ for more information +about what pkg-config is. + +Upstream-Status: Submitted [https://github.com/NIFTI-Imaging/nifti_clib/pull/140] + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,6 +56,7 @@ set_if_not_defined(NIFTI_INSTALL_RUNTIME_DIR bin) + set_if_not_defined(NIFTI_INSTALL_LIBRARY_DIR lib) + set_if_not_defined(NIFTI_INSTALL_ARCHIVE_DIR ${NIFTI_INSTALL_LIBRARY_DIR}) + set_if_not_defined(NIFTI_INSTALL_INCLUDE_DIR include/nifti) ++set_if_not_defined(NIFTI_INSTALL_PKGCONFIG_DIR ${NIFTI_INSTALL_LIBRARY_DIR}/pkgconfig) + set_if_not_defined(NIFTI_INSTALL_MAN_DIR share/man/man1) + set_if_not_defined(NIFTI_INSTALL_DOC_DIR share/doc/${PROJECT_NAME}) + set_if_not_defined(NIFTI_ZLIB_LIBRARIES "") +diff --git a/cmake/nifti_macros.cmake b/cmake/nifti_macros.cmake +index 1111111..2222222 100644 +--- a/cmake/nifti_macros.cmake ++++ b/cmake/nifti_macros.cmake +@@ -135,6 +135,10 @@ function(install_nifti_target target_name) + COMPONENT Development + INCLUDES DESTINATION ${NIFTI_INSTALL_INCLUDE_DIR} + ) ++ ++ install(FILES $ ++ COMPONENT Development ++ DESTINATION ${NIFTI_INSTALL_PKGCONFIG_DIR}) + endfunction() + + function(get_lib_version_var ver_header_text ver_type version_out) +diff --git a/nifti2/CMakeLists.txt b/nifti2/CMakeLists.txt +index 1111111..2222222 100644 +--- a/nifti2/CMakeLists.txt ++++ b/nifti2/CMakeLists.txt +@@ -2,11 +2,13 @@ set(NIFTI_NIFTILIB2_NAME ${NIFTI_PACKAGE_PREFIX}nifti2) + + add_nifti_library(${NIFTI_NIFTILIB2_NAME} nifti2_io.c ) + target_link_libraries( ${NIFTI_NIFTILIB2_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}znz ${NIFTI_SYSTEM_MATH_LIB}) ++configure_file(nifti2.pc.in nifti2.pc @ONLY) + set_target_properties( + ${NIFTI_NIFTILIB2_NAME} + PROPERTIES + PUBLIC_HEADER + "${CMAKE_CURRENT_LIST_DIR}/nifti1.h;${CMAKE_CURRENT_LIST_DIR}/nifti2.h;${CMAKE_CURRENT_LIST_DIR}/nifti2_io.h" ++ PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/nifti2.pc + ) + # Set library version when building shared libs. + if(BUILD_SHARED_LIBS) +diff --git a/nifti2/nifti2.pc.in b/nifti2/nifti2.pc.in +new file mode 100644 +index 0000000..1111111 +--- /dev/null ++++ b/nifti2/nifti2.pc.in +@@ -0,0 +1,11 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@ ++includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@ ++ ++Name: nifti2 ++Description: Core i/o routines for reading and writing nifti-2 format files ++Version: @PROJECT_VERSION@ ++Requires: znzlib ++Libs: -L${libdir} -lnifti2 ++Cflags: -I${includedir} +diff --git a/nifticdf/CMakeLists.txt b/nifticdf/CMakeLists.txt +index 1111111..2222222 100644 +--- a/nifticdf/CMakeLists.txt ++++ b/nifticdf/CMakeLists.txt +@@ -1,11 +1,13 @@ + set(NIFTI_CDFLIB_NAME ${NIFTI_PACKAGE_PREFIX}nifticdf) + + add_nifti_library(${NIFTI_CDFLIB_NAME} nifticdf.c ) ++configure_file(nifticdf.pc.in nifticdf.pc @ONLY) + set_target_properties( + ${NIFTI_CDFLIB_NAME} + PROPERTIES + PUBLIC_HEADER + "${CMAKE_CURRENT_LIST_DIR}/nifticdf.h" ++ PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/nifticdf.pc + ) + target_compile_options(${NIFTI_CDFLIB_NAME} PRIVATE "-D__COMPILE_UNUSED_FUNCTIONS__") + target_link_libraries(${NIFTI_CDFLIB_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}niftiio) +diff --git a/nifticdf/nifticdf.pc.in b/nifticdf/nifticdf.pc.in +new file mode 100644 +index 0000000..1111111 +--- /dev/null ++++ b/nifticdf/nifticdf.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@ ++includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@ ++ ++Name: nifticdf ++Description: Functions to compute cumulative distributions and their inverses ++Version: @PROJECT_VERSION@ ++Libs: -L${libdir} -lnifticdf ++Cflags: -I${includedir} +diff --git a/niftilib/CMakeLists.txt b/niftilib/CMakeLists.txt +index 1111111..2222222 100644 +--- a/niftilib/CMakeLists.txt ++++ b/niftilib/CMakeLists.txt +@@ -2,11 +2,13 @@ set(NIFTI_NIFTILIB_NAME ${NIFTI_PACKAGE_PREFIX}niftiio) + + add_nifti_library(${NIFTI_NIFTILIB_NAME} nifti1_io.c ) + target_link_libraries( ${NIFTI_NIFTILIB_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}znz ${NIFTI_SYSTEM_MATH_LIB}) ++configure_file(niftiio.pc.in niftiio.pc @ONLY) + set_target_properties( + ${NIFTI_NIFTILIB_NAME} + PROPERTIES + PUBLIC_HEADER + "${CMAKE_CURRENT_LIST_DIR}/nifti1_io.h;${CMAKE_CURRENT_LIST_DIR}/nifti1.h" ++ PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/niftiio.pc + ) + # Set library version when building shared libs. + if(BUILD_SHARED_LIBS) +diff --git a/niftilib/niftiio.pc.in b/niftilib/niftiio.pc.in +new file mode 100644 +index 0000000..1111111 +--- /dev/null ++++ b/niftilib/niftiio.pc.in +@@ -0,0 +1,11 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@ ++includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@ ++ ++Name: niftiio ++Description: Core i/o routines for reading and writing nifti-1 format files ++Version: @PROJECT_VERSION@ ++Requires: znzlib ++Libs: -L${libdir} -lniftiio ++Cflags: -I${includedir} +diff --git a/znzlib/CMakeLists.txt b/znzlib/CMakeLists.txt +index 1111111..2222222 100644 +--- a/znzlib/CMakeLists.txt ++++ b/znzlib/CMakeLists.txt +@@ -2,10 +2,12 @@ set(NIFTI_ZNZLIB_NAME ${NIFTI_PACKAGE_PREFIX}znz) + + add_nifti_library(${NIFTI_ZNZLIB_NAME} znzlib.c ) + target_link_libraries( ${NIFTI_ZNZLIB_NAME} PUBLIC ${NIFTI_ZLIB_LIBRARIES} ) ++configure_file(znzlib.pc.in znzlib.pc @ONLY) + set_target_properties( + ${NIFTI_ZNZLIB_NAME} + PROPERTIES + PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/znzlib.h ++ PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/znzlib.pc + ) + target_compile_definitions(${NIFTI_ZNZLIB_NAME} PUBLIC ${ZNZ_COMPILE_DEF}) + # Set library version if building shared libs. +diff --git a/znzlib/znzlib.pc.in b/znzlib/znzlib.pc.in +new file mode 100644 +index 0000000..1111111 +--- /dev/null ++++ b/znzlib/znzlib.pc.in +@@ -0,0 +1,12 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@ ++includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@ ++zlib_support=true ++ ++Name: znzlib ++Description: Low level library for handling read/write of compressed files ++Version: @PROJECT_VERSION@ ++Requires: zlib ++Libs: -L${libdir} -lznz ++Cflags: -I${includedir} diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch index e9c49b1a..6aaa9109 100644 --- a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch +++ b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch @@ -37,14 +37,13 @@ new file mode 100644 index 0000000..1111111 --- /dev/null +++ b/compiler/rustc_target/src/spec/i686_pc_windows_gnullvm.rs -@@ -0,0 +1,21 @@ +@@ -0,0 +1,20 @@ +use crate::spec::{FramePointer, LinkerFlavor, Target}; + +pub fn target() -> Target { + let mut base = super::windows_gnullvm_base::opts(); + base.cpu = "pentium4".into(); -+ let gcc_pre_link_args = base.pre_link_args.entry(LinkerFlavor::Gcc).or_default(); -+ gcc_pre_link_args.push("-mi386pe".into()); ++ base.add_pre_link_args(LinkerFlavor::Gcc, &["-mi386pe"]); + base.max_atomic_width = Some(64); + base.frame_pointer = FramePointer::Always; // Required for backtraces + base.linker = Some("i686-w64-mingw32-clang".into()); diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk index 8c8c16d7..0193cec5 100644 --- a/build/plugins/llvm-mingw/rust.mk +++ b/build/plugins/llvm-mingw/rust.mk @@ -2,13 +2,13 @@ PKG := rust $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -# https://static.rust-lang.org/dist/2022-06-26/rustc-nightly-src.tar.xz.sha256 +# https://static.rust-lang.org/dist/2022-07-12/rustc-nightly-src.tar.xz.sha256 $(PKG)_VERSION := nightly -$(PKG)_CHECKSUM := a600c43ab32bd4bc3c8069926fe2b8344e304a9e90e0bd8e1cd68f9ce22037cd +$(PKG)_CHECKSUM := ebe29c7ce66ad25ce7a94f6ab388248e599b8beea374b3b22ab9fe9d14a160c2 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) $(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src $(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz -$(PKG)_URL := https://static.rust-lang.org/dist/2022-06-26/$($(PKG)_FILE) +$(PKG)_URL := https://static.rust-lang.org/dist/2022-07-12/$($(PKG)_FILE) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) @@ -92,7 +92,6 @@ define $(PKG)_BUILD '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib/self-contained';) # Install Cargo config - # FIXME(kleisauke): Remove -Zshare-generics=no, see: https://github.com/rust-lang/rust/issues/96486 $(INSTALL) -d '$(PREFIX)/$(TARGET)/.cargo' (echo '[unstable]'; \ echo 'build-std = ["std", "panic_abort"]'; \ @@ -104,7 +103,6 @@ define $(PKG)_BUILD echo 'RUST_COMPILER_RT_ROOT = "$(PREFIX)/$(BUILD)/lib/rustlib/src/rust/src/llvm-project/compiler-rt"'; \ echo '[target.$(TARGET_RUST)]'; \ echo 'rustflags = ['; \ - echo ' "-Zshare-generics=no",'; \ echo ' "-Clink-self-contained=yes"'; \ echo ']'; \ echo 'linker = "$(TARGET)-clang"'; \ diff --git a/build/variables.sh b/build/variables.sh index c4558db6..d9a7c9cc 100755 --- a/build/variables.sh +++ b/build/variables.sh @@ -3,7 +3,7 @@ vips_package=vips vips_version=8.13 vips_patch_version=0 -vips_pre_version=rc1 +vips_pre_version=rc2 if [ -n "$GIT_COMMIT" ]; then vips_version=$GIT_COMMIT diff --git a/build/vips-all.mk b/build/vips-all.mk index 7bd30ebd..362c0fc7 100644 --- a/build/vips-all.mk +++ b/build/vips-all.mk @@ -3,10 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := $(PKG)_VERSION := 8.13.0 -$(PKG)_CHECKSUM := 3bce6ada3c18a38f59a8f51297ed59b19ab8ca1076770c715f0d33de19842d2a +$(PKG)_CHECKSUM := e52625465f07c68119bd1dcb123558720594439d45cddeb2a24d8464197879b0 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_SUBDIR := libvips-$($(PKG)_VERSION)-rc1 -$(PKG)_GH_CONF := libvips/libvips/tags,v,-rc1 +$(PKG)_SUBDIR := vips-$($(PKG)_VERSION) +$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.gz +$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.gz $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \ libjpeg-turbo tiff lcms libexif libheif libpng \ libspng libimagequant orc imagemagick matio openexr \ diff --git a/build/vips-web.mk b/build/vips-web.mk index 2d3c202c..69100bfb 100644 --- a/build/vips-web.mk +++ b/build/vips-web.mk @@ -3,10 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := $(PKG)_VERSION := 8.13.0 -$(PKG)_CHECKSUM := 3bce6ada3c18a38f59a8f51297ed59b19ab8ca1076770c715f0d33de19842d2a +$(PKG)_CHECKSUM := e52625465f07c68119bd1dcb123558720594439d45cddeb2a24d8464197879b0 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_SUBDIR := libvips-$($(PKG)_VERSION)-rc1 -$(PKG)_GH_CONF := libvips/libvips/tags,v,-rc1 +$(PKG)_SUBDIR := vips-$($(PKG)_VERSION) +$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.gz +$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.gz $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \ libjpeg-turbo tiff lcms libexif libheif libpng \ libspng libimagequant orc cgif