[vlc-devel] contribs: libvpx: fix win64 (use correct asm symbols)

[Rafaël Carré]

Le Mon,  7 Nov 2011 02:49:46 +0100 (CET),
git at videolan.org (Rafaël Carré) a écrit :

> vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov  6 20:48:22 2011 -0500| [b10704cfa4e99e5770644ae2438d825bc37de40d] | committer: Rafaël Carré
> 
> contribs: libvpx: fix win64 (use correct asm symbols)
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b10704cfa4e99e5770644ae2438d825bc37de40d
> ---
> 
>  contrib/src/vpx/libvpx-win64.patch |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/contrib/src/vpx/libvpx-win64.patch b/contrib/src/vpx/libvpx-win64.patch
> index 1f0d07c..1c9ae1d 100644
> --- a/contrib/src/vpx/libvpx-win64.patch
> +++ b/contrib/src/vpx/libvpx-win64.patch
> @@ -9,3 +9,14 @@ diff -ru libvpx.orig/configure libvpx/configure
>   all_platforms="${all_platforms} x86_64-win64-vs8"
>   all_platforms="${all_platforms} x86_64-win64-vs9"
>   all_platforms="${all_platforms} universal-darwin8-gcc"
> +--- libvpx/vpx_ports/x86_abi_support.asm.orig	2011-11-06 20:40:14.131254698 -0500
> ++++ libvpx/vpx_ports/x86_abi_support.asm	2011-11-06 20:40:16.975268804 -0500
> +@@ -88,6 +88,8 @@
> + %define sym(x) x
> + %elifidn __OUTPUT_FORMAT__,x64
> + %define sym(x) x
> ++%elifidn __OUTPUT_FORMAT__,win64
> ++%define sym(x) x
> + %else
> + %define sym(x) _ %+ x
> + %endif

A different fix was merged in upstream master, to force x64 output
format.

So in future release this patch will still apply but we will be able to
remove it.

The other part of the patch can be removed if we use --force-target ,
they say they'll merge it when libvpx is confirmed to run (encoding to
VP8 crashes VLC)

-- 
Rafaël Carré