Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c0bf064

Browse filesBrowse files
Reverting CMAKE to 3.22 to avoid build freeze
1 parent 5fb8f67 commit c0bf064
Copy full SHA for c0bf064

File tree

Expand file treeCollapse file tree

1 file changed

+4
-4
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-4
lines changed

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# LICENSE: https://github.com/markus-perl/ffmpeg-build-script/blob/master/LICENSE
55

66
PROGNAME=$(basename "$0")
7-
FFMPEG_VERSION=6.0
7+
FFMPEG_VERSION=6.1
88
SCRIPT_VERSION=1.48.rc.1
99
CWD=$(pwd)
1010
PACKAGES="$CWD/packages"
@@ -475,7 +475,7 @@ else
475475
fi
476476
fi
477477

478-
if build "cmake" "3.27.7"; then
478+
if build "cmake" "3.22.0"; then
479479
download "https://github.com/Kitware/CMake/releases/download/v$CURRENT_PACKAGE_VERSION/cmake-$CURRENT_PACKAGE_VERSION.tar.gz"
480480
execute ./configure --prefix="${WORKSPACE}" --parallel="${MJOBS}" -- -DCMAKE_USE_OPENSSL=OFF
481481
execute make -j $MJOBS
@@ -718,9 +718,9 @@ if build "av1" "7b5f665"; then
718718
cd "$PACKAGES"/aom_build || exit
719719
if $MACOS_M1; then
720720
if $SHARED_LIBRARIES; then
721-
execute cmake -DENABLE_TESTS=0 -DEBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCONFIG_RUNTIME_CPU_DETECT=0 "$PACKAGES"/av1
721+
execute cmake --trace-expand -DENABLE_TESTS=0 -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCONFIG_RUNTIME_CPU_DETECT=0 "$PACKAGES"/av1
722722
else
723-
execute cmake -DENABLE_TESTS=0 -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCONFIG_RUNTIME_CPU_DETECT=0 "$PACKAGES"/av1
723+
execute cmake --trace -DENABLE_TESTS=0 -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCONFIG_RUNTIME_CPU_DETECT=0 "$PACKAGES"/av1
724724
fi
725725
else
726726
if $SHARED_LIBRARIES; then

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.