Skip to content

Commit 014bb4f

Browse files
committedJul 16, 2021
3.0.0
Fix bugs in `install-ffmpeg-4_0_6.sh`.
1 parent a59830a commit 014bb4f

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed
 

Diff for: ‎install-ffmpeg-4_0_6.sh

+4-10
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,30 @@ sudo make install || fail
6767
cd $SOURCE_PATH || fail
6868
git -C x264 pull 2> /dev/null || git clone --depth 1 https://code.videolan.org/videolan/x264.git
6969
cd x264 || fail
70-
git checkout ae03d92b || fail
7170
PATH="$BIN_PATH:$PATH" PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PATH" ./configure --prefix="$BUILD_PATH" --bindir="$BIN_PATH" --enable-shared --enable-static --enable-pic || fail
7271
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
7372
sudo make install || fail
7473

7574
# Install dependencies: libx265
7675
cd $SOURCE_PATH || fail
77-
git -C x265_git pull 2> /dev/null || git clone https://bitbucket.org/multicoreware/x265_git
78-
cd x265_git || fail
79-
git checkout 82786fc || fail
80-
cd build/linux || fail
76+
git -C x265_git pull 2> /dev/null || git clone --depth 1 -b 3.5 https://bitbucket.org/multicoreware/x265_git
77+
cd x265_git/build/linux || fail
8178
PATH="$BIN_PATH:$PATH" CXXFLAGS="$CXXFLAGS -fpermissive" cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$BUILD_PATH" -DENABLE_SHARED=on ../../source || fail
8279
PATH="$BIN_PATH:$PATH" CXXFLAGS="$CXXFLAGS -fpermissive" make -j$(nproc) || fail
8380
sudo make install || fail
8481
sudo cp $BUILD_PATH/bin/x265 $BIN_PATH || fail
8582

8683
# Install dependencies: libvpx
8784
cd $SOURCE_PATH || fail
88-
git -C libvpx pull 2> /dev/null || git clone --depth 1 https://chromium.googlesource.com/webm/libvpx.git
85+
git -C libvpx pull 2> /dev/null || git clone --depth 1 -b v1.10.0 https://chromium.googlesource.com/webm/libvpx.git
8986
cd libvpx || fail
90-
git checkout 76ad30b || fail
9187
PATH="$BIN_PATH:$PATH" ./configure --prefix="$BUILD_PATH" --enable-pic --enable-shared --disable-examples --disable-unit-tests --enable-vp9-highbitdepth --as=yasm || fail
9288
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
9389
sudo make install || fail
9490

9591
# Install dependencies: libfdk-aac
9692
cd $SOURCE_PATH || fail
97-
git -C fdk-aac pull 2> /dev/null || git clone --branch v0.1.6 --depth 1 https://github.com/mstorsjo/fdk-aac
93+
git -C fdk-aac pull 2> /dev/null || git clone --depth 1 --branch v0.1.6 https://github.com/mstorsjo/fdk-aac
9894
cd fdk-aac || fail
9995
autoreconf -fiv || fail
10096
./configure --prefix="$BUILD_PATH" --enable-shared || fail
@@ -113,7 +109,6 @@ sudo make install || fail
113109
cd $SOURCE_PATH || fail
114110
git -C opus pull 2> /dev/null || git clone --depth 1 https://github.com/xiph/opus.git
115111
cd opus || fail
116-
git checkout 6b6035a || fail
117112
./autogen.sh || fail
118113
./configure --prefix="$BUILD_PATH" --enable-shared || fail
119114
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
@@ -124,7 +119,6 @@ cd $SOURCE_PATH || fail
124119
git -C aom pull 2> /dev/null || git clone --depth 1 https://aomedia.googlesource.com/aom
125120
mkdir -p aom_build || fail
126121
cd aom || fail
127-
git checkout 94ab973 || fail
128122
cd ../aom_build || fail
129123
PATH="$BIN_PATH:$PATH" cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$BUILD_PATH" -DENABLE_SHARED=on -DCONFIG_PIC=1 -DENABLE_NASM=on ../aom || fail
130124
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail

0 commit comments

Comments
 (0)
Please sign in to comment.