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 A77E5139085 for ; Tue, 7 Feb 2017 09:46:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D17D0E0C33; Tue, 7 Feb 2017 09:46:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9BD55E0C33 for ; Tue, 7 Feb 2017 09:46:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 245C934168D for ; Tue, 7 Feb 2017 09:46:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4279D3D9B for ; Tue, 7 Feb 2017 09:46:27 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1486460737.2550cb9a9478bebfe3fa141f7a2278448694c666.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/Manifest media-video/ffmpeg/ffmpeg-3.2.2.ebuild media-video/ffmpeg/ffmpeg-3.2.3.ebuild media-video/ffmpeg/files/chromaprint14.patch X-VCS-Directories: media-video/ffmpeg/files/ media-video/ffmpeg/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 2550cb9a9478bebfe3fa141f7a2278448694c666 X-VCS-Branch: master Date: Tue, 7 Feb 2017 09:46:27 +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: 0bdea100-7adf-4f8b-8e03-95ffdd93f0ea X-Archives-Hash: c39abb8c700405f9fe5ffaa060993258 commit: 2550cb9a9478bebfe3fa141f7a2278448694c666 Author: Alexis Ballier gentoo org> AuthorDate: Tue Feb 7 09:45:37 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Feb 7 09:45:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2550cb9a media-video/ffmpeg: Bump to 3.2.3 Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-video/ffmpeg/Manifest | 2 +- .../{ffmpeg-3.2.2.ebuild => ffmpeg-3.2.3.ebuild} | 2 -- media-video/ffmpeg/files/chromaprint14.patch | 24 ---------------------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 4994b85..27c2e2a 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,2 +1,2 @@ DIST ffmpeg-2.8.10.tar.bz2 8585304 SHA256 d1ce1a73503dce6e2b1e208cb93a2a8a7e89f9c64357ddc3e4da3cab33dea9c9 SHA512 1ca8b0060361c49de201afc463bcd7c9340f09bbd116dff2539653bc36411d60cdf667874d2ec51664e141ee7a7be8bebc94e158687cb97db6bdfa40f00ec193 WHIRLPOOL 4ff9271290c138ad5caa50835da9fd6685fabf5a589cb6c068cfff6698ded948d93e9d40656dca3b516f9e591119d204e6283d57f7d2f0747a4f7ef9b322ebce -DIST ffmpeg-3.2.2.tar.bz2 9611373 SHA256 0b129a56d1b8d06101b1fcbfaa9f4f5eee3182d1ad6e44f511a84c12113a366b SHA512 7cb61684081bbe905ef324f60d259fd543e8be1ed2593167beb9324bec8bbc012cccff40a73e8be0ccc6bb0a20acd98a3dbac0d1d39403016cb381c1410b45db WHIRLPOOL fe43df569f88b79d5bfaab1d16929d3f3eaf7deecd3ca42a922d67cd971d8ac0a17b2dfc6db75b706a93da7e877887dcc75a38609e62e2ea4781b9363292a872 +DIST ffmpeg-3.2.3.tar.bz2 9614810 SHA256 e9a41be04e8a7f62f83d0ff5ecaa9c82a857f9200f61b02ef5f304a16fb9b072 SHA512 97f44497b2b9beccbefe8c28e1f82629e74537a585720323adc60620af2782d376498fd3558ddf0d39b9010cbddc3fb62907e3c214ccac72ec1fcbd64baf4b0f WHIRLPOOL 1b45cdc6e0eac48d65105fe04b3eea1ae6ae719abbfa5700d4e103e061e69a47caab544f71de8fce3d8c3aa83bba2e452b1b4a06c8e2c0aad3ec5f6bf34ff249 diff --git a/media-video/ffmpeg/ffmpeg-3.2.2.ebuild b/media-video/ffmpeg/ffmpeg-3.2.3.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-3.2.2.ebuild rename to media-video/ffmpeg/ffmpeg-3.2.3.ebuild index 0bd671e..576150b 100644 --- a/media-video/ffmpeg/ffmpeg-3.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.2.3.ebuild @@ -284,8 +284,6 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} -PATCHES=( "${FILESDIR}/chromaprint14.patch" ) - MULTILIB_WRAPPED_HEADERS=( /usr/include/libavutil/avconfig.h ) diff --git a/media-video/ffmpeg/files/chromaprint14.patch b/media-video/ffmpeg/files/chromaprint14.patch deleted file mode 100644 index d166247..00000000 --- a/media-video/ffmpeg/files/chromaprint14.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 581f93f37ef2e7a00662828ed0348d1edb9041fe -Author: Georgi D. Sotirov -Date: Tue Dec 6 21:07:59 2016 +0100 - - lavf/chromaprint: Update for version 1.4 - - Fixes ticket #5997. - -diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c -index 8c9a6c0111..4da02bef76 100644 ---- a/libavformat/chromaprint.c -+++ b/libavformat/chromaprint.c -@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext { - int silence_threshold; - int algorithm; - FingerprintFormat fp_format; -+#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0) -+ ChromaprintContext *ctx; -+#else - ChromaprintContext ctx; -+#endif - } ChromaprintMuxContext; - - static void cleanup(ChromaprintMuxContext *cpr)