Commit b9f53f87 authored by Andrew Branson's avatar Andrew Branson

Merge branch 'jb42069' into 'master'

[vpx] Update to v1.8.1. JB#42069

See merge request !3
parents 3dc59460 2abcc8e4
[submodule "upstream"]
path = upstream
url = https://git.merproject.org/mirror/libvpx.git
url = https://git.sailfishos.org/mirror/libvpx.git
From 8023d80a76090469e19174c91ab469134988ad42 Thu, 9 May 2019 13:33:58 +0200
From: Andrew Branson <andrew.branson@jollamobile.com>
Date: Thu, 9 May 2019 13:33:15 +0200
Subject: [PATCH] Skip diff version check, that doesn't work with busybox
diff --git a/configure b/configure
index 6204f10..5e3f4b2 100755
--- a/configure
+++ b/configure
@@ -166,10 +166,6 @@
[ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
done
-if ! diff --version >/dev/null; then
- die "diff missing: Try installing diffutils via your package manager."
-fi
-
if ! perl --version >/dev/null; then
die "Perl is required to build"
fi
Name: libvpx
Version: 1.7.0
Version: 1.8.1
Release: 1
Summary: VPx codec library
License: BSD
......@@ -7,6 +7,7 @@ Group: Applications/Multimedia
Url: http://www.webmproject.org/
Source0: %{name}-%{version}.tar.gz
Patch1: 0001-armv7-use-hard-float.patch
Patch2: 0002-Skip-diff-version-check-that-doesnt-work-with-busybo.patch
%ifarch %{ix86} x86_64
BuildRequires: yasm
%endif
......@@ -45,7 +46,7 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}/upstream
%patch1 -p1
%autopatch -p1
%build
......@@ -55,10 +56,7 @@ Requires: %{name} = %{version}-%{release}
--enable-debug --enable-shared --disable-static \
--enable-vp8 --enable-vp9 --enable-vp9-highbitdepth \
--enable-multithread --enable-postproc \
--enable-experimental --enable-spatial-svc \
%ifarch aarch64
--disable-neon --disable-neon_asm \
%endif
--enable-experimental \
%ifarch %{ix86} x86_64
--as=yasm \
%endif
......
Subproject commit f80be22a1099b2a431c2796f529bb261064ec6b4
Subproject commit 8ae686757b708cd8df1d10c71586aff5355cfe1e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment