[vlc-devel] [PATCH] contrib: update libvpx to 1.8.2

[Thomas Guillem]

It breaks android build, I force reverted it in the meantimes.

I will work on it now.

On Wed, Jan 22, 2020, at 11:22, Thomas Guillem wrote:
> I think we should also backport it to VLC 3.0
> 
> On Wed, Jan 22, 2020, at 11:10, Thomas Guillem wrote:
> > LGTM,
> > 
> > On Wed, Jan 22, 2020, at 00:06, Tristan Matthews wrote:
> > > ---
> > >  contrib/src/vpx/SHA512SUMS       |  2 +-
> > >  contrib/src/vpx/libvpx-ios.patch | 46 +++++++++++++-------------------
> > >  contrib/src/vpx/rules.mak        |  2 +-
> > >  3 files changed, 20 insertions(+), 30 deletions(-)
> > > 
> > > diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
> > > index 4837909c27..d9ee76c002 100644
> > > --- a/contrib/src/vpx/SHA512SUMS
> > > +++ b/contrib/src/vpx/SHA512SUMS
> > > @@ -1 +1 @@
> > > -77477ec7059de1d90f048c10783b4adce463a84c9c828f125686e533f5bc8c9eeab8a1747df5c928e0869ccf855a9af5608199c8c376a75d35659f719ee870ef  libvpx-1.8.0.tar.gz
> > > +da2ab0775a28ddd78654bbe46886e833d4ef7ba91867fc1427dceced735b6177eff06b24f204c075c50c3a5cadc5be6a1fb213c44df189218a543b52554f3a38  libvpx-1.8.2.tar.gz
> > > diff --git a/contrib/src/vpx/libvpx-ios.patch 
> > > b/contrib/src/vpx/libvpx-ios.patch
> > > index 299fe5b05a..06a28d9293 100644
> > > --- a/contrib/src/vpx/libvpx-ios.patch
> > > +++ b/contrib/src/vpx/libvpx-ios.patch
> > > @@ -1,6 +1,6 @@
> > > ---- libvpx/build/make/configure.sh.orig	2019-05-08 15:33:05.038238914 
> > > -0400
> > > -+++ libvpx/build/make/configure.sh	2019-05-08 15:34:46.909711375 -0400
> > > -@@ -863,88 +863,6 @@
> > > +--- libvpx/build/make/configure.sh.orig	2020-01-21 18:01:06.103409182 
> > > -0500
> > > ++++ libvpx/build/make/configure.sh	2020-01-21 18:01:33.395259084 -0500
> > > +@@ -832,92 +832,6 @@
> > >     # PIC is probably what we want when building shared libs
> > >     enabled shared && soft_enable pic
> > >   
> > > @@ -75,6 +75,10 @@
> > >  -      add_cflags  "-mmacosx-version-min=10.13"
> > >  -      add_ldflags "-mmacosx-version-min=10.13"
> > >  -      ;;
> > > +-    *-darwin18-*)
> > > +-      add_cflags  "-mmacosx-version-min=10.14"
> > > +-      add_ldflags "-mmacosx-version-min=10.14"
> > > +-      ;;
> > >  -    *-iphonesimulator-*)
> > >  -      add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
> > >  -      add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
> > > @@ -89,30 +93,16 @@
> > >     # Handle Solaris variants. Solaris 10 needs -lposix4
> > >     case ${toolchain} in
> > >       sparc-solaris-*)
> > > -@@ -1177,12 +1095,6 @@
> > > -             add_cflags -isysroot ${alt_libc}
> > > -           fi
> > > +@@ -1106,12 +1020,6 @@
> > > +               add_cflags -isysroot ${alt_libc}
> > > +             fi
> > >   
> > > --          if [ "${LD}" = "${CXX}" ]; then
> > > --            add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"
> > > --          else
> > > --            add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
> > > --          fi
> > > +-            if [ "${LD}" = "${CXX}" ]; then
> > > +-              add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"
> > > +-            else
> > > +-              add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
> > > +-            fi
> > >  -
> > > -           for d in lib usr/lib usr/lib/system; do
> > > -             try_dir="${alt_libc}/${d}"
> > > -             [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
> > > -@@ -1372,6 +1284,13 @@
> > > -       case ${tgt_cc} in
> > > -         gcc*)
> > > -           add_cflags -m${bits}
> > > -+          case ${tgt_os} in
> > > -+              darwin*)
> > > -+              ;;
> > > -+              *)
> > > -+              add_ldflags -m${bits}
> > > -+              ;;
> > > -+          esac
> > > -           add_ldflags -m${bits}
> > > -           ;;
> > > -       esac
> > > +             for d in lib usr/lib usr/lib/system; do
> > > +               try_dir="${alt_libc}/${d}"
> > > +               [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
> > > diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
> > > index 630f4abdf2..a8cfd66a7b 100644
> > > --- a/contrib/src/vpx/rules.mak
> > > +++ b/contrib/src/vpx/rules.mak
> > > @@ -1,6 +1,6 @@
> > >  # libvpx
> > >  
> > > -VPX_VERSION := 1.8.0
> > > +VPX_VERSION := 1.8.2
> > >  VPX_URL := http://github.com/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
> > >  
> > >  PKGS += vpx
> > > -- 
> > > 2.20.1
> > > 
> > > _______________________________________________
> > > vlc-devel mailing list
> > > To unsubscribe or modify your subscription options:
> > > https://mailman.videolan.org/listinfo/vlc-devel
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel