From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCCE91382C5 for ; Wed, 21 Feb 2018 16:19:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2737EE08DD; Wed, 21 Feb 2018 16:19:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 069E8E08DD for ; Wed, 21 Feb 2018 16:19:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DF9B335C31 for ; Wed, 21 Feb 2018 16:19:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2F33211 for ; Wed, 21 Feb 2018 16:19:10 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1519229949.0574f264296bd974ffb8c90fdc949b41c81db87b.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/files/, www-client/vivaldi-snapshot/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1-r1.ebuild www-client/vivaldi-snapshot/vivaldi-snapshot-1.15.1104.3_p1.ebuild X-VCS-Directories: www-client/vivaldi-snapshot/files/ www-client/vivaldi-snapshot/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 0574f264296bd974ffb8c90fdc949b41c81db87b X-VCS-Branch: master Date: Wed, 21 Feb 2018 16:19:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 41091e09-f88e-4499-bbd1-1f741391d094 X-Archives-Hash: fd225c224d7938cf1e8f7dccc3e42b53 commit: 0574f264296bd974ffb8c90fdc949b41c81db87b Author: Jeroen Roovers gentoo org> AuthorDate: Wed Feb 21 16:17:45 2018 +0000 Commit: Jeroen Roovers gentoo 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