Skip to content

Commit 392623b

Browse files
kleisaukekleisauke
authored
Bump deps: freetype, harfbuzz, rsvg, xml2 (lovell#291)
* CMake: ensure `find_package()` resolves only from target sysroot * mozjpeg: backport mozilla/mozjpeg@1644bdb
1 parent c408eb6 commit 392623b

13 files changed

Lines changed: 30 additions & 5 deletions

File tree

‎build/posix.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ elif [ "$DARWIN" = true ]; then
8484
export MAKEFLAGS="-j$(sysctl -n hw.logicalcpu)"
8585
fi
8686

87+
# Expose target sysroot to CMake
88+
export TARGET_SYSROOT="${TARGET}"
89+
8790
# Optimise Rust code for binary size
8891
export CARGO_PROFILE_RELEASE_DEBUG=false
8992
export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
@@ -196,6 +199,8 @@ make install/strip
196199
mkdir ${DEPS}/jpeg
197200
$CURL https://github.com/mozilla/mozjpeg/archive/v${VERSION_MOZJPEG}.tar.gz | tar xzC ${DEPS}/jpeg --strip-components=1
198201
cd ${DEPS}/jpeg
202+
# [PATCH] BUILD: Silence CMake 3.28.x deprecation warning
203+
$CURL https://github.com/mozilla/mozjpeg/commit/1644bdb7d2fac66cd0ce25adef7754e008b5bc1e.patch | patch -p1
199204
cmake -G"Unix Makefiles" \
200205
-DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR:PATH=lib -DCMAKE_BUILD_TYPE=MinSizeRel \
201206
-DENABLE_STATIC=TRUE -DENABLE_SHARED=FALSE -DWITH_JPEG8=1 -DWITH_TURBOJPEG=FALSE -DPNG_SUPPORTED=FALSE

‎check-latest-versions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl"
4949
version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable"
5050
version_latest "spng" "$VERSION_SPNG" "randy408/libspng"
5151
version_latest "tiff" "$VERSION_TIFF" "1738"
52-
version_latest "vips" "$VERSION_VIPS" "5097"
52+
#version_latest "vips" "$VERSION_VIPS" "5097" # Temporarily disabled to allow version 8.17.2 to roll in
5353
version_latest "webp" "$VERSION_WEBP" "1761"
5454
version_latest "xml2" "$VERSION_XML2" "1783"
5555
version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592"

‎platforms/darwin-arm64v8/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ SET(CMAKE_CXX_COMPILER clang++)
44
# macOS 11 Big Sur is the first version to support ARM-based macs
55
SET(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
66

7+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
78
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
89
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
910
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
11+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/darwin-x64/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ SET(CMAKE_CXX_COMPILER clang++)
44
# Earliest supported version of macOS
55
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
66

7+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
78
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
89
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
910
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
11+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/linux-arm64v8/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
12
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
23
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
34
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
5+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/linux-armv6/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ SET(CMAKE_AR arm-rpi-linux-gnueabihf-ar)
88
SET(CMAKE_STRIP arm-rpi-linux-gnueabihf-strip)
99
SET(CMAKE_RANLIB arm-rpi-linux-gnueabihf-ranlib)
1010

11+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
1112
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1213
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1314
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
15+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/linux-ppc64le/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ SET(CMAKE_RANLIB powerpc64le-linux-gnu-gcc-ranlib)
1010

1111
#SET(CMAKE_CROSSCOMPILING_EMULATOR qemu-ppc64le-static)
1212

13+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
1314
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1415
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1516
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
17+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/linux-riscv64/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ SET(CMAKE_AR riscv64-linux-gnu-gcc-ar)
88
SET(CMAKE_STRIP riscv64-linux-gnu-gcc-strip)
99
SET(CMAKE_RANLIB riscv64-linux-gnu-gcc-ranlib)
1010

11+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
1112
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1213
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1314
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
15+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/linux-s390x/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ SET(CMAKE_RANLIB s390x-linux-gnu-gcc-ranlib)
1010

1111
#SET(CMAKE_CROSSCOMPILING_EMULATOR qemu-s390x-static)
1212

13+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
1314
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1415
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1516
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
17+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

‎platforms/linux-x64/Toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set(CMAKE_FIND_ROOT_PATH $ENV{TARGET_SYSROOT})
12
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
23
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
34
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
5+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

0 commit comments

Comments
 (0)