From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/, media-sound/moc/files/
Date: Sun, 21 Feb 2016 23:22:47 +0000 (UTC) [thread overview]
Message-ID: <1456096960.6b3d75d72176eea6a04efd494105f0af5781255d.soap@gentoo> (raw)
commit: 6b3d75d72176eea6a04efd494105f0af5781255d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 23:22:25 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> 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 <libavutil/mathematics.h>
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #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}"
next reply other threads:[~2016-02-21 23:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-21 23:22 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-23 11:04 [gentoo-commits] repo/gentoo:master commit in: media-sound/moc/, media-sound/moc/files/ Miroslav Šulc
2016-01-27 23:16 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456096960.6b3d75d72176eea6a04efd494105f0af5781255d.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox