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

[Paul Wise]

Author: pabs
Date: 2011-02-21 05:42:27 +0000 (Mon, 21 Feb 2011)
New Revision: 11813

Added:
   packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch
Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/patches/series
Log:
Add a patch to fix compiling with ffmpeg support (Closes: #597831)

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2011-02-21 05:37:13 UTC (rev 11812)
+++ packages/trunk/jugglemaster/debian/changelog	2011-02-21 05:42:27 UTC (rev 11813)
@@ -7,6 +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)
 
  -- Paul Wise <pabs at debian.org>  Sat, 19 Feb 2011 10:22:44 +0800
 

Modified: packages/trunk/jugglemaster/debian/patches/series
===================================================================
--- packages/trunk/jugglemaster/debian/patches/series	2011-02-21 05:37:13 UTC (rev 11812)
+++ packages/trunk/jugglemaster/debian/patches/series	2011-02-21 05:42:27 UTC (rev 11813)
@@ -4,3 +4,4 @@
 010_wx26_trans.patch
 jmlib_sscanf_locale.patch
 jmlib_style_parsing.patch
+wx26_trans_ffmpeg.patch

Added: packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch	                        (rev 0)
+++ packages/trunk/jugglemaster/debian/patches/wx26_trans_ffmpeg.patch	2011-02-21 05:42:27 UTC (rev 11813)
@@ -0,0 +1,30 @@
+Author: Di Biase José Luis <josx at interorganic.com.ar>
+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 @@
+ 
+ #ifdef HAVE_AVCODEC_H
+ 	output_type->Append("MPEG");
+-	output_type->SetStringSelection("MPEG");
++	output_type->SetStringSelection(wxT("MPEG"));
+ #endif
+ 
+ 	typesizer->Add(new wxStaticText(this, 0, "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();