Skip to content
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.

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

Update skia #3026

Merged
merged 10 commits into from
Oct 25, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Use a newer debian and newer tools
mattleibow committed Oct 24, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 49ce1c7e668b652a212218ac400cbf93071fe2c1
2 changes: 1 addition & 1 deletion externals/depot_tools
Submodule depot_tools updated from b808b1 to ecad42
2 changes: 1 addition & 1 deletion scripts/Docker/debian/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Arguments:
# DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ]

FROM amd64/debian:10
FROM amd64/debian:11

# Install the required packages
RUN apt-get update \
2 changes: 1 addition & 1 deletion scripts/Docker/debian/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Arguments:
# DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ]

FROM arm64v8/debian:10
FROM arm64v8/debian:11

# Install the required packages
RUN apt-get update \
6 changes: 3 additions & 3 deletions scripts/Docker/debian/clang-cross/Dockerfile
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
# FONTCONFIG_VERSION - the exact version of libfontconfig1 to use [ 2.13.1-2 | * ]

ARG IMAGE_ARCH=amd64
FROM ${IMAGE_ARCH}/debian:10
FROM ${IMAGE_ARCH}/debian:11

# Install the required packages
RUN apt-get update \
@@ -16,7 +16,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Install the cross-compilation GCC toolchain
ARG TOOLCHAIN_VERSION=8
ARG TOOLCHAIN_VERSION=9
ARG TOOLCHAIN_ARCH=arm-linux-gnueabihf
ARG TOOLCHAIN_ARCH_SHORT=armhf
RUN apt-get update \
@@ -32,7 +32,7 @@ RUN ln -s /usr/${TOOLCHAIN_ARCH}/include/c++/${TOOLCHAIN_VERSION} /usr/${TOOLCHA
&& sed -i "s/\/usr\/${TOOLCHAIN_ARCH}\/lib\///g" /usr/${TOOLCHAIN_ARCH}/lib/libc.so

# Install the cross-compilation skia build dependencies (fontconfig)
ARG FONTCONFIG_VERSION=2.13.1-2
ARG FONTCONFIG_VERSION=2.13.1-4.2
RUN (mkdir -p /skia-utils/libfontconfig1-dev \
&& cd /skia-utils/libfontconfig1-dev \
&& curl http://deb.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig1-dev.deb \