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

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

7 files changed, 160 insertions, 17 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/Manifest b/media-video/avidemux/Manifest
index 6c0ed28c825e..45e7f348b561 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -12,7 +12,11 @@ AUX avidemux-2.5.3-build-plugins-fix.patch 469 RMD160 9788ca88e4016b90e7e4fd2a17
 AUX avidemux-2.5.3-fix-fgets-fortify.patch 1313 RMD160 8f0d81b331ad6f28f3e989f11a07a7d9b3fae4d7 SHA1 c41b1116970660a051c87c7e536ad36e1ca5a3e6 SHA256 f75bf00058715479d4e1d531e81aefc6db8375de509b3001bdba0332a6bb09fd
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 RMD160 5099949dfb00bfcda59cfc00d9bd25c0ecd60807 SHA1 df33b52bedcce4db40b4f85f2238e2dfd3e973a6 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef
 AUX avidemux-2.5.4-dummy-sound-fix.patch 476 RMD160 6c784197aa444a1722f0b540d1da02bd4b5d7aa3 SHA1 1ac354248a653d42f87820a1911a4f35888ec7ca SHA256 652c5403b93fa2b4f400d2790dbe75c36b8f98ce1a7d4d0647307e67888683d3
+AUX avidemux-2.5.4-openfileqt.patch 1285 RMD160 3958f97459b093daf297a5d85b199b2b565202f7 SHA1 acbe1c6504c37f6273b046ec79ac9306a15265d1 SHA256 0862ffa672d9b8d9f48d9b07b384e70be304edde080280cbfc8f3b2fc60bda13
+AUX avidemux-2.5.4-x264-build115.patch 1924 RMD160 44b0a75844f8236e7f2363b3e4dd00b64a3d5bfe SHA1 62b41d7fb9e960a0e5bef1b99ab4a2bb493bfabb SHA256 a938d5fca951ea59f8e8181f40a441d6a320317a287a2d039f9883f14c3bb16f
 AUX avidemux-2.5.4-x264-version-fix.patch 4001 RMD160 9644a443bf6b9ab31c02ff628525504291bd7f03 SHA1 a75529d04ea9fb1ebf21d9c9d19c332389bda3a7 SHA256 cce9317b111ff08bd47aee52bf417abeadac90f8bd8076461ed5abcbc20ce213
+AUX avidemux-2.5.4-x264.patch 1248 RMD160 9f797ef1e22931088c19ef336d26c64d003446a1 SHA1 02f0e48332f679cddc3f52d95b6d36b1ac2fb9e7 SHA256 d7358d15c84132893f4509f46a887c8749cfb22bac42601f2afbbec1340b422a
+AUX avidemux-2.5.4-xvid.patch 1250 RMD160 8be1d4553a02a20a1ab14471adb46ebe4c5bf362 SHA1 0128d046cb78e52d6fab4e2c4098cb2db2434959 SHA256 679b6d9d2ac05fa74a29ff2fa74b3d9a425e841b39426c84a2203e308b66b85b
 AUX avidemux-pulseaudiosimple.patch 840 RMD160 7ac4ec7030524c94400cefc3eaf7b9cc55b65958 SHA1 4cff8353b11008c7da880357ef32c4c59fdcbe50 SHA256 1fa35c31f95e7276e816c47ba46977e4ad102ccf70652f95196df1bf9a1587b1
 AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
 DIST avidemux-2.5-r5428.tar.bz2 11433656 RMD160 ae72e5d03f2c12b1a9e64ed9cd57a00c84eac841 SHA1 d29d7a2d1054108bc20b4371be9c5ab29816a2e6 SHA256 42e3d596d8ac106120f88a77442a5a916fd34c64b09940f70d3156221cd7e50c
@@ -24,23 +28,23 @@ EBUILD avidemux-2.5.1_p5428.ebuild 4857 RMD160 4fd54ea871c0d7538dc912cfa41df99de
 EBUILD avidemux-2.5.2.ebuild 5052 RMD160 ca2ca7915983430614dbcca64945491a8f7eac07 SHA1 3218e147678317326c8fa88657a175f800d22d79 SHA256 97e2f83b5cbdaf3f41551814193ebe4f1e99c4dd03d174428a00bacb1a1449f5
 EBUILD avidemux-2.5.3-r3.ebuild 5165 RMD160 99a00e99f0f186bb0c18728ba66d83467daaf680 SHA1 cf6f88c8454ff8b5142ad26465fa12e0c8a66486 SHA256 80e79c241eb193d6b9761dbdd157bc0005e4641884407d36eedb6f08eea91723
 EBUILD avidemux-2.5.4-r1.ebuild 4354 RMD160 acaf65aacd80de3f8b1d6f7c32bc15058030c2a7 SHA1 a9b7ba0ff81fc126aad8e54c32a48563985a4608 SHA256 dd399bc2064d9e51e1f96e03de6fde8e2e02d3cbf897f5044c419383f9f03e4f
