From 9eac49cd881aad218e6914b9bdf2d7b35e0c4b0d Mon Sep 17 00:00:00 2001
From: Daniel Stankewitz <daniel.stankewitz@gmail.com>
Date: Thu, 23 Apr 2020 07:44:20 +0200
Subject: [PATCH] Update build.sh

---
 build.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/build.sh b/build.sh
index f47c835..589cf5e 100644
--- a/build.sh
+++ b/build.sh
@@ -68,12 +68,12 @@ 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
@@ -84,15 +84,19 @@ function build_svt {
   add_comp libsvtav1
   #
   # VP9
-  #cd $SRC/svt-vp9/Build
-  #cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG
-  #MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /property:TargetExt=".lib" svt-vp9.sln
-  #cp -r ../Source/API $BUILD/include/svt-vp9 ; cp ../Bin/$MSBUILD_CONFIG/SvtVp9Enc.lib $BUILD/lib/ ; cp SvtVp9Enc.pc $BUILD/lib/pkgconfig/
-  #sed -i 's/ -lpthread//g' $BUILD/lib/pkgconfig/SvtVp9Enc.pc
-  #sed -i 's/ -lm//g' $BUILD/lib/pkgconfig/SvtVp9Enc.pc
+  cd $SRC/svt-vp9/Build
+  cmake .. -G"Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=$BUILD -DCMAKE_CONFIGURATION_TYPES=$MSBUILD_CONFIG
+  MSBuild.exe /maxcpucount:$CPU_CORES /property:Configuration=$MSBUILD_CONFIG /property:ConfigurationType=StaticLibrary /property:TargetExt=".lib" svt-vp9.sln
+  cp -r ../Source/API $BUILD/include/svt-vp9 ; cp ../Bin/$MSBUILD_CONFIG/SvtVp9Enc.lib $BUILD/lib/ ; cp SvtVp9Enc.pc $BUILD/lib/pkgconfig/
+  sed -i 's/ -lpthread//g' $BUILD/lib/pkgconfig/SvtVp9Enc.pc
+  sed -i 's/ -lm//g' $BUILD/lib/pkgconfig/SvtVp9Enc.pc
+  add_comp libsvtvp9
   cd $SRC/ffmpeg
+  git apply $SRC/svt-hevc/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+  git apply $SRC/svt-hevc/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+  git apply $SRC/svt-hevc/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-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
+  #git apply $SRC/svt-av1/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
 }
 
 function build_ogg {