Control: tags 888356 + patch Control: tags 888356 + pending Dear maintainer,
I've prepared an NMU for retroarch (versioned as 1.3.6+dfsg1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru retroarch-1.3.6+dfsg1/debian/changelog retroarch-1.3.6+dfsg1/debian/changelog --- retroarch-1.3.6+dfsg1/debian/changelog 2016-08-24 03:44:14.000000000 +0200 +++ retroarch-1.3.6+dfsg1/debian/changelog 2018-07-11 21:35:41.000000000 +0200 @@ -1,3 +1,10 @@ +retroarch (1.3.6+dfsg1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Fix build with ffmpeg 4.0. (Closes: #888356) + + -- Sebastian Ramacher <[email protected]> Wed, 11 Jul 2018 21:35:41 +0200 + retroarch (1.3.6+dfsg1-1) unstable; urgency=low * New upstream release. diff -Nru retroarch-1.3.6+dfsg1/debian/patches/05_ffmpeg4.0.patch retroarch-1.3.6+dfsg1/debian/patches/05_ffmpeg4.0.patch --- retroarch-1.3.6+dfsg1/debian/patches/05_ffmpeg4.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ retroarch-1.3.6+dfsg1/debian/patches/05_ffmpeg4.0.patch 2018-07-11 21:35:18.000000000 +0200 @@ -0,0 +1,58 @@ +From 4f5fc6e4ad8f21c517fab57a2a37669e419c1423 Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Mon, 20 Nov 2017 13:08:58 -0800 +Subject: [PATCH] Fix build with ffmpeg snapshots. + +Fixes https://github.com/libretro/RetroArch/issues/5717 +--- + record/drivers/record_ffmpeg.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c +index b74875f293..98369638a7 100644 +--- a/record/drivers/record_ffmpeg.c ++++ b/record/drivers/record_ffmpeg.c +@@ -348,7 +348,7 @@ static bool ffmpeg_init_audio(ffmpeg_t *handle) + + if (params->audio_qscale) + { +- audio->codec->flags |= CODEC_FLAG_QSCALE; ++ audio->codec->flags |= AV_CODEC_FLAG_QSCALE; + audio->codec->global_quality = params->audio_global_quality; + } + else if (params->audio_bit_rate) +@@ -358,7 +358,7 @@ static bool ffmpeg_init_audio(ffmpeg_t *handle) + audio->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; + + if (handle->muxer.ctx->oformat->flags & AVFMT_GLOBALHEADER) +- audio->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ audio->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + if (avcodec_open2(audio->codec, codec, params->audio_opts ? ¶ms->audio_opts : NULL) != 0) + return false; +@@ -378,7 +378,7 @@ static bool ffmpeg_init_audio(ffmpeg_t *handle) + if (!audio->buffer) + return false; + +- audio->outbuf_size = FF_MIN_BUFFER_SIZE; ++ audio->outbuf_size = AV_INPUT_BUFFER_MIN_SIZE; + audio->outbuf = (uint8_t*)av_malloc(audio->outbuf_size); + if (!audio->outbuf) + return false; +@@ -490,14 +490,14 @@ static bool ffmpeg_init_video(ffmpeg_t *handle) + + if (params->video_qscale) + { +- video->codec->flags |= CODEC_FLAG_QSCALE; ++ video->codec->flags |= AV_CODEC_FLAG_QSCALE; + video->codec->global_quality = params->video_global_quality; + } + else if (params->video_bit_rate) + video->codec->bit_rate = params->video_bit_rate; + + if (handle->muxer.ctx->oformat->flags & AVFMT_GLOBALHEADER) +- video->codec->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ video->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + if (avcodec_open2(video->codec, codec, params->video_opts ? + ¶ms->video_opts : NULL) != 0) diff -Nru retroarch-1.3.6+dfsg1/debian/patches/series retroarch-1.3.6+dfsg1/debian/patches/series --- retroarch-1.3.6+dfsg1/debian/patches/series 2016-07-20 03:02:56.000000000 +0200 +++ retroarch-1.3.6+dfsg1/debian/patches/series 2018-07-11 21:35:22.000000000 +0200 @@ -2,3 +2,4 @@ 02_hide_settings.patch 03_zlib.patch 04_add_CPPFLAGS.patch +05_ffmpeg4.0.patch
signature.asc
Description: PGP signature
