r15580 - in packages/trunk/jugglemaster/debian: . patches

[Helmut Grohne]

Author: helmutg
Date: 2015-11-05 06:14:22 +0000 (Thu, 05 Nov 2015)
New Revision: 15580

Added:
   packages/trunk/jugglemaster/debian/patches/ffmpeg_2.9.patch
Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/patches/series
Log:
fix build against ffmpeg 2.9

Thanks to Andreas Cadhalpun for diagnosing the issue and providing a
patch.

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2015-11-03 18:53:34 UTC (rev 15579)
+++ packages/trunk/jugglemaster/debian/changelog	2015-11-05 06:14:22 UTC (rev 15580)
@@ -1,10 +1,14 @@
 jugglemaster (0.4-8) UNRELEASED; urgency=medium
 
+  [ Helmut Grohne ]
   * Remove *.desktop files to comply with CTTE #741573: The new policy
     requires .desktop files to come with icons, so the present ones will
     become non-compliant. Then the CTTE ruling requires that either the .menu
     or the .desktop files are to be removed. Thus remove the broken ones.
 
+  [ Andreas Cadhalpun ]
+  * Fix build against ffmpeg 2.9. (Closes: #803827)
+
  -- Helmut Grohne <helmut at subdivi.de>  Sun, 06 Sep 2015 11:49:54 +0200
 
 jugglemaster (0.4-7) unstable; urgency=low

Added: packages/trunk/jugglemaster/debian/patches/ffmpeg_2.9.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/ffmpeg_2.9.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/ffmpeg_2.9.patch	2015-11-05 06:14:22 UTC (rev 15580)
@@ -0,0 +1,45 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: 2015-11-02
+Bug-Debian: https://bugs.debian.org/803827
+
+--- jugglemaster-0.4.orig/src/jmdlx/Makefile
++++ jugglemaster-0.4/src/jmdlx/Makefile
+@@ -10,7 +10,7 @@ INSTALL=install
+ 
+ ifeq ($(HAVE_FFMPEG), 1)
+ CXXFLAGS+=-DHAVE_AVCODEC_H
+-LIBS+=-lavcodec
++LIBS+=-lavcodec -lavutil
+ endif
+ 
+ ifeq ($(DEBUG), 1)
+--- jugglemaster-0.4.orig/src/jmdlx/print.cpp
++++ jugglemaster-0.4/src/jmdlx/print.cpp
+@@ -553,7 +553,7 @@ int Print::printMPEG() {
+ 	}
+ 
+ 	c= avcodec_alloc_context3(codec);
+-	picture= avcodec_alloc_frame();
++	picture= av_frame_alloc();
+ 
+ 	c->bit_rate = 400000;
+ 	c->width = jmlib->getImageWidth();
+@@ -563,7 +563,7 @@ int Print::printMPEG() {
+ 	c->time_base.num = 1;
+ 	c->gop_size = 30;
+ 	c->max_b_frames=1;
+-	c->pix_fmt = PIX_FMT_YUV420P;
++	c->pix_fmt = AV_PIX_FMT_YUV420P;
+ 
+ 	if (avcodec_open2(c, codec, NULL) < 0) {
+ 		return(1);
+@@ -653,7 +653,7 @@ int Print::printMPEG() {
+ 
+ 	avcodec_close(c);
+ 	free(c);
+-	free(picture);
++	av_frame_free(&picture);
+ 
+ 	fclose(outputfile);
+ 	return(0);

Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series	2015-11-03 18:53:34 UTC (rev 15579)
+++ packages/trunk/jugglemaster/debian/patches/series	2015-11-05 06:14:22 UTC (rev 15580)
@@ -14,3 +14,4 @@
 libav10.patch
 include-header-for-memset.patch
 wx3.0-compat.patch
+ffmpeg_2.9.patch