Add patch to fix compilation with gcc-4.1 by Hanno Meyer-Thurow <h DOT mth AT web dot de>; bug #126287

Package-Manager: portage-2.1_pre7-r5

5 files changed, 131 insertions, 15 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index beaf548e4846..733384f66313 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.96 2006/02/15 15:38:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.97 2006/04/14 05:28:11 halcy0n Exp $
+
+  14 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/avidemux-extra-qualification.diff, avidemux-2.0.42-r1.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Hanno Meyer-Thurow <h DOT mth
+  AT web dot de>; bug #126287
 
   15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.24.ebuild,
   avidemux-2.0.42-r1.ebuild, avidemux-2.1_pre1.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index a82bcb5a3e13..443e73708f7b 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ece2910731b1f96474654269561f354b ChangeLog 17981
-RMD160 8af6545fcda82aae36690a3d06067d498b7fb994 ChangeLog 17981
-SHA256 d78ffb13f553c2d5dfcdb0efa3e7c46286d3116442d6c3e21be0526241d6caf0 ChangeLog 17981
+MD5 4eb22eb4757353344d5faae800ea564e ChangeLog 18206
+RMD160 4da9ac3fd543ea6060fbed9b1769fefa1a7010fc ChangeLog 18206
+SHA256 e6d1668d2d8b70607cee309c258dd9639963d32a55bc1684300abe2cdae1e570 ChangeLog 18206
 MD5 3b3113b07006ae2d4ce602c1c897677a avidemux-2.0.24.ebuild 2480
 RMD160 1bca89e4a8879f1b813bbd45e06e03b71721133b avidemux-2.0.24.ebuild 2480
 SHA256 ce338c18cb2ee42cb59f001a7cb687aab3ac56e279ebf4ba7795249a16610830 avidemux-2.0.24.ebuild 2480
-MD5 f90a907020a264e39050789963c7217d avidemux-2.0.42-r1.ebuild 3067
-RMD160 30ec7785df361060ab7b090b843d63ba42304665 avidemux-2.0.42-r1.ebuild 3067
-SHA256 7fd639ff987510a921aa07b28dc4f66f982cfb96d2e9ae8f1638a87892a6e536 avidemux-2.0.42-r1.ebuild 3067
+MD5 ac40d595b524be7104333c2113a66057 avidemux-2.0.42-r1.ebuild 3122
+RMD160 6ab35fed6653dbd58c4fc6c1358d7da4e78aebbb avidemux-2.0.42-r1.ebuild 3122
+SHA256 f49c191a1e7e13daa46f73c8528793a863da1c86850b2d66dbd18a147a53bc85 avidemux-2.0.42-r1.ebuild 3122
 MD5 d72930ea6010f0cce101d8aeacff9acc avidemux-2.1_pre1.ebuild 3176
 RMD160 54c922502dcba308b678b00c70552ecae71cf52b avidemux-2.1_pre1.ebuild 3176
 SHA256 b4a823ddae4345ad72a8acbe77dd0e13066030e39c6db8a44841b895d10a0b6d avidemux-2.1_pre1.ebuild 3176
+MD5 46d22d8985e6bf1f0458c33a7002c51f files/avidemux-extra-qualification.diff 4495
+RMD160 ce1abd5c5bcf48f8ff5b1b1e8c10da468efc7dc7 files/avidemux-extra-qualification.diff 4495
+SHA256 38bc81b39c6b2372c0b3bfa4b478da2b3f9975b4e2b9a0337ea295f02e9733a1 files/avidemux-extra-qualification.diff 4495
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 RMD160 ec3664b886292f1bf9289bff0f48b7e1b8ec6bda files/digest-avidemux-2.0.24 68
 SHA256 9e6fdf505b65fb5c561ab04ac156afeea0140d19b6ebcc97edf55589264ee30e files/digest-avidemux-2.0.24 68
