gluckzhang
diff --git a/‎build-ffmpeg
Copy file name to clipboardExpand all lines: build-ffmpeg
+24-9Lines changed: 24 additions & 9 deletions b/‎build-ffmpeg
Copy file name to clipboardExpand all lines: build-ffmpeg
+24-9Lines changed: 24 additions & 9 deletions
@@ -180,18 +180,24 @@ if build "opencore"; then
 fi
 
 if build "libvpx"; then
-    download "https://github.com/webmproject/libvpx/archive/v1.5.0.tar.gz" "libvpx-1.5.0.tar.gz"
+    download "https://github.com/webmproject/libvpx/archive/v1.7.0.tar.gz" "libvpx-1.7.0.tar.gz"
     cd $PACKAGES/libvpx* || exit
-	sed   -e 's/cp -p/cp/' -i build/make/Makefile
+    
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        echo "Applying Darwin patch"
+        sed "s/,--version-script//g" build/make/Makefile > build/make/Makefile.patched
+        sed "s/-Wl,--no-undefined -Wl,-soname/-Wl,-undefined,error -Wl,-install_name/g" build/make/Makefile.patched > build/make/Makefile
+    fi
+    
 	execute ./configure --prefix=${WORKSPACE} --disable-unit-tests --disable-shared
 	execute make -j $MJOBS
 	execute make install
 	build_done "libvpx"
 fi
 
 if build "lame"; then
-	download "http://kent.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz" "lame-3.99.5.tar.gz" 
-	cd $PACKAGES/lame-3.99.5 || exit
+	download "http://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz" "lame-3.100.tar.gz"
+	cd $PACKAGES/lame-3.100 || exit
 	execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
 	execute make -j $MJOBS
 	execute make install
@@ -213,19 +219,28 @@ if build "xvidcore"; then
 	build_done "xvidcore"
 fi
 
+if build "nasm"; then
+	download "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz" "nasm.tar.gz"
+	cd $PACKAGES/nasm* || exit
+	execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
+	execute make -j $MJOBS
+	execute make install
+	build_done "nasm"
+fi
+
 if build "x264"; then
 	download "ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20170328-2245.tar.bz2" "last_x264.tar.bz2"
 	cd $PACKAGES/x264-snapshot-* || exit
-	execute ./configure --prefix=${WORKSPACE} --disable-asm --enable-static
+	execute ./configure --prefix=${WORKSPACE} --enable-static
 	execute make -j $MJOBS
 	execute make install
 	execute make install-lib-static
 	build_done "x264"
 fi
 
 if build "libogg"; then
-	download "http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz" "libogg-1.3.2.tar.gz"
-	cd $PACKAGES/libogg-1.3.2 || exit
+	download "http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.gz" "libogg-1.3.3.tar.gz"
+	cd $PACKAGES/libogg-1.3.3 || exit
 	execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
 	execute make -j $MJOBS
 	execute make install
@@ -284,7 +299,7 @@ if build "vid_stab"; then
 fi
 
 if build "x265"; then
-	download "https://bitbucket.org/multicoreware/x265/downloads/x265_2.3.tar.gz" "x265-2.3tar.gz"
+	download "https://bitbucket.org/multicoreware/x265/downloads/x265_2.6.tar.gz" "x265-2.6.tar.gz"
 	cd $PACKAGES/x265_* || exit
 	cd source || exit
 	execute cmake -DCMAKE_INSTALL_PREFIX:PATH=${WORKSPACE} -DENABLE_SHARED:bool=off . 
@@ -306,7 +321,7 @@ fi
 
 
 build "ffmpeg"
-download "http://ffmpeg.org/releases/ffmpeg-2.8.13.tar.bz2" "ffmpeg-snapshot.tar.bz2"
+download "http://ffmpeg.org/releases/ffmpeg-3.4.1.tar.bz2" "ffmpeg-snapshot.tar.bz2"
 cd $PACKAGES/ffmpeg* || exit
 CFLAGS="-I$WORKSPACE/include" LDFLAGS="-L$WORKSPACE/lib" 
 execute ./configure  --arch=64 --prefix=${WORKSPACE} --extra-cflags="-I$WORKSPACE/include" --extra-ldflags="-L$WORKSPACE/lib" \