Skip to content

Commit c5434ee

Browse files
authored
Use referenced commit for x264 to test in CI/CD
branched from "apple_silicon" branch.
1 parent 64a2c0e commit c5434ee

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

build-ffmpeg

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -399,14 +399,12 @@ fi
399399
##
400400

401401
if build "x264"; then
402-
download "https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2"
402+
download "https://code.videolan.org/videolan/x264/-/archive/0d754ec36013fee82978496cd56fbd48824910b3/x264-0d754ec36013fee82978496cd56fbd48824910b3.tar.gz" "x264-0d754ec.tar.gz"
403+
cd "${PACKAGES}"/x264-0d754ec
404+
403405

404406
if [[ "$OSTYPE" == "linux-gnu" ]]; then
405407
execute ./configure --prefix="${WORKSPACE}" --enable-static --enable-pic CXXFLAGS="-fPIC"
406-
elif $MACOS_M1 ; then
407-
## Get latest code to support arm64
408-
download "https://code.videolan.org/videolan/x264/-/archive/0d754ec36013fee82978496cd56fbd48824910b3/x264-0d754ec36013fee82978496cd56fbd48824910b3.tar.gz" "x264-0d754ec.tar.gz"
409-
cd "${PACKAGES}"/x264-0d754ec
410408
else
411409
execute ./configure --prefix="${WORKSPACE}" --enable-static --enable-pic
412410
fi
@@ -477,10 +475,10 @@ if build "vid_stab"; then
477475

478476
if $MACOS_M1 ; then
479477

480-
curl -s -o "$PACKAGES/vid.stab-1.1.0/fix_cmake_quoting.patch" https://raw.githubusercontent.com/Homebrew/formula-patches/5bf1a0e0cfe666ee410305cece9c9c755641bfdf/libvidstab/fix_cmake_quoting.patch
478+
curl -s -o "$PACKAGES/vid.stab-1.1.0/fix_cmake_quoting.patch" https://raw.githubusercontent.com/Homebrew/formula-patches/5bf1a0e0cfe666ee410305cece9c9c755641bfdf/libvidstab/fix_cmake_quoting.patch
481479
patch -p1 < fix_cmake_quoting.patch
482480
fi
483-
## rich
481+
484482
execute cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DUSE_OMP=OFF -DENABLE_SHARED=off .
485483
execute make
486484
execute make install

0 commit comments

Comments
 (0)