[rbdoom3bfg] 01/01: Add fix for #803857

[Tobias Frost]

This is an automated email from the git hooks/post-receive script.

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit 5d4012895e9578afc3788875ef93301de9a524dd
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Tue Nov 3 21:06:14 2015 +0100

    Add fix for #803857
---
 debian/changelog                   |  7 +++++++
 debian/patches/70-ffmpeg_2.9.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a4c3741..4f04785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rbdoom3bfg (1.0.3+repack1+git20150806-2) UNRELEASED; urgency=medium
+
+  * Fix "FTBFS with FFmpeg 2.9", using the patch from Andreas Cadhalpun
+    (Closes: #803857)
+
+ -- Tobias Frost <tobi at debian.org>  Tue, 03 Nov 2015 19:40:34 +0100
+
 rbdoom3bfg (1.0.3+repack1+git20150806-1) unstable; urgency=medium
 
   * New upstream git snapshort.
diff --git a/debian/patches/70-ffmpeg_2.9.patch b/debian/patches/70-ffmpeg_2.9.patch
new file mode 100644
index 0000000..d70b329
--- /dev/null
+++ b/debian/patches/70-ffmpeg_2.9.patch
@@ -0,0 +1,34 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Bug-Debian: https://bugs.debian.org/803857
+Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/issues/249
+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..3318d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 10-lowercase-executeable.patch
 20-reproducible.patch
 65-init-sdl2.patch
+70-ffmpeg_2.9.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git