[vlc-devel] [PATCH] contrib: update libvpx to 1.9.0
Tristan Matthews
tmatth at videolan.org
Tue Sep 1 15:34:02 CEST 2020
On Tue, Sep 1, 2020 at 9:30 AM Alexandre Janniaux <ajanni at videolabs.io> wrote:
>
> Hi,
>
> To provide more details, here is what is reported with
> xcode-cross:
>
> ./configure: 723: [: Illegal number: version
> ./configure: 726: [: Illegal number: version
> Toolchain is unable to link executables
>
> Configuration failed. This could reflect a misconfiguration of your
> toolchains, improper options selected, or another problem. If you
> don't see any useful error messages above, the next step is to look
> at the configure error log file (config.log) to determine what
> configure was trying to do when it died.
> ../src/vpx/rules.mak:168: recipe for target '.vpx' failed
> make: *** [.vpx] Error 1
>
> And the config.log halts on:
>
> clang-8: error: invalid version number in '-miphoneos-version-min='
>
> Regards,
> --
> Alexandre Janniaux
Yeah I've pushed an update which to contrib/src/vpx/libvpx-ios.patch
which clobbers the remaining IOS_VERSION_MIN reference (which I think
is what caused the issue).
Best,
-t
> Videolabs
>
> On Tue, Sep 01, 2020 at 03:20:11PM +0200, Steve Lhomme wrote:
> > On 2020-09-01 14:51, Tristan Matthews wrote:
> > > > On Tue, Sep 1, 2020 at 8:50 AM Tristan Matthews <tmatth at videolan.org> wrote:>
> > > > On Tue, Sep 1, 2020 at 2:22 AM Steve Lhomme <robux4 at ycbcr.xyz> wrote:
> > > > >
> > > > > Can you try to do a Merge Request on Gitlab to verify it doesn't break
> > > > > on any target ? (if you haven't already)
> > > > >
> > > > > I don't trust their build system.
> > > >
> > > > Good call, building here:
> > >
> > > Sorry skipped the link:
> > > https://code.videolan.org/tmatth/vlc/-/pipelines/21752
> >
> > Thanks.
> > On ios-arm64 there is this error:
> >
> > Toolchain is unable to link executables
> > Configuration failed. This could reflect a misconfiguration of your
> > toolchains, improper options selected, or another problem. If you
> > don't see any useful error messages above, the next step is to look
> > at the configure error log file (config.log) to determine what
> > configure was trying to do when it died.
> > make: *** [.vpx] Error 1
> >
> > Android arm64 seems to be happy.
> >
> > > Best,
> > > -t
> > >
> > > > >
> > > > > On 2020-09-01 4:33, Tristan Matthews wrote:
> > > > > > ---
> > > > > > contrib/src/vpx/SHA512SUMS | 2 +-
> > > > > > contrib/src/vpx/libvpx-android.patch | 16 ++++++++--------
> > > > > > contrib/src/vpx/libvpx-ios.patch | 24 ++++++++----------------
> > > > > > contrib/src/vpx/rules.mak | 2 +-
> > > > > > 4 files changed, 18 insertions(+), 26 deletions(-)
> > > > > >
> > > > > > diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
> > > > > > index d9ee76c002..42d55fbb61 100644
> > > > > > --- a/contrib/src/vpx/SHA512SUMS
> > > > > > +++ b/contrib/src/vpx/SHA512SUMS
> > > > > > @@ -1 +1 @@
> > > > > > -da2ab0775a28ddd78654bbe46886e833d4ef7ba91867fc1427dceced735b6177eff06b24f204c075c50c3a5cadc5be6a1fb213c44df189218a543b52554f3a38 libvpx-1.8.2.tar.gz
> > > > > > +8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298 libvpx-1.9.0.tar.gz
> > > > > > diff --git a/contrib/src/vpx/libvpx-android.patch b/contrib/src/vpx/libvpx-android.patch
> > > > > > index 325fd53bf8..afba85551a 100644
> > > > > > --- a/contrib/src/vpx/libvpx-android.patch
> > > > > > +++ b/contrib/src/vpx/libvpx-android.patch
> > > > > > @@ -1,7 +1,7 @@
> > > > > > -diff -Naur libvpx-1.8.2.orig/vpx_ports/vpx_ports.mk libvpx-1.8.2/vpx_ports/vpx_ports.mk
> > > > > > ---- libvpx-1.8.2.orig/vpx_ports/vpx_ports.mk 2019-12-10 00:09:20.000000000 +0100
> > > > > > -+++ libvpx-1.8.2/vpx_ports/vpx_ports.mk 2020-01-22 14:06:41.478331277 +0100
> > > > > > -@@ -35,6 +35,7 @@
> > > > > > +diff -ruw libvpx-1.9.0.orig/vpx_ports/vpx_ports.mk libvpx-1.9.0/vpx_ports/vpx_ports.mk
> > > > > > +--- libvpx-1.9.0.orig/vpx_ports/vpx_ports.mk 2020-07-30 15:59:15.000000000 -0400
> > > > > > ++++ libvpx-1.9.0/vpx_ports/vpx_ports.mk 2020-08-31 22:29:18.638262049 -0400
> > > > > > +@@ -37,6 +37,7 @@
> > > > > > endif
> > > > > >
> > > > > > PORTS_SRCS-$(VPX_ARCH_ARM) += arm_cpudetect.c
> > > > > > @@ -9,10 +9,10 @@ diff -Naur libvpx-1.8.2.orig/vpx_ports/vpx_ports.mk libvpx-1.8.2/vpx_ports/vpx_p
> > > > > > PORTS_SRCS-$(VPX_ARCH_ARM) += arm.h
> > > > > >
> > > > > > PORTS_SRCS-$(VPX_ARCH_PPC) += ppc_cpudetect.c
> > > > > > -diff -Naur libvpx-1.8.2.orig/vpx_ports/x86_abi_support.asm libvpx-1.8.2/vpx_ports/x86_abi_support.asm
> > > > > > ---- libvpx-1.8.2.orig/vpx_ports/x86_abi_support.asm 2019-12-10 00:09:20.000000000 +0100
> > > > > > -+++ libvpx-1.8.2/vpx_ports/x86_abi_support.asm 2020-01-22 14:07:11.774877937 +0100
> > > > > > -@@ -393,6 +393,7 @@
> > > > > > +diff -ruw libvpx-1.9.0.orig/vpx_ports/x86_abi_support.asm libvpx-1.9.0/vpx_ports/x86_abi_support.asm
> > > > > > +--- libvpx-1.9.0.orig/vpx_ports/x86_abi_support.asm 2020-07-30 15:59:15.000000000 -0400
> > > > > > ++++ libvpx-1.9.0/vpx_ports/x86_abi_support.asm 2020-08-31 22:29:16.846269764 -0400
> > > > > > +@@ -414,6 +414,7 @@
> > > > > >
> > > > > > ; On Android platforms use lrand48 when building postproc routines. Prior to L
> > > > > > ; rand() was not available.
> > > > > > diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
> > > > > > index 06a28d9293..d8ef10276f 100644
> > > > > > --- a/contrib/src/vpx/libvpx-ios.patch
> > > > > > +++ b/contrib/src/vpx/libvpx-ios.patch
> > > > > > @@ -1,6 +1,7 @@
> > > > > > ---- 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 @@
> > > > > > +diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/configure.sh
> > > > > > +--- libvpx-1.9.0.orig/build/make/configure.sh 2020-08-31 22:22:31.376015302 -0400
> > > > > > ++++ libvpx-1.9.0/build/make/configure.sh 2020-08-31 22:24:35.355481574 -0400
> > > > > > +@@ -832,96 +832,6 @@
> > > > > > # PIC is probably what we want when building shared libs
> > > > > > enabled shared && soft_enable pic
> > > > > >
> > > > > > @@ -79,6 +80,10 @@
> > > > > > - add_cflags "-mmacosx-version-min=10.14"
> > > > > > - add_ldflags "-mmacosx-version-min=10.14"
> > > > > > - ;;
> > > > > > +- *-darwin19-*)
> > > > > > +- add_cflags "-mmacosx-version-min=10.15"
> > > > > > +- add_ldflags "-mmacosx-version-min=10.15"
> > > > > > +- ;;
> > > > > > - *-iphonesimulator-*)
> > > > > > - add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
> > > > > > - add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
> > > > > > @@ -93,16 +98,3 @@
> > > > > > # Handle Solaris variants. Solaris 10 needs -lposix4
> > > > > > case ${toolchain} in
> > > > > > sparc-solaris-*)
> > > > > > -@@ -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
> > > > > > --
> > > > > > - 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 0f7e50dcdd..30c72b1498 100644
> > > > > > --- a/contrib/src/vpx/rules.mak
> > > > > > +++ b/contrib/src/vpx/rules.mak
> > > > > > @@ -1,6 +1,6 @@
> > > > > > # libvpx
> > > > > >
> > > > > > -VPX_VERSION := 1.8.2
> > > > > > +VPX_VERSION := 1.9.0
> > > > > > VPX_URL := http://github.com/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
> > > > > >
> > > > > > PKGS += vpx
> > > > > > --
> > > > > > 2.25.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
> > >
> > _______________________________________________
> > 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
More information about the vlc-devel
mailing list