From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C0DD21388C0 for ; Sun, 21 Feb 2016 23:22:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 486AAE085C; Sun, 21 Feb 2016 23:22:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEF76E085C for ; Sun, 21 Feb 2016 23:22:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 082AA340AC0 for ; Sun, 21 Feb 2016 23:22:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84D101069 for ; Sun, 21 Feb 2016 23:22:47 +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: <1456096960.6b3d75d72176eea6a04efd494105f0af5781255d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/, media-sound/moc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch media-sound/moc/moc-2.6_alpha1-r1.ebuild X-VCS-Directories: media-sound/moc/files/ media-sound/moc/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6b3d75d72176eea6a04efd494105f0af5781255d X-VCS-Branch: master Date: Sun, 21 Feb 2016 23:22:47 +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: 325a52dd-20cc-45ab-813a-ac446501360e X-Archives-Hash: 94ff28735a33c45b898d7277b219f54f commit: 6b3d75d72176eea6a04efd494105f0af5781255d Author: David Seifert gentoo org> AuthorDate: Sun Feb 21 23:22:25 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Feb 21 23:22:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3d75d7 media-sound/moc: Patch for converting 'audioconvert.h' to 'channel_layout.h' Gentoo-Bug: 575328 Package-Manager: portage-2.2.27 .../moc/files/moc-2.6_alpha1-audioconvert.h.patch | 20 ++++++++++++++++++++ media-sound/moc/moc-2.6_alpha1-r1.ebuild | 1 + 2 files changed, 21 insertions(+) diff --git a/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch new file mode 100644 index 0000000..9ade090 --- /dev/null +++ b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch @@ -0,0 +1,20 @@ +Patch for building with latest FFmpeg 3.0 +https://bugs.gentoo.org/show_bug.cgi?id=575328 + +Inspired by +https://raw.githubusercontent.com/Homebrew/patches/1282e60/moc/moc-2.5.0.diff + +We can unconditionally depend on the existence of 'channel_layout.h', +as even the oldest version in the Gentoo tree contains this header. + +--- moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c ++++ moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c +@@ -66,7 +66,7 @@ + GCC_DIAG_ON(deprecated-declarations) + #include + #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS +-#include ++#include + #endif + + /* FFmpeg also likes common names, without that, our common.h and log.h diff --git a/media-sound/moc/moc-2.6_alpha1-r1.ebuild b/media-sound/moc/moc-2.6_alpha1-r1.ebuild index a5b24cd..3901a15 100644 --- a/media-sound/moc/moc-2.6_alpha1-r1.ebuild +++ b/media-sound/moc/moc-2.6_alpha1-r1.ebuild @@ -46,6 +46,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-fix-ncurses-underlinking.patch" + "${FILESDIR}/${P}-audioconvert.h.patch" ) S="${WORKDIR}/${PN}-${MY_PV}"