Skip to content

Commit ddbb759

Browse files
committed
3.1.0
1. Fix the bug of yasm in install-ffmpeg-4_4.sh 2. Drop the support for libwebp in install-ffmpeg-4_4.sh
1 parent b254e9c commit ddbb759

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

install-ffmpeg-4_4.sh

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ sudo make install || fail
8181
# Install dependencies: YASM
8282
msg "Install yasm 1.3.0."
8383
cd $SOURCE_PATH || fail
84-
wget -O- https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz | tar xz -C . || fail
85-
cd yasm-1.3.0 || fail
84+
git -C yasm pull 2> /dev/null || git clone -b v1.3.0 --single-branch --depth 1 https://github.com/yasm/yasm.git
85+
cd yasm || fail
86+
./autogen.sh || fail
8687
PATH="$BIN_PATH:$PATH" ./configure --prefix=$BUILD_PATH --bindir=$BIN_PATH || fail
8788
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
8889
sudo make install || fail
@@ -111,16 +112,6 @@ sudo cp $BUILD_PATH/bin/opj_decompress $BIN_PATH || fail
111112
sudo cp $BUILD_PATH/bin/opj_compress $BIN_PATH || fail
112113
sudo cp $BUILD_PATH/bin/opj_dump $BIN_PATH || fail
113114

114-
# Install dependencies: libwebp
115-
msg "Install libwebp 1.2.0."
116-
cd $SOURCE_PATH || fail
117-
git -C libwebp pull 2> /dev/null || git clone -b v1.2.0 --single-branch --depth 1 https://github.com/webmproject/libwebp.git
118-
mkdir -p libwebp/build || fail
119-
cd libwebp/build || fail
120-
PATH="$BIN_PATH:$PATH" cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DWEBP_BUILD_CWEBP=ON -DWEBP_BUILD_DWEBP=ON -DCMAKE_INSTALL_PREFIX="$BUILD_PATH" -DCMAKE_INSTALL_BINDIR="$BIN_PATH" .. || fail
121-
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
122-
sudo make install || fail
123-
124115
# Install dependencies: libxvid
125116
msg "Install xvidcore 1.3.7."
126117
cd $SOURCE_PATH || fail
@@ -286,6 +277,7 @@ PATH="$BIN_PATH:$PATH" PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PA
286277
--bindir="$BIN_PATH" \
287278
--enable-gpl \
288279
--enable-gnutls \
280+
--enable-version3 \
289281
--enable-cuda \
290282
--enable-cuda-nvcc \
291283
--enable-nvenc \
@@ -294,7 +286,6 @@ PATH="$BIN_PATH:$PATH" PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PA
294286
--enable-libssh \
295287
--enable-libsrt \
296288
--enable-libopenjpeg \
297-
--enable-libwebp \
298289
--enable-libaom \
299290
--enable-libass \
300291
--enable-libfdk-aac \

0 commit comments

Comments
 (0)