Browse Source

update script

gemer 4 years ago
parent
commit
a7f13b3fdd
3 changed files with 7 additions and 6 deletions
  1. 1 1
      Vagrantfile
  2. 4 4
      install-4dage
  3. 2 1
      install-ffmpeg

+ 1 - 1
Vagrantfile

@@ -11,5 +11,5 @@ Vagrant.configure("2") do |config|
   #   config.proxy.https    = "http://$vagrant_host:7890/"
   #   config.proxy.no_proxy = "localhost,127.0.0.1,.example.com"
   # end
-  config.vm.provision "shell", path: "vagrant-installer.sh"
+  # config.vm.provision "shell", path: "vagrant-installer.sh"
 end

+ 4 - 4
install-4dage

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-mkdir -p /usr/share/4dage-ffmpeg
+sudo mkdir -p /usr/share/4dage-ffmpeg
 if [ -d '/usr/bin/4dage-ffmpeg' ]; then
     sudo rm /usr/bin/4dage-ffmpeg
 fi
-cat <(curl -s http://192.168.0.115:3000/zhangyupeng/4dage-ffmpeg/raw/master/4dage-ffmpeg) >/usr/share/4dage-ffmpeg/4dage-ffmpeg
-chmod a+x /usr/share/4dage-ffmpeg/4dage-ffmpeg
-ln -s -f /usr/share/4dage-ffmpeg/4dage-ffmpeg /usr/bin/4dage-ffmpeg
+sudo cat <(curl -s http://192.168.0.115:3000/zhangyupeng/4dage-ffmpeg/raw/master/4dage-ffmpeg) >/usr/share/4dage-ffmpeg/4dage-ffmpeg
+sudo chmod a+x /usr/share/4dage-ffmpeg/4dage-ffmpeg
+sudo ln -s -f /usr/share/4dage-ffmpeg/4dage-ffmpeg /usr/bin/4dage-ffmpeg

+ 2 - 1
install-ffmpeg

@@ -493,7 +493,8 @@ fi
 CONFIGURE_OPTIONS+=("--enable-libvidstab")
 
 if build "av1"; then
-  download "https://aomedia.googlesource.com/aom/+archive/b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz" "av1.tar.gz" "av1"
+  # download "https://aomedia.googlesource.com/aom/+archive/b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz" "av1.tar.gz" "av1"
+  download "https://www.andrews-corner.org/downloads/aom-b52ee6d44adaef8a08f6984390de050d64df9faa.tar.gz" "av1.tar.gz" "av1"
   make_dir "$PACKAGES"/aom_build
   cd "$PACKAGES"/aom_build || exit
   if $MACOS_M1; then