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

[Paul Wise]

Author: pabs
Date: 2011-02-21 06:47:50 +0000 (Mon, 21 Feb 2011)
New Revision: 11816

Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/control
   packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch
Log:
Fix and enable the ffmpeg support (Closes: #597831)

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2011-02-21 06:01:36 UTC (rev 11815)
+++ packages/trunk/jugglemaster/debian/changelog	2011-02-21 06:47:50 UTC (rev 11816)
@@ -7,7 +7,7 @@
   * Bump Standards-Version, no changes needed
   * Add a patch to fix locale issues when loading files (Closes: #528564)
   * Add patch to fix hand movements during tricks (Closes: #537503)
-  * Add a patch to fix compiling with ffmpeg support (Closes: #597831)
+  * Fix and enable the ffmpeg support (Closes: #597831)
   * (C) is not recognised, use Copyright instead
 
  -- Paul Wise <pabs at debian.org>  Sat, 19 Feb 2011 10:22:44 +0800

Modified: packages/trunk/jugglemaster/debian/control
===================================================================
--- packages/trunk/jugglemaster/debian/control	2011-02-21 06:01:36 UTC (rev 11815)
+++ packages/trunk/jugglemaster/debian/control	2011-02-21 06:47:50 UTC (rev 11816)
@@ -5,6 +5,7 @@
 Uploaders: Helmut Grohne <helmut at subdivi.de>
 Build-Depends: debhelper (>= 7.0.50~),
  libaa1-dev,
+ libavcodec-dev,
  libwxgtk2.6-dev
 Standards-Version: 3.9.1
 Homepage: http://icculus.org/jugglemaster/

Modified: packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch	2011-02-21 06:01:36 UTC (rev 11815)
+++ packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch	2011-02-21 06:47:50 UTC (rev 11816)
@@ -1,14 +1,72 @@
-Author: Di Biase José Luis <josx at interorganic.com.ar>
+Author: Di Biase José Luis <josx at interorganic.com.ar>, Paul Wise <pabs at debian.org>
 Description: fixes for compiling with ffmpeg video support
 Bug-Debian: http://bugs.debian.org/597831
 --- a/src/jmdlx/print.cpp
 +++ b/src/jmdlx/print.cpp
-@@ -68,7 +68,7 @@
+--- a/src/jmdlx/print.cpp
++++ b/src/jmdlx/print.cpp
+@@ -67,8 +67,8 @@
+ 	output_type->SetStringSelection(wxT("PostScript"));
  
  #ifdef HAVE_AVCODEC_H
- 	output_type->Append("MPEG");
+-	output_type->Append("MPEG");
 -	output_type->SetStringSelection("MPEG");
++	output_type->Append(wxT("MPEG"));
 +	output_type->SetStringSelection(wxT("MPEG"));
  #endif
  
  	typesizer->Add(new wxStaticText(this, 0, wxT("Output Type")),
+@@ -535,13 +535,13 @@
+ 	wxMemoryDC dc;
+ 	struct ball firstpos[BMAX];
+ 
+-	wxProgressDialog progress("Progress","Creating MPEG",
++	wxProgressDialog progress(wxT("Progress"),wxT("Creating MPEG"),
+ 		max_iterations->GetValue(), this, wxPD_APP_MODAL|wxPD_CAN_ABORT);
+ 
+ 	int current_frames = 0;
+ 	int done = 0;
+ 
+-	outputfile = fopen((const char *)filename->GetValue(),"w");
++	outputfile = fopen((const char *)filename->GetValue().mb_str(wxConvUTF8),"w");
+ 	if(outputfile == NULL) return 1;
+ 
+ 	avcodec_init();
+@@ -559,8 +559,8 @@
+ 	c->width = jmlib->getImageWidth();
+ 	c->height = jmlib->getImageHeight();
+ 	/* c->frame_rate = 70/delay->GetValue(); */
+-	c->frame_rate = 25;
+-	c->frame_rate_base= 1;
++	c->time_base.den = 25;
++	c->time_base.num = 1;
+ 	c->gop_size = 30;
+ 	c->max_b_frames=1;
+ 
+--- a/src/jmdlx/Makefile
++++ b/src/jmdlx/Makefile
+@@ -9,8 +9,7 @@
+ INSTALL=install
+ 
+ ifeq ($(HAVE_FFMPEG), 1)
+-CXXFLAGS+=-DHAVE_AVCODEC_H -I$(FFMPEG_PREFIX)/libavcodec
+-LDFLAGS+=-L$(FFMPEG_PREFIX)/libavcodec
++CXXFLAGS+=-DHAVE_AVCODEC_H
+ LIBS+=-lavcodec
+ endif
+ 
+--- a/src/jmdlx/print.h
++++ b/src/jmdlx/print.h
+@@ -25,7 +25,10 @@
+ #include "jmdlx.h"
+ 
+ #ifdef HAVE_AVCODEC_H
+-#include "avcodec.h"
++extern "C" {
++#define __STDC_CONSTANT_MACROS 1
++#include <libavcodec/avcodec.h>
++}
+ #endif
+ 
+ class Print : public wxDialog {
+