-EBUILD avidemux-2.5.4-r2.ebuild 4408 RMD160 727804bee9ad185277b436721a72d3467f83a2d9 SHA1 c88c90415090a956fd02866ab874ebd48c359e78 SHA256 0af1b1e5f9484ce0389b66e8601bb04ea7b9417a9cf10443491533410df2490e
-MISC ChangeLog 33180 RMD160 6822fd1d5a1cebdbebb17599355df24082a88bae SHA1 619461772e8a60ea77b6b6804e508ef54a9ad724 SHA256 abefa7acf506947408ba4c3f1c60df45a3b28464a15afcfabfcb212a2fcd0106
+EBUILD avidemux-2.5.4-r2.ebuild 4573 RMD160 476437402af4f5197d3e535de5423c58a181893e SHA1 f7e65945685fa3cd833f4db2d244ddeb57f6406a SHA256 d22be01176cf95574715a88437896d739416aa61ae14fcbd0687984d532a3a1b
+MISC ChangeLog 33581 RMD160 6cdc42ecb5a1cb8a2e0e55d05dea96768cc7bf8c SHA1 be8e5e2348c916098df84fa9e98650f1f8d4ff8f SHA256 2eda28208fc3ded2841d568262f65c6d1b03a1f1db7f8117281042cb5f668e74
 MISC metadata.xml 485 RMD160 95a87d5c668b8ebcf81bda32aa17066dd4c8482e SHA1 0b52f00590772f6caa104e4a8ac830ddf230e95c SHA256 07609a99bbf9772db5da33f0a6fe4fd72f1e6d60ccd96961ee9032bcd331b5c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNpjTfAAoJEPqDWhW0r/LCvCwP/2WupolJdH6VyebaImLR4PSi
-4IsdS2ahyuzk2gfzEBGJGGOY4xvmfChxcuYtG/zv7bW+zWFu624KmjNJ+G+XD58/
-cuGNEVbJJqiMVxwL51CPRRqLVp5Ktt36O2ID930rFYYldEw8XzMnxCgib+Sgov7y
-aiVWezp8aj1wsOmuLyaj4aT15zdyVTCHrF+m07RFpFMQWfQ0jtiEAZmcfiC45cSi
-7FSe03u7sEkzCVUkqUGFFkNh3ZzDsv0y1E8xG3LYDCiIgny0ym0PMIpPRoTW9ZRR
-eblNmzhUvSEPXcq03VOXwaYn6hrABt6FREmt1Y3aHb9NSbcqDvSz7JuF9vBAjJhx
-aLqxGLFCGYbMzbQcmLzCIr5DSuZM7ZXz4+O/9EyXnUcpEm5htOLtIU/TUxkC4Ek0
-zZUw4flmiUseCM2DVzp3HhHZcY+jPaMoaEkz9MTzR9XrpJ8SP/fSL/jMwnaD58eB
-fbwEZgvNywzoMme/bXMgw0d0W8p4S4JE8ZfD7c1FP6nDq36UW7e9Y6abk3/RyPuW
-n3xA2EvdoTVZXn5g3vLunphTmCy2fVOcwBn0KvCNjFqDzeRkkSJONWY11H6sENDY
-K23mo6k21wPQDZ6mnh6pBfcsWrLKmuEoCIalAEv27mUgTn5B60Iui0JUznBlCRpF
-LKRXbCwaGpQ0j7/JNmIM
-=RwjQ
+iQIcBAEBCgAGBQJNusgKAAoJEPqDWhW0r/LCZ2MQAJqriy5t/gpU/d9FqNZ0faQC
+fjdaApOu86kK7xhGclxJwnh3498Tw0GFkb9WFg0jwoDgyERKKl/biaq2gflugklB
+AidJU+KoOiJmHTY/ciSMpttNqIP2YzpP7+vdRMapZKno+O021uC0xDw5oRn3wFPQ
+BjPqndJeuQur00SUZCtaU/8pMpC10GbL5yjSHjTJ4cQMAGDwglh30ulTiuUUGjAh
+MoRGor3v/1gOkv2poMgvgbewokdxwkgASIpiYGXGoB8H5pKIJ04EicsOYEbl76XY
+wraezRHyA1iM7Wmp03KJkbu3PaElo3Pe4bCBpuQraQ3M1C5SzHl3AWFbIlbjrySz
+zC/yW1vEdkh2chdOZJg2p2NbdwMYKTcZrP/yjkLUej5CZB06f1xdVUUlX3hUjZN7
+wonqSyZmDtNVsSR1xy3xsGFrXRfC5+BLITKBYePyWcS61fRuXwVSBh/paYTO1fB+
+PRcQiyqfW0miet5nLHAL6VhTXvczeSrtPQglgbvUM8cEZbXcodL8jRS1YKvvctgc
+GjedBrvMwaHhL5HQIiMoZRK//VBfQnhOSQEcMVwn3NAy3m+QvQrLERB2YFi7YmnI
+926HhUZKc3rnlvGvdDeQTBtRQxMmjTfkYc9C6vlkS01k4kRRVb1NojPdQSmgDSNZ
+eVRdLMTcCaMW/YcKe/Oe
+=03eA
 -----END PGP SIGNATURE-----
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);