Skip to content

Commit aa94643

Browse files
committed
ci: fix typo
1 parent f1d4474 commit aa94643

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/actions/deploy-ubuntu/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ runs:
121121
# $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776
122122
$SUDO apt-get update
123123
$SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH
124-
$SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev libva-drm
124+
$SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev libva-dev
125125
126126
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
127127
echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV

ffmpeg/cppbuild.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ download https://github.com/webmproject/libwebp/archive/refs/tags/v$WEBP_VERSION
7171
download https://storage.googleapis.com/aom-releases/libaom-$AOMAV1_VERSION.tar.gz aom-$AOMAV1_VERSION.tar.gz
7272
download https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$SVTAV1_VERSION/SVT-AV1-v$SVTAV1_VERSION.tar.gz SVT-AV1-$SVTAV1_VERSION.tar.gz
7373
download https://github.com/sekrit-twc/zimg/archive/refs/tags/release-$ZIMG_VERSION.tar.gz zimg-release-$ZIMG_VERSION.tar.gz
74-
download https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 ffmpeg-$FFMPEG_VERSION.tar.bz2
74+
#download https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 ffmpeg-$FFMPEG_VERSION.tar.bz2
7575

7676
mkdir -p $PLATFORM$EXTENSION
7777
cd $PLATFORM$EXTENSION
@@ -98,7 +98,7 @@ tar --totals -xzf ../libwebp-$WEBP_VERSION.tar.gz
9898
tar --totals -xzf ../aom-$AOMAV1_VERSION.tar.gz
9999
tar --totals -xzf ../SVT-AV1-$SVTAV1_VERSION.tar.gz
100100
tar --totals -xzf ../zimg-release-$ZIMG_VERSION.tar.gz
101-
tar --totals -xjf ../ffmpeg-$FFMPEG_VERSION.tar.bz2
101+
#tar --totals -xjf ../ffmpeg-$FFMPEG_VERSION.tar.bz2
102102

103103
if [[ "${ACLOCAL_PATH:-}" == C:\\msys64\\* ]]; then
104104
export ACLOCAL_PATH=/mingw64/share/aclocal:/usr/share/aclocal
@@ -117,8 +117,8 @@ export PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig/
117117

118118
patch -Np1 -d $LAME < ../../lame.patch
119119
patch -Np1 -d $OPENSSL < ../../openssl-android.patch
120-
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg.patch
121-
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg-vulkan.patch
120+
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg.patch || true
121+
patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg-vulkan.patch || true
122122
# patch -Np1 -d ffmpeg-$FFMPEG_VERSION < ../../ffmpeg-flv-support-hevc-opus.patch
123123
sedinplace 's/bool bEnableavx512/bool bEnableavx512 = false/g' x265-*/source/common/param.h
124124
sedinplace 's/detect512()/false/g' x265-*/source/common/quant.cpp

0 commit comments

Comments
 (0)