Package: rbdoom3bfg Version: 1.0.3+repack1+git20150806-1 Severity: important Tags: patch User: [email protected] Usertags: ffmpeg2.9
Dear Maintainer, your package fails to build with the upcoming ffmpeg 2.9. This bug will become release-critical at some point when the ffmpeg2.9 transition gets closer. Attached is a patch replacing the deprecated functionality. It also works with ffmpeg 2.8. Please apply this patch and forward it upstream, if necessary. These changes have little regression potential. Best regards, Andreas
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch new file mode 100644 index 0000000..acf84cf --- /dev/null +++ b/debian/patches/ffmpeg_2.9.patch @@ -0,0 +1,32 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <[email protected]> +Last-Update: <2015-11-02> + +--- rbdoom3bfg-1.0.3+repack1+git20150806.orig/neo/renderer/Cinematic.cpp ++++ rbdoom3bfg-1.0.3+repack1+git20150806/neo/renderer/Cinematic.cpp +@@ -439,8 +439,8 @@ idCinematicLocal::~idCinematicLocal() + + // RB: TODO double check this. It seems we have different versions of ffmpeg on Kubuntu 13.10 and the win32 development files + #if defined(_WIN32) || defined(_WIN64) +- avcodec_free_frame( &frame ); +- avcodec_free_frame( &frame2 ); ++ av_frame_free( &frame ); ++ av_frame_free( &frame2 ); + #else + av_freep( &frame ); + av_freep( &frame2 ); +@@ -557,12 +557,12 @@ bool idCinematicLocal::InitFromFFMPEGFil + framePos = -1; + common->Printf( "Loaded FFMPEG file: '%s', looping=%d%dx%d, %f FPS, %f sec\n", qpath, looping, CIN_WIDTH, CIN_HEIGHT, frameRate, durationSec ); + image = ( byte* )Mem_Alloc( CIN_WIDTH * CIN_HEIGHT * 4 * 2, TAG_CINEMATIC ); +- avpicture_fill( ( AVPicture* )frame2, image, PIX_FMT_BGR32, CIN_WIDTH, CIN_HEIGHT ); ++ avpicture_fill( ( AVPicture* )frame2, image, AV_PIX_FMT_BGR32, CIN_WIDTH, CIN_HEIGHT ); + if( img_convert_ctx ) + { + sws_freeContext( img_convert_ctx ); + } +- img_convert_ctx = sws_getContext( dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, CIN_WIDTH, CIN_HEIGHT, PIX_FMT_BGR32, SWS_BICUBIC, NULL, NULL, NULL ); ++ img_convert_ctx = sws_getContext( dec_ctx->width, dec_ctx->height, dec_ctx->pix_fmt, CIN_WIDTH, CIN_HEIGHT, AV_PIX_FMT_BGR32, SWS_BICUBIC, NULL, NULL, NULL ); + status = FMV_PLAY; + + startTime = 0; diff --git a/debian/patches/series b/debian/patches/series index 72ef492..8d114fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 10-lowercase-executeable.patch 20-reproducible.patch 65-init-sdl2.patch +ffmpeg_2.9.patch
