Control: tags -1 + pending

Dear maintainer,

I've prepared an NMU for jugglemaster (versioned as 0.4-6.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
-- 
Sebastian Ramacher
diff -Nru jugglemaster-0.4/debian/changelog jugglemaster-0.4/debian/changelog
--- jugglemaster-0.4/debian/changelog	2011-11-25 12:48:46.000000000 +0100
+++ jugglemaster-0.4/debian/changelog	2013-09-03 01:13:53.000000000 +0200
@@ -1,3 +1,11 @@
+jugglemaster (0.4-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/libav9.patch: Fix build with libav 9. Thanks to Moritz
+    Muehlenhoff for the patch. (Closes: #720823)
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Tue, 03 Sep 2013 01:13:50 +0200
+
 jugglemaster (0.4-6) unstable; urgency=low
 
   * Fix "[aajm] Broken pronoun "It" (JuggleMaster) in extended
diff -Nru jugglemaster-0.4/debian/patches/libav9.patch jugglemaster-0.4/debian/patches/libav9.patch
--- jugglemaster-0.4/debian/patches/libav9.patch	1970-01-01 01:00:00.000000000 +0100
+++ jugglemaster-0.4/debian/patches/libav9.patch	2013-09-03 01:09:27.000000000 +0200
@@ -0,0 +1,34 @@
+Description: Fix build with libav 9
+Author: Moritz Muehlenhoff <j...@inutil.org>
+Bug-Debian: http://bugs.debian.org/720823
+Last-Update: 2013-09-03
+
+diff -aur jugglemaster-0.4.orig/src/jmdlx/print.cpp jugglemaster-0.4/src/jmdlx/print.cpp
+--- jugglemaster-0.4.orig/src/jmdlx/print.cpp	2013-07-23 10:02:49.000000000 +0200
++++ jugglemaster-0.4/src/jmdlx/print.cpp	2013-07-23 10:12:46.192000000 +0200
+@@ -544,7 +544,6 @@
+ 	outputfile = fopen((const char *)filename->GetValue().mb_str(wxConvUTF8),"w");
+ 	if(outputfile == NULL) return 1;
+ 
+-	avcodec_init();
+ 	avcodec_register_all();
+ 
+ 	codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO);
+@@ -552,7 +551,7 @@
+ 		return(1);
+ 	}
+ 
+-	c= avcodec_alloc_context();
++	c= avcodec_alloc_context3(codec);
+ 	picture= avcodec_alloc_frame();
+ 
+ 	c->bit_rate = 400000;
+@@ -565,7 +564,7 @@
+ 	c->max_b_frames=1;
+ 	c->pix_fmt = PIX_FMT_YUV420P;
+ 
+-	if (avcodec_open(c, codec) < 0) {
++	if (avcodec_open2(c, codec, NULL) < 0) {
+ 		return(1);
+ 	}
+ 
diff -Nru jugglemaster-0.4/debian/patches/series jugglemaster-0.4/debian/patches/series
--- jugglemaster-0.4/debian/patches/series	2011-11-11 04:18:51.000000000 +0100
+++ jugglemaster-0.4/debian/patches/series	2013-09-03 01:07:49.000000000 +0200
@@ -9,3 +9,4 @@
 fix-memory-zeroing.patch
 wx28-compatibility.patch
 ld-as-needed.patch
+libav9.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to