Add gcc-4.6 patches thanks to Fabio Scaccabarozzi <fsvm88@gmail.com>. Add patch for latest x264 thanks to zimous <zimous@matfyz.cz>. Bugs #364009 and #365153

(Portage version: 2.1.9.44/cvs/Linux x86_64)

6 files changed, 141 insertions, 2 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 096d5e221553..518b83a39ef8 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.183 2011/04/13 21:41:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.184 2011/04/29 14:15:38 hwoarang Exp $
+
+  29 Apr 2011; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.4-r2.ebuild,
+  +files/avidemux-2.5.4-openfileqt.patch,
+  +files/avidemux-2.5.4-x264-build115.patch, +files/avidemux-2.5.4-x264.patch,
+  +files/avidemux-2.5.4-xvid.patch:
+  Add gcc-4.6 patches thanks to Fabio Scaccabarozzi <fsvm88@gmail.com>. Add
+  patch for latest x264 thanks to zimous <zimous@matfyz.cz>. Bugs #364009 and
+  #365153
 
   13 Apr 2011; Markos Chandras <hwoarang@gentoo.org> avidemux-2.5.4-r1.ebuild,
   avidemux-2.5.4-r2.ebuild:
diff --git a/media-video/avidemux/avidemux-2.5.4-r2.ebuild b/media-video/avidemux/avidemux-2.5.4-r2.ebuild
index 1813b723d521..d39f068c8488 100644
--- a/media-video/avidemux/avidemux-2.5.4-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r2.ebuild,v 1.5 2011/04/13 21:41:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r2.ebuild,v 1.6 2011/04/29 14:15:38 hwoarang Exp $
 
 EAPI="2"
 
@@ -62,6 +62,12 @@ PATCHES=(
 	"${FILESDIR}/${P}-dummy-sound-fix.patch"
 	#bug 356373
 	"${FILESDIR}/${P}-x264-version-fix.patch"
+	#bug 365153
+	"${FILESDIR}/${P}-x264-build115.patch"
+	#bug 364009
+	"${FILESDIR}/${P}-openfileqt.patch"
+	"${FILESDIR}/${P}-x264.patch"
+	"${FILESDIR}/${P}-xvid.patch"
 )
 
 src_prepare() {
diff --git a/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch b/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch
new file mode 100644
index 000000000000..62011a9e92de
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch
@@ -0,0 +1,34 @@
+diff -Nuar avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp
+--- avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp	2011-04-18 11:34:58.797593384 +0200
++++ avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp	2011-04-18 11:37:16.122645712 +0200
+@@ -210,7 +210,9 @@
+ 				delete [] configData;

+ 

+ 				fillConfigurationComboBox();

+-				selectConfiguration(&QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);

++

++				QString temporary = QFileInfo(configFileName).completeBaseName();

++				selectConfiguration(&temporary, CONFIG_MENU_USER);

+ 			}

+ 		}

+ 	}

+@@ -316,7 +318,8 @@
+ 	{

+ 		ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget;

+ 

+-		configMenu->selectConfiguration(&QString(configName), *configType);

++		QString temporary2 = QString(configName);

++		configMenu->selectConfiguration(&temporary2, *configType);

+ 	}

+ 

+ 	void diaElemConfigMenu::finalize(void)

+@@ -356,7 +359,8 @@
+ 			}

+ 		}

+ 

+-		configMenu->selectConfiguration(&QString(configName), *configType);

++		QString temporary3 = QString(configName);

++		configMenu->selectConfiguration(&temporary3, *configType);

+ 	}

+ }

+ 

diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch b/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch
new file mode 100644
index 000000000000..c627667ecdf9
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch
@@ -0,0 +1,45 @@
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +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

+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +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,17 @@
+ 	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)

diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264.patch b/media-video/avidemux/files/avidemux-2.5.4-x264.patch
new file mode 100644
index 000000000000..5dd350608866
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-x264.patch
@@ -0,0 +1,23 @@
+diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2010-09-29 22:20:48.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-04-18 12:26:34.482304155 +0200
+@@ -343,7 +343,8 @@
+ 		delete [] xml;

+ 

+ 		fillConfigurationComboBox();

+-		selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);

++		QString temporary = QFileInfo(configFileName).completeBaseName();

++		selectConfiguration(&temporary, PLUGIN_CONFIG_USER);

+ 	}

+ 

+ 	delete [] configDirectory;

+@@ -580,7 +581,8 @@
+ 	disableGenericSlots = true;

+ 	options->getPresetConfiguration(&configurationName, &configurationType);

+ 

+-	bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);

++	QString temporary2 = QString(configurationName);

++	bool foundConfig = selectConfiguration(&temporary2, configurationType);

+ 

+ 	if (!foundConfig)

+ 		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);

diff --git a/media-video/avidemux/files/avidemux-2.5.4-xvid.patch b/media-video/avidemux/files/avidemux-2.5.4-xvid.patch
new file mode 100644
index 000000000000..6b1d2f0c8c8a
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-xvid.patch
@@ -0,0 +1,23 @@
+diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp	2010-06-07 01:07:37.000000000 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp	2011-04-18 12:12:13.640562284 +0200
+@@ -233,7 +233,8 @@
+ 		delete [] xml;

+ 

+ 		fillConfigurationComboBox();

+-		selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);

++		QString temporary = QFileInfo(configFileName).completeBaseName();

++		selectConfiguration(&temporary, PLUGIN_CONFIG_USER);

+ 	}

+ 

+ 	delete [] configDirectory;

+@@ -373,7 +374,8 @@
+ 	disableGenericSlots = true;

+ 	options->getPresetConfiguration(&configurationName, &configurationType);		

+ 

+-	bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);

++	QString temporary2 = QString(configurationName);

++	bool foundConfig = selectConfiguration(&temporary2, configurationType);

+ 

+ 	if (!foundConfig)

+ 		printf("Configuration %s (type %d) could not be found.  Using snapshot.\n", configurationName, configurationType);