summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-02-21 17:17:45 +0100
committerJeroen Roovers <jer@gentoo.org>2018-02-21 17:19:09 +0100
commit0574f264296bd974ffb8c90fdc949b41c81db87b (patch)
tree7d2942d49292192095a726575e570750adbb0846
parentdev-go/glide: Version bump to 0.13.1 (diff)
downloadgentoo-0574f264.tar.gz
gentoo-0574f264.tar.bz2
gentoo-0574f264.zip
www-client/vivaldi-snapshot: Tweak shell patch to not remove version check.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
-rw-r--r--www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch17
-rw-r--r--www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild (renamed from www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1.ebuild)0
2 files changed, 0 insertions, 17 deletions
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
index 9d086427fd75..bd64493c404a 100644
--- 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
@@ -1,22 +1,5 @@
--- a/opt/vivaldi-snapshot/vivaldi-snapshot
+++ b/opt/vivaldi-snapshot/vivaldi-snapshot
-@@ -32,14 +32,14 @@
- # Chromium's FFMpeg version N-89284-gba4dfad is the oldest known working version
- # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
- if [ -r "$1" ]; then
-- if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; then
-+# if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "89284" ]; then
- if [[ -n "$LD_PRELOAD" ]]; then
- export LD_PRELOAD="$LD_PRELOAD:$1"
- else
- export LD_PRELOAD="$1"
- fi
- export VIVALDI_FFMPEG_FOUND=YES
-- fi
-+# fi
- fi
- fi
- fi
@@ -54,6 +54,7 @@
# Check for libs in preferred order.
# Where possible, use other files/directories to confirm it's the correct variant.
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
index ee9ad44cb619..ee9ad44cb619 100644
--- 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