vlc | branch: master | Rafaël Carré <[email protected]> | Sun Jan 29 05:09:51 2012 -0500| [0c7696c1dd4bbae4edab5622e53e5605734cb169] | committer: Rafaël Carré
contrib: libvpx 1.0 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c7696c1dd4bbae4edab5622e53e5605734cb169 --- contrib/src/vpx/SHA512SUMS | 2 +- contrib/src/vpx/libvpx-darwin10.patch | 10 ------- contrib/src/vpx/libvpx-no-cross.patch | 32 +++--------------------- contrib/src/vpx/libvpx-win64.patch | 43 --------------------------------- contrib/src/vpx/rules.mak | 4 +-- 5 files changed, 6 insertions(+), 85 deletions(-) diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS index 4419593..e2093df 100644 --- a/contrib/src/vpx/SHA512SUMS +++ b/contrib/src/vpx/SHA512SUMS @@ -1 +1 @@ -2c1e812ec6b4fd5e33ae107b3c2f68c368a4c0f5920a882caf45ce7762e0ac68064884f862b20ad452a0d362480496b710f06ab0700daa7e5c6addfaac33d518 libvpx-v0.9.7-p1.tar.bz2 +a54f594fd37f96a693b5377236cad0834581f189fbb8d55c7e3418cd72e217e0eda34b07c14744c7c0d34c0d5c8a19c7ca402146855d7163e3578b5fd2b075cc libvpx-v1.0.0.tar.bz2 diff --git a/contrib/src/vpx/libvpx-darwin10.patch b/contrib/src/vpx/libvpx-darwin10.patch deleted file mode 100644 index 1776187..0000000 --- a/contrib/src/vpx/libvpx-darwin10.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libvpx/configure.orig 2011-08-15 17:02:45.000000000 -0400 -+++ libvpx/configure 2011-11-20 21:29:52.241612178 -0500 -@@ -107,6 +107,7 @@ - all_platforms="${all_platforms} x86-darwin8-icc" - all_platforms="${all_platforms} x86-darwin9-gcc" - all_platforms="${all_platforms} x86-darwin9-icc" -+all_platforms="${all_platforms} x86-darwin10-gcc" - all_platforms="${all_platforms} x86-linux-gcc" - all_platforms="${all_platforms} x86-linux-icc" - all_platforms="${all_platforms} x86-solaris-gcc" diff --git a/contrib/src/vpx/libvpx-no-cross.patch b/contrib/src/vpx/libvpx-no-cross.patch index 7644460..e261dc7 100644 --- a/contrib/src/vpx/libvpx-no-cross.patch +++ b/contrib/src/vpx/libvpx-no-cross.patch @@ -1,34 +1,10 @@ -diff -Nru libvpx.orig/build/make/configure.sh libvpx/build/make/configure.sh ---- libvpx.orig/build/make/configure.sh 2011-07-04 19:18:07.000000000 +0300 -+++ libvpx/build/make/configure.sh 2011-07-04 19:19:08.000000000 +0300 -@@ -648,14 +648,6 @@ +--- libvpx-v1.0.0/build/make/configure.sh.orig 2012-01-29 04:59:36.976441000 -0500 ++++ libvpx-v1.0.0/build/make/configure.sh 2012-01-29 04:59:46.684441001 -0500 +@@ -680,7 +680,6 @@ case ${tgt_cc} in gcc) -- if enabled iwmmxt || enabled iwmmxt2 -- then -- CROSS=${CROSS:-arm-iwmmxt-linux-gnueabi-} -- elif enabled symbian; then -- CROSS=${CROSS:-arm-none-symbianelf-} -- else -- CROSS=${CROSS:-arm-none-linux-gnueabi-} -- fi +- CROSS=${CROSS:-arm-none-linux-gnueabi-} link_with_cc=gcc setup_gnu_toolchain arch_int=${tgt_isa##armv} -@@ -806,7 +798,6 @@ - esac - ;; - mips*) -- CROSS=${CROSS:-mipsel-linux-uclibc-} - link_with_cc=gcc - setup_gnu_toolchain - tune_cflags="-mtune=" -@@ -855,7 +846,6 @@ - solaris*) - CC=${CC:-${CROSS}gcc} - LD=${LD:-${CROSS}gcc} -- CROSS=${CROSS:-g} - ;; - esac - diff --git a/contrib/src/vpx/libvpx-win64.patch b/contrib/src/vpx/libvpx-win64.patch deleted file mode 100644 index 8a6d0dd..0000000 --- a/contrib/src/vpx/libvpx-win64.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ru libvpx.orig/configure libvpx/configure ---- libvpx.orig/configure 2011-07-04 19:54:18.000000000 +0300 -+++ libvpx/configure 2011-07-04 19:56:19.000000000 +0300 -@@ -117,6 +117,7 @@ - all_platforms="${all_platforms} x86_64-linux-gcc" - all_platforms="${all_platforms} x86_64-linux-icc" - all_platforms="${all_platforms} x86_64-solaris-gcc" -+all_platforms="${all_platforms} x86_64-win64-gcc" - all_platforms="${all_platforms} x86_64-win64-vs8" - all_platforms="${all_platforms} x86_64-win64-vs9" - all_platforms="${all_platforms} universal-darwin8-gcc" -diff --git a/build/make/configure.sh b/build/make/configure.sh -From 75340193f720eceea5f52b00fcda83aef651b6e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <[email protected]> -Date: Mon, 7 Nov 2011 19:45:34 -0500 -Subject: [PATCH] win64: use -f x64 in asflags instead of -f win64 - -Change-Id: Id1be1a91c7f0fd286c403489ff447837029ba17f ---- - build/make/configure.sh | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -index 1bb50af..1279f78 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -901,8 +901,12 @@ process_common_toolchain() { - [ "${AS##*/}" = nasm ] && add_asflags -Ox - AS_SFX=.asm - case ${tgt_os} in -- win*) -- add_asflags -f win${bits} -+ win32) -+ add_asflags -f win32 -+ enabled debug && add_asflags -g cv8 -+ ;; -+ win64) -+ add_asflags -f x64 - enabled debug && add_asflags -g cv8 - ;; - linux*|solaris*) --- -1.7.5.4 - diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index 3f2fb0a..68b7998 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -1,6 +1,6 @@ # libvpx -VPX_VERSION := v0.9.7-p1 +VPX_VERSION := v1.0.0 VPX_URL := http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2 $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2: @@ -18,8 +18,6 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx $(UNPACK) $(APPLY) $(SRC)/vpx/libvpx-no-cross.patch $(APPLY) $(SRC)/vpx/libvpx-no-abi.patch - $(APPLY) $(SRC)/vpx/libvpx-win64.patch - $(APPLY) $(SRC)/vpx/libvpx-darwin10.patch $(PATCH_BASH_LOCATION) $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
