Update vpx to 1.9.0, switch back to tar.gz

aiortc · Aug 27, 2020 · 571c03f · 571c03f
1 parent aa24f87
commit 571c03f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,12 @@ jobs:
       - uses: actions/setup-python@v1
         with:
           python-version: 3.8
-      - name: Install yasm
+      - name: Install yasm (macos)
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew update
+          brew install yasm
+      - name: Install yasm (windows)
         if: matrix.os == 'windows-latest'
         run: curl -L -o 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\yasm.exe' http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe
       - name: Build codecs

diff --git a/scripts/build-codecs b/scripts/build-codecs
@@ -33,10 +33,10 @@ extract() {
 
 if [ "`uname`" = "Linux" ]; then
     outputdir=/output
-    outputfile=$outputdir/codecs-manylinux_$(uname -m).tar.bz2
+    outputfile=$outputdir/codecs-manylinux_$(uname -m).tar.gz
 elif [ "`uname`" = "Darwin" ]; then
     outputdir=`pwd`/output
-    outputfile=$outputdir/codecs-macosx_$(uname -m).tar.bz2
+    outputfile=$outputdir/codecs-macosx_$(uname -m).tar.gz
 else
     echo "Unknown platform"
     exit 1
@@ -49,7 +49,7 @@ if [ ! -e $outputfile ]; then
     cd $builddir
 
     # build vpx
-    extract vpx https://github.com/webmproject/libvpx/archive/v1.8.2.tar.gz
+    extract vpx https://github.com/webmproject/libvpx/archive/v1.9.0.tar.gz
     cd vpx
     ./configure --prefix=$destdir --disable-examples --disable-tools --disable-unit-tests --enable-pic
     make -j
@@ -64,5 +64,5 @@ if [ ! -e $outputfile ]; then
     make install
     cd ..
 
-    tar cjvf $outputfile -C $destdir include lib
+    tar czvf $outputfile -C $destdir include lib
 fi
diff --git a/scripts/build-codecs.bat b/scripts/build-codecs.bat
@@ -1,6 +1,6 @@
 set destdir=%1
 
-set outputfile=output\codecs-win%PYTHON_ARCH%.tar.bz2
+set outputfile=output\codecs-win%PYTHON_ARCH%.tar.gz
 if "%PYTHON_ARCH%" == "64" (
     set triplet=x64-windows-static
 ) else (
@@ -21,4 +21,4 @@ xcopy C:\vcpkg\installed\%triplet%\lib %destdir%\lib\ /E
 if not exist output (
     mkdir output
 )
-tar cjvf %outputfile% -C %destdir% include lib
+tar czvf %outputfile% -C %destdir% include lib