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

(Portage version: 2.1_pre7-r5)

2 files changed, 106 insertions, 0 deletions

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