[gentoo-commits] repo/gentoo:master commit in: media-video/dvdstyler/, media-video/dvdstyler/files/

[Alexis Ballier]

commit:     8478b2adcc1c58c77e882f6230832a7c2555a500
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 17:21:33 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 18:11:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8478b2ad

media-video/dvdstyler: fix build with ffmpeg4

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-video/dvdstyler/dvdstyler-3.0.4.ebuild |  2 ++
 media-video/dvdstyler/files/ffmpeg4.patch    | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild 
b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index 668ddd64d8d..3df313a5bb0 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -46,6 +46,8 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+       epatch "${FILESDIR}/ffmpeg4.patch"
+
        need-wxwidgets unicode
        # disable obsolete GNOME 2.x libraries wrt #508854
        sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure 
|| die

diff --git a/media-video/dvdstyler/files/ffmpeg4.patch 
b/media-video/dvdstyler/files/ffmpeg4.patch
new file mode 100644
index 00000000000..39966dd1dfb
--- /dev/null
+++ b/media-video/dvdstyler/files/ffmpeg4.patch
@@ -0,0 +1,13 @@
+Index: DVDStyler-3.0.4/src/mediaenc_ffmpeg.cpp
+===================================================================
+--- DVDStyler-3.0.4.orig/src/mediaenc_ffmpeg.cpp
++++ DVDStyler-3.0.4/src/mediaenc_ffmpeg.cpp
+@@ -223,7 +223,7 @@ bool wxFfmpegMediaEncoder::addAudioStrea
+       c->time_base = (AVRational){ 1, c->sample_rate };
+       // some formats want stream headers to be separate
+       if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
+-          c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++          c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+       
+       return true;
+ }