Control: tags 888377 + pending Dear maintainer,
I've prepared an NMU for karlyriceditor (versioned as 1.11-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru karlyriceditor-1.11/debian/changelog karlyriceditor-1.11/debian/changelog --- karlyriceditor-1.11/debian/changelog 2016-03-10 16:39:25.000000000 +0100 +++ karlyriceditor-1.11/debian/changelog 2018-07-11 22:24:38.000000000 +0200 @@ -1,3 +1,11 @@ +karlyriceditor (1.11-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix build with ffmpeg 4.0. Thanks to James cowgill for the patch. (Closes: + #888377) + + -- Sebastian Ramacher <sramac...@debian.org> Wed, 11 Jul 2018 22:24:38 +0200 + karlyriceditor (1.11-2) unstable; urgency=medium * Partially unpatch the code because FFmpeg is back in Debian. diff -Nru karlyriceditor-1.11/debian/patches/ffmpeg4.0.patch karlyriceditor-1.11/debian/patches/ffmpeg4.0.patch --- karlyriceditor-1.11/debian/patches/ffmpeg4.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ karlyriceditor-1.11/debian/patches/ffmpeg4.0.patch 2018-07-11 22:24:08.000000000 +0200 @@ -0,0 +1,34 @@ +Description: Fix FTBFS with FFmpeg 4.0 +Author: James Cowgill <jcowg...@debian.org> +Bug-Debian: https://bugs.debian.org/888377 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/ffmpegvideoencoder.cpp ++++ b/src/ffmpegvideoencoder.cpp +@@ -345,7 +345,7 @@ av_log_set_level(AV_LOG_VERBOSE); + + // Enable interlacing if needed + if ( m_videoformat->flags & VIFO_INTERLACED ) +- videoCodecCtx->flags |= CODEC_FLAG_INTERLACED_DCT; ++ videoCodecCtx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; + + // Enable multithreaded encoding: breaks FLV! + //videoCodecCtx->thread_count = 4; +@@ -373,7 +373,7 @@ av_log_set_level(AV_LOG_VERBOSE); + + // If we have a global header for the format, no need to duplicate the codec info in each keyframe + if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER ) +- videoCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ videoCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + // Open the codec + if ( ( err = avcodec_open2( videoCodecCtx, videoCodec, 0 )) < 0 ) +@@ -463,7 +463,7 @@ av_log_set_level(AV_LOG_VERBOSE); + audioCodecCtx->time_base.den = m_profile->sampleRate; + + if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER ) +- audioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + // Since different audio codecs support different sample formats, look up which one is supported by this specific codec + if ( isAudioSampleFormatSupported( audioCodec->sample_fmts, AV_SAMPLE_FMT_FLTP ) ) diff -Nru karlyriceditor-1.11/debian/patches/series karlyriceditor-1.11/debian/patches/series --- karlyriceditor-1.11/debian/patches/series 2016-03-10 16:39:25.000000000 +0100 +++ karlyriceditor-1.11/debian/patches/series 2018-07-11 22:24:10.000000000 +0200 @@ -8,3 +8,4 @@ 0008-Fix-segfault-AVFrame-initialization-Libav-FFmpeg.patch 0010-Make-qmake-respect-external-build-linking-flags.patch ffmpeg2.9.patch +ffmpeg4.0.patch
signature.asc
Description: PGP signature
