update to vpx-1.5.0

x42 · Nov 22, 2015 · 461eaa3 · 461eaa3
1 parent de2cdbb
commit 461eaa3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/x-osx-buildstack.sh b/x-osx-buildstack.sh
@@ -204,10 +204,10 @@ autoconfbuild
 #
 
 ################################################################################
-src libvpx-v1.3.0 tar.bz2 https://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2
+src libvpx-v1.5.0 tar.bz2 http://downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2
 
 function buildvpx {
-cd ${BUILDD}/libvpx-v1.3.0
+cd ${BUILDD}/libvpx-v1.5.0
 ./configure --prefix=$PREFIX --target=$1
 make clean
 make $MAKEFLAGS && make install
@@ -236,7 +236,7 @@ cd ${BUILDD}/ffmpeg-${FFVERSION}/
 
 ./configure --prefix=${PREFIX} \
 	--enable-libvpx \
-	--enable-shared --enable-gpl --disable-static --disable-debug \
+	--enable-shared --enable-gpl --disable-static --disable-debug --disable-doc \
 	--disable-programs --disable-iconv \
 	--arch=x86_32 --target-os=darwin --cpu=i686 --enable-cross-compile \
 	--extra-cflags="-arch i386 ${OSXCOMPAT}  -I${PREFIX}/include" \
@@ -251,7 +251,7 @@ buildvpx x86_64-darwin9-gcc
 cd ${BUILDD}/ffmpeg-${FFVERSION}/
 ./configure --prefix=${PREFIX} \
 	--enable-libvpx \
-	--enable-shared --enable-gpl --disable-static --disable-debug \
+	--enable-shared --enable-gpl --disable-static --disable-debug --disable-doc \
 	--disable-programs --disable-iconv \
 	--arch=x86_64 \
 	--extra-cflags="-arch x86_64 ${OSXCOMPAT}  -I${PREFIX}/include" \
@@ -265,7 +265,7 @@ buildvpx ppc32-darwin9-gcc
 cd ${BUILDD}/ffmpeg-${FFVERSION}/
 ./configure --prefix=${PREFIX} \
 	--enable-libvpx \
-	--enable-shared --enable-gpl --disable-static --disable-debug \
+	--enable-shared --enable-gpl --disable-static --disable-debug --disable-doc \
 	--disable-programs --disable-iconv \
 	--arch=ppc \
 	--extra-cflags="-arch ppc ${OSXCOMPAT}  -I${PREFIX}/include" \

diff --git a/x-win-bundle.sh b/x-win-bundle.sh
@@ -34,7 +34,11 @@ make -C src/xjadeo xjadeo.exe
 cp -v src/xjadeo/xjadeo.exe "$NSIDIR"
 cp -v src/xjadeo/icons/xjadeo_win.ico "$NSIDIR"/xjadeo.ico
 
-cp -v $WINLIB/*.dll "$NSIDIR"
+ffdlls="avcodec- avformat- avutil- libfreetype- libiconv- liblo- libltc- libportmidi- libporttime- pthreadGC2 swscale- swresample- zlib1"
+for fname in $ffdlls; do
+	cp -v ${WINPREFIX}/bin/${fname}*.dll $NSIDIR
+done
+
 cp -v src/xjadeo/fonts/ArdourMono.ttf "$NSIDIR"
 
 GITVERSION=$(git describe --tags HEAD)

diff --git a/x-win-pbuild.sh b/x-win-pbuild.sh
@@ -192,9 +192,9 @@ autoreconf -i
 autoconfbuild
 
 ################################################################################
-download libvpx-v1.3.0.tar.bz2 https://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2
+download libvpx-v1.5.0.tar.bz2 https://webm.googlecode.com/files/libvpx-v1.5.0.tar.bz2
 cd ${BUILDD}
-tar xjf ${SRCDIR}/libvpx-v1.3.0.tar.bz2
+tar xjf ${SRCDIR}/libvpx-v1.5.0.tar.bz2
 cd libvpx-v1.3.0
 ed vpx/src/svc_encodeframe.c << EOF
 %s/MINGW_HAS_SECURE_API/MINGW_HAS_SECURE_APIXXX/