Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/files/, www-client/vivaldi-snapshot/
Date: Wed, 21 Feb 2018 16:19:13
Message-Id: 1519229949.0574f264296bd974ffb8c90fdc949b41c81db87b.jer@gentoo
1 commit: 0574f264296bd974ffb8c90fdc949b41c81db87b
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 21 16:17:45 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 21 16:19:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0574f264
7
8 www-client/vivaldi-snapshot: Tweak shell patch to not remove version check.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 .../vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch | 17 -----------------
13 ...ebuild => vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild} | 0
14 2 files changed, 17 deletions(-)
15
16 diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
17 index 9d086427fd7..bd64493c404 100644
18 --- a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
19 +++ b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
20 @@ -1,22 +1,5 @@
21 --- a/opt/vivaldi-snapshot/vivaldi-snapshot
22 +++ b/opt/vivaldi-snapshot/vivaldi-snapshot
23 -@@ -32,14 +32,14 @@
24 - # Chromium's FFMpeg version N-89284-gba4dfad is the oldest known working version
25 - # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
26 - if [ -r "$1" ]; then
27 -- if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; then
28 -+# if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; then
29 - if [[ -n "$LD_PRELOAD" ]]; then
30 - export LD_PRELOAD="$LD_PRELOAD:$1"
31 - else
32 - export LD_PRELOAD="$1"
33 - fi
34 - export VIVALDI_FFMPEG_FOUND=YES
35 -- fi
36 -+# fi
37 - fi
38 - fi
39 - fi
40 @@ -54,6 +54,7 @@
41 # Check for libs in preferred order.
42 # Where possible, use other files/directories to confirm it's the correct variant.
43
44 diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild
45 similarity index 100%
46 rename from www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1.ebuild
47 rename to www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild