From 9cf0a28e0566142ce4f3ffe32f4e2b970f8e8f6e Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Mon, 10 Feb 2020 11:28:39 +0100 Subject: [PATCH] Update build.sh --- build.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.sh b/build.sh index 9dc4d45..01390ec 100644 --- a/build.sh +++ b/build.sh @@ -68,20 +68,20 @@ function build_aom { function build_svt { # HEVC - git clone https://github.com/OpenVisualCloud/SVT-HEVC.git $SRC/svt-hevc - cd $SRC/svt-hevc/Build - cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG - MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /property:TargetExt=.lib svt-hevc.sln - cp -r ../Source/API $BUILD/include/svt-hevc ; cp ../Bin/$MSBUILD_CONFIG/SvtHevcEnc.lib $BUILD/lib/ ; cp SvtHevcEnc.pc $BUILD/lib/pkgconfig/ - add_comp libsvthevc + #git clone https://github.com/OpenVisualCloud/SVT-HEVC.git $SRC/svt-hevc + #cd $SRC/svt-hevc/Build + #cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG + #MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /property:TargetExt=.lib svt-hevc.sln + #cp -r ../Source/API $BUILD/include/svt-hevc ; cp ../Bin/$MSBUILD_CONFIG/SvtHevcEnc.lib $BUILD/lib/ ; cp SvtHevcEnc.pc $BUILD/lib/pkgconfig/ + #add_comp libsvthevc # # AV1 - #git clone https://github.com/OpenVisualCloud/SVT-AV1.git $SRC/svt-av1 - #cd $SRC/svt-av1/Build - #cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG - #MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /property:TargetExt=.lib svt-av1.sln - #cp -r ../Source/API $BUILD/include/svt-av1 ; cp ../Bin/Release/$MSBUILD_CONFIG/SvtAv1Enc.lib $BUILD/lib/ ; cp SvtAv1Enc.pc $BUILD/lib/pkgconfig/ - #add_comp libsvtav1 + git clone https://github.com/OpenVisualCloud/SVT-AV1.git $SRC/svt-av1 + cd $SRC/svt-av1/Build + cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG + MSBuild.exe /maxcpucount:$NUMBER_OF_PROCESSORS /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /property:TargetExt=.lib svt-av1.sln + cp -r ../Source/API $BUILD/include/svt-av1 ; cp ../Bin/$MSBUILD_CONFIG/SvtAv1Enc.lib $BUILD/lib/ ; cp SvtAv1Enc.pc $BUILD/lib/pkgconfig/ + add_comp libsvtav1 # # VP9 #cd $SRC/svt-vp9/Build @@ -91,8 +91,8 @@ function build_svt { #sed -i 's/ -lpthread//g' $BUILD/lib/pkgconfig/SvtVp9Enc.pc #sed -i 's/ -lm//g' $BUILD/lib/pkgconfig/SvtVp9Enc.pc cd $SRC/ffmpeg - git am $SRC/svt-hevc/ffmpeg_plugin/0001*.patch - #git apply $SRC/svt-av1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch + #git am $SRC/svt-hevc/ffmpeg_plugin/0001*.patch + git apply $SRC/svt-av1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch } function build_ogg { @@ -239,7 +239,7 @@ git clone git://source.ffmpeg.org/ffmpeg.git $SRC/ffmpeg build_nvenc build_amf build_mfx -#build_svt +build_svt build_ogg build_vorbis build_snappy