commit:     0574f264296bd974ffb8c90fdc949b41c81db87b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 16:17:45 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 16:19:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0574f264

www-client/vivaldi-snapshot: Tweak shell patch to not remove version check.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch     | 17 -----------------
 ...ebuild => vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild} |  0
 2 files changed, 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 9d086427fd7..bd64493c404 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
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild

Reply via email to