-MD5 0d0a90c34a5456ea2cad99a4bab62b50 files/digest-avidemux-2.0.42-r1 139
-RMD160 09a6870b70ad5d22da98528bb16064f0a7f04ad0 files/digest-avidemux-2.0.42-r1 139
-SHA256 baf32300bdc707ff67992ad1889a98e5806eb1cd77275b77970f2bc69eb87b49 files/digest-avidemux-2.0.42-r1 139
+MD5 8c500f625050d9f9914afb98e6aa7fc3 files/digest-avidemux-2.0.42-r1 509
+RMD160 1354db1405bc0c4ab51289ad22e40875a3b55ec4 files/digest-avidemux-2.0.42-r1 509
+SHA256 f5b8aa496084ca92ecd88519c83b70a205b972fcff30674da436a9fd652b8a05 files/digest-avidemux-2.0.42-r1 509
 MD5 829b17a9790d79f257614bfcd384f049 files/digest-avidemux-2.1_pre1 142
 RMD160 e87b4f621c40286c27a567bf459508a9eb18b61e files/digest-avidemux-2.1_pre1 142
 SHA256 cb89bb944b95fc0feb72dad1790fb63a845ad00d80999279208dfed32aaa2807 files/digest-avidemux-2.1_pre1 142
@@ -26,9 +29,9 @@ MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f metadata.xml 251
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD80snAiZjviIA2XgRAru2AKCJxaWhQ+f5Q0XeqnGcaqyc4/Yp5ACffYoK
-8Fu855iMO8xefspJzM65/kc=
-=zDC1
+iD8DBQFEPzL1CRZPokWLroQRAlabAKCIcA7pGdJM3PEzFT2uUF21Nt1bUQCeJnp/
+ne1hxFgqDpbppNbIWKqNAnY=
+=pA5E
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.0.42-r1.ebuild b/media-video/avidemux/avidemux-2.0.42-r1.ebuild
index 6a4573b5d156..17243fa6a8a4 100644
--- a/media-video/avidemux/avidemux-2.0.42-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.0.42-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.3 2006/02/15 15:38:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.4 2006/04/14 05:28:11 halcy0n Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -69,6 +69,8 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/patches/
 
