Fix build fail.

ossrs · Nov 20, 2023 · c05f7b8 · c05f7b8
1 parent bec1682
commit c05f7b8
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ harfbuzz-8.3.0
 expat-2.5.0
 fontconfig-2.14.2
 libpng-1.6.40
-*.ttf
 *.srt
 *.txt
 ffmpeg-5.0.2

diff --git a/Dockerfile b/Dockerfile
@@ -21,9 +21,9 @@ RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM, TARGET
 WORKDIR /tmp/srs
 
 # See https://fonts.google.com/noto/specimen/Noto+Sans+TC
-ADD NotoSansTC-Regular.tar.bz2 /usr/local/share/fonts/
+ADD NotoSansTC-Regular.ttf /usr/local/share/fonts/
 # See https://fonts.google.com/specimen/Roboto
-ADD Roboto-Regular.tar.bz2 /usr/local/share/fonts/
+ADD Roboto-Regular.ttf /usr/local/share/fonts/
 
 # Copy all FFmpeg versions and cmake and other tools in /usr/local.
 COPY --from=build /usr/local /usr/local

diff --git a/Dockerfile.base3 b/Dockerfile.base3
@@ -94,3 +94,4 @@ RUN cd /tmp/fontconfig-2.14.2 && ./configure --disable-shared --enable-static &&
 # For libass, which depends on libfreetype6-dev, libfribidi-dev, libharfbuzz-dev, libfontconfig1-dev.
 ADD libass-0.17.1.tar.gz /tmp
 RUN cd /tmp/libass-0.17.1 && ./configure --disable-shared --enable-static && make -j${JOBS} && make install
+
diff --git a/NotoSansTC-Regular.tar.bz2 b/NotoSansTC-Regular.tar.bz2
diff --git a/NotoSansTC-Regular.ttf b/NotoSansTC-Regular.ttf
diff --git a/Roboto-Regular.tar.bz2 b/Roboto-Regular.tar.bz2
diff --git a/Roboto-Regular.ttf b/Roboto-Regular.ttf