Merge lp:~vanvugt/ubuntu/precise/avidemux/fix-831096 into lp:ubuntu/precise/avidemux

[Daniel van Vugt]

Fix build failure of 1:2.5.4-0ubuntu7 (LP: #831096) due to:
  - changed structure members in x264.h release 115 and later;
  - missing install rule for i18n files;
  - missing dependency on xsltproc, causing unpredictable failures on systems without xsltproc.

[Daniel van Vugt (vanvugt)]

This proposal was developed on an amd64 Ubuntu 11.10 system. But also tested on an i386 Ubuntu 11.10 VM where I found the (very frustrating) xsltproc problem too.

[Daniel van Vugt (vanvugt)]

It should be noted that all 3 of these fixes already exist in debian-multimedia (avidemux_2.5.5-0.3).

[Daniel van Vugt (vanvugt)]

Very confusing -

This proposal hasn't been merged yet but it has been published here:
https://launchpad.net/ubuntu/+source/avidemux/1:2.5.4-0ubuntu8

=== modified file 'debian/avidemux-common.install'
--- debian/avidemux-common.install	2009-07-13 16:56:09 +0000
+++ debian/avidemux-common.install	2011-10-17 10:50:30 +0000
@@ -1,3 +1,4 @@
 usr/share/icons
 usr/share/locale
 usr/share/ADM_scripts
+usr/share/avidemux/i18n

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-12 11:36:01 +0000
+++ debian/changelog	2011-10-17 10:50:30 +0000
@@ -1,3 +1,13 @@
+avidemux (1:2.5.4-0ubuntu8) precise; urgency=low
+
+  * Fix build failure of 1:2.5.4-0ubuntu7 (LP: #831096) due to:
+    - changed structure members in x264.h release 115 and later;
+    - missing install rule for i18n files;
+    - missing dependency on xsltproc, causing unpredictable failures
+      on systems without xsltproc.
+
+ -- Daniel van Vugt <[e-mail]>  Mon, 17 Oct 2011 17:27:32 +0800
+
 avidemux (1:2.5.4-0ubuntu7) oneiric; urgency=low
 
   * Add patch to fix audio in avidemux2_qt4 (LP: #774912).

=== modified file 'debian/control'
--- debian/control	2011-05-12 11:36:01 +0000
+++ debian/control	2011-10-17 10:50:30 +0000
@@ -34,6 +34,7 @@
  libjack-dev,
  libpulse-dev,
  yasm [i386 amd64],
+ xsltproc,
  libopencore-amrnb-dev,
  libopencore-amrwb-dev
 Vcs-Git: git://git.debian.org/collab-maint/avidemux.git

=== added file 'debian/patches/32-x264-115.patch'
--- debian/patches/32-x264-115.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/32-x264-115.patch	2011-10-17 10:50:30 +0000
@@ -0,0 +1,52 @@
+Description: Fix build failure with libx264 >= 115
+ The structure member x264_param_t.i_open_gop was renamed to b_open_gop in
+ x264.h version 115.
+Origin: http://debian-multimedia.org/pool/main/a/avidemux/avidemux_2.5.5-0.3.diff.gz
+Bug-Ubuntu: https://launchpad.net/bugs/831096
+
+Index: avidemux-2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
+===================================================================
+--- avidemux-2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-06-07 08:37:03.127997243 +0200
++++ avidemux-2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-06-07 08:38:06.281464832 +0200
+@@ -488,8 +488,10 @@
+ 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+Index: avidemux-2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+===================================================================
+--- avidemux-2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-06-07 08:38:15.341100944 +0200
++++ avidemux-2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-06-07 08:41:08.114138787 +0200
+@@ -417,7 +417,7 @@
+ 	_param.b_cabac = cabac;
+ }
+ 
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ 	return _param.i_open_gop;
+@@ -428,6 +428,16 @@
+ 	if (openGopMode < 3)
+ 		_param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++	return _param.b_open_gop;
++}
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++	if (openGopMode < 3)
++		_param.b_open_gop = openGopMode;
++}
+ #endif
+ 
+ unsigned int x264Options::getInterlaced(void)

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-12 11:36:01 +0000
+++ debian/patches/series	2011-10-17 10:50:30 +0000
@@ -9,3 +9,5 @@
 22-mpegdemuxer.patch
 30-fix_avidemux2_qt4_audio.patch
 31-gcc46.patch
+32-x264-115.patch
+