+	epatch "${FILESDIR}"/avidemux-extra-qualification.diff
+
 	cp ${WORKDIR}/${PV}/m4/* ${S}/m4 || die "cp m4 failed"
 
 	ht_fix_all
diff --git a/media-video/avidemux/files/avidemux-extra-qualification.diff b/media-video/avidemux/files/avidemux-extra-qualification.diff
new file mode 100644
index 000000000000..bdef615d7f52
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-extra-qualification.diff
@@ -0,0 +1,102 @@
+--- avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h.orig	2006-03-20 20:45:07.000000000 +0100
++++ avidemux-2.0.42/avidemux/ADM_gui2/GUI_accelRender.h	2006-03-20 20:45:23.000000000 +0100
+@@ -12,7 +12,7 @@
+ class AccelRender
+ {
+ 	public:
+-		AccelRender::AccelRender( void);
++		AccelRender( void);
+ 		virtual	uint8_t init(GtkWidget * window, uint32_t w, uint32_t h)=0;
+ 		virtual	uint8_t end(void)=0;
+ 		virtual uint8_t display(uint8_t *ptr, uint32_t w, uint32_t h)=0;
+--- avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h.orig	2006-03-20 20:37:14.000000000 +0100
++++ avidemux-2.0.42/avidemux/ADM_inpics/ADM_pics.h	2006-03-20 20:37:36.000000000 +0100
+@@ -38,9 +38,9 @@
+ 
+ 					uint32_t 		_type;
+ 
+-					uint32_t    picHeader::read32(FILE *fd);
+-					uint16_t    picHeader::read16(FILE *fd);
+-					uint8_t    picHeader::read8(FILE *fd);
++					uint32_t    read32(FILE *fd);
++					uint16_t    read16(FILE *fd);
++					uint8_t    read8(FILE *fd);
+ 
+ public:
+ //  static int checkFourCC(uint8_t *in, uint8_t *fourcc);
+--- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp.orig	2006-03-20 20:43:19.000000000 +0100
++++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDGbob.cpp	2006-03-20 20:43:40.000000000 +0100
+@@ -55,8 +55,8 @@
+         void            update(void); 
+ public:
+                                 
+-                        DGbob::DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);    
+-                        DGbob::~DGbob(void);
++                        DGbob(AVDMGenericVideoStream *in,CONFcouple *couples);    
++                        ~DGbob(void);
+         uint8_t         getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
+                                 ADMImage *data,uint32_t *flags);
+         
+--- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp.orig	2006-03-20 20:42:14.000000000 +0100
++++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecDec.cpp	2006-03-20 20:42:31.000000000 +0100
+@@ -147,8 +147,8 @@
+ 	
+ public:
+ 				
+-			Decimate::Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);    
+-			Decimate::~Decimate(void);
++			Decimate(AVDMGenericVideoStream *in,CONFcouple *couples);    
++			~Decimate(void);
+ 	uint8_t  	getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
+ 				ADMImage *data,uint32_t *flags);
+ 
+--- avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h.orig	2006-03-20 20:39:18.000000000 +0100
++++ avidemux-2.0.42/avidemux/ADM_video/ADM_vidDecTelecide.h	2006-03-20 20:40:49.000000000 +0100
+@@ -112,32 +112,32 @@
+ 
+ public:
+ 	
+-	void Telecide::CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, 
++	void CalculateMetrics(int n, unsigned char *crp, unsigned char *crpU, unsigned char *crpV, 
+ 				unsigned char *prp, unsigned char *prpU, unsigned char *prpV);
+-	void Telecide::Show(ADMImage *dst, int frame);
+-	void Telecide::Debug(int frame);
++	void Show(ADMImage *dst, int frame);
++	void Debug(int frame);
+ 
+-	Telecide::Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);		
++	Telecide(AVDMGenericVideoStream *in,CONFcouple *couples);		
+ 			
+-	Telecide::~Telecide();
++	~Telecide();
+ 
+-	void Telecide::PutChosen(int frame, unsigned int chosen);
++	void PutChosen(int frame, unsigned int chosen);
+ 	
+ 
+-	void Telecide::CacheInsert(int frame, unsigned int p, unsigned int pblock,
++	void CacheInsert(int frame, unsigned int p, unsigned int pblock,
+ 				unsigned int c, unsigned int cblock);
+ 	
+-	bool Telecide::CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
++	bool CacheQuery(int frame, unsigned int *p, unsigned int *pblock,
+ 				unsigned int *c, unsigned int *cblock);	
+ 
+-	bool Telecide::PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
++	bool PredictHardYUY2(int frame, unsigned int *predicted, unsigned int *predicted_metric) ;
+ 	
+-	struct PREDICTION *Telecide::PredictSoftYUY2(int frame);
++	struct PREDICTION *PredictSoftYUY2(int frame);
+ 
+-	void Telecide::WriteHints(unsigned char *dst, bool film, bool inpattern);
+-	virtual uint8_t Telecide::getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
++	void WriteHints(unsigned char *dst, bool film, bool inpattern);
++	virtual uint8_t getFrameNumberNoAlloc(uint32_t frame, uint32_t *len,
+ 				ADMImage *data,uint32_t *flags);
+-	char *Telecide::printConf( void );
+-	uint8_t Telecide::configure(AVDMGenericVideoStream *in);
+-	uint8_t	Telecide::getCoupledConf( CONFcouple **couples);
++	char *printConf( void );
++	uint8_t configure(AVDMGenericVideoStream *in);
++	uint8_t	getCoupledConf( CONFcouple **couples);
+ };
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.42-r1 b/media-video/avidemux/files/digest-avidemux-2.0.42-r1
index 6b76aeae3c5b..b4a33a58a694 100644
--- a/media-video/avidemux/files/digest-avidemux-2.0.42-r1
+++ b/media-video/avidemux/files/digest-avidemux-2.0.42-r1
@@ -1,2 +1,6 @@
 MD5 d30f1bb981767bca793d78067bcfe084 avidemux-2.0.42.tar.gz 3817449
+RMD160 e48cc0bad40a400c7e03e7cedb1489049b4f6cca avidemux-2.0.42.tar.gz 3817449
+SHA256 82d04e7a827187725f5004ac90b35db81e4c18d5eef8eed8369e1b59ee1d97ce avidemux-2.0.42.tar.gz 3817449
 MD5 314726fbe3a158debaaa891b5dc7d198 avidemux-patches-11.tar.bz2 17159
+RMD160 f7056e59a1bb8a316b59e83490e4503db426bb25 avidemux-patches-11.tar.bz2 17159
+SHA256 00e98343522d0a89adc4da057a2283ae3a0c32d84768af3a3664f4a028a60e9e avidemux-patches-11.tar.bz2 17159