Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jb42069' into 'master'
[vpx] Update to v1.8.1. JB#42069 See merge request mer-core/libvpx!3
- Loading branch information
Showing
4 changed files
with
26 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
[submodule "upstream"] | ||
path = upstream | ||
url = https://git.merproject.org/mirror/libvpx.git | ||
url = https://git.sailfishos.org/mirror/libvpx.git |
20 changes: 20 additions & 0 deletions
20
rpm/0002-Skip-diff-version-check-that-doesnt-work-with-busybo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters