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 B73C4139694 for ; Tue, 14 Feb 2017 21:41:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 227CAE0CC8; Tue, 14 Feb 2017 21:41:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0338DE0CC8 for ; Tue, 14 Feb 2017 21:41:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDDFB341236 for ; Tue, 14 Feb 2017 21:41:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61D4E47F8 for ; Tue, 14 Feb 2017 21:41:26 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1487108463.cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch X-VCS-Directories: media-video/mpv/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9 X-VCS-Branch: master Date: Tue, 14 Feb 2017 21:41:26 +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: 464dc9c9-ff6d-4831-aacc-a684625e50f6 X-Archives-Hash: dcf5eadd51af32a2bd71bbc058232efc commit: cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9 Author: Ilya Tumaykin gmail com> AuthorDate: Sun Feb 12 21:15:50 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Feb 14 21:41:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd878ca media-video/mpv: make message less scary in ffmpeg patch "Most likely a broken build" isn't the best thing to tell our users especially because in most cases it isn't a broken build. Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch index 96a1f566a6..7c8d5b44c8 100644 --- a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch +++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch @@ -3,7 +3,7 @@ player: make ffmpeg/libav version check non-fatal We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. diff --git a/player/main.c b/player/main.c -index 67dde34..ee133a9 100644 +index 67dde3449..696d2e716 100644 --- a/player/main.c +++ b/player/main.c @@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) @@ -20,9 +20,9 @@ index 67dde34..ee133a9 100644 + print_libav_versions(mpctx->log, MSGL_WARN); + MP_WARN(mpctx, "\nmpv was compiled against a different version of " + "FFmpeg/Libav than the shared\nlibrary it is linked against. " -+ "This is most likely a broken build and could\nresult in " -+ "misbehavior and crashes.\n\nUpstream does not support this " -+ "configuration.\nPlease rebuild mpv in case of any problems.\n"); ++ "This could result in misbehavior and crashes.\n\n" ++ "Upstream does not support this configuration.\n" ++ "Please rebuild mpv in case of any problems.\n"); } if (opts->dump_stats && opts->dump_stats[0]) {