Remove -Werror during build and add patch to build with GCC 4.3, thanks to Martin Väth in bug #216008.

(Portage version: 2.1.5_rc7)

3 files changed, 327 insertions, 2 deletions

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index fb1a3adb3855..ead734df37a8 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mpeg4ip
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.59 2008/04/07 22:17:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.60 2008/05/07 21:12:13 flameeyes Exp $
+
+  07 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mpeg4ip-1.5.0.1+gcc-4.3.patch, mpeg4ip-1.5.0.1-r4.ebuild:
+  Remove -Werror during build and add patch to build with GCC 4.3, thanks to
+  Martin Väth in bug #216008.
 
   07 Apr 2008; Ben de Groot <yngwin@gentoo.org> mpeg4ip-1.5.0.1-r1.ebuild,
   mpeg4ip-1.5.0.1-r3.ebuild, mpeg4ip-1.5.0.1-r4.ebuild:
diff --git a/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1+gcc-4.3.patch b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1+gcc-4.3.patch
new file mode 100644
index 000000000000..e33a84dbf4f1
--- /dev/null
+++ b/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1+gcc-4.3.patch
@@ -0,0 +1,313 @@
+--- common/video/iso-mpeg4/include/bitstrm.hpp
++++ common/video/iso-mpeg4/include/bitstrm.hpp
+@@ -45,8 +45,8 @@
+ #ifndef _BITSTREAM_HPP_
+ #define _BITSTREAM_HPP_
+ #include "inbits.h"
+-#include <istream.h>
+-#include <ostream.h>
++#include <istream>
++#include <ostream>
+ 
+ class CIOBitStream
+ {
+--- common/video/iso-mpeg4/include/entropy.hpp
++++ common/video/iso-mpeg4/include/entropy.hpp
+@@ -39,8 +39,10 @@
+ #ifndef __ENTROPY_HPP_
+ #define __ENTROPY_HPP_
+ 
+-#include <istream.h>
+-#include <ostream.h>
++#include <istream>
++#include <ostream>
++
++using namespace std;
+ 
+ class CInBitStream;
+ class COutBitStream;
+--- common/video/iso-mpeg4/include/vopseenc.hpp
++++ common/video/iso-mpeg4/include/vopseenc.hpp
+@@ -79,6 +79,8 @@
+ 
+ #include "tm5rc.hpp"
+ 
++using namespace std;
++
+ class CFwdBlockDCT;
+ 
+ // HHI Schueuer:  scan selection classes to support the sadct
+--- common/video/iso-mpeg4/src/app_encoder_encoder.cpp
++++ common/video/iso-mpeg4/src/app_encoder_encoder.cpp
+@@ -99,7 +99,7 @@
+ 
+ #include "mode.hpp"
+ #include "tm5rc.hpp"
+-#include "fstream.h"
++#include "fstream"
+ #include "sesenc.hpp"
+ // #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)
+ 
+--- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp
+@@ -54,7 +54,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp
+@@ -46,7 +46,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <assert.h>
+ 
+ #include "typeapi.h"
+--- common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp
+@@ -75,7 +75,7 @@
+ 
+ #include <stdlib.h>
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ #include "typeapi.h"
+ #include "codehead.h"
+ #include "mode.hpp"
+--- common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp
+@@ -60,7 +60,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp
+@@ -53,7 +53,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_motest.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_motest.cpp
+@@ -67,7 +67,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp
+@@ -44,7 +44,7 @@
+ 
+ **************************************************************************/
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <math.h>
+ #include <stdlib.h>
+ 
+--- common/video/iso-mpeg4/src/sys_encoder_padenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_padenc.cpp
+@@ -43,7 +43,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp
+@@ -83,8 +83,8 @@
+ #include "stdlib.h"
+ #include "stdio.h"
+ #include "math.h"
+-#include "fstream.h"
+-#include "ostream.h"
++#include "fstream"
++#include "ostream"
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp
+@@ -40,7 +40,7 @@
+ *************************************************************************/
+ 
+ #include <stdio.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include <stdlib.h>
+ 
+--- common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp
+@@ -52,7 +52,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include "header.h"
+ #include "typeapi.h"
+--- common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp
++++ common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp
+@@ -73,7 +73,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_error.cpp
++++ common/video/iso-mpeg4/src/sys_error.cpp
+@@ -35,7 +35,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "typeapi.h"
+ #include "codehead.h"
+--- common/video/iso-mpeg4/src/sys_mode.cpp
++++ common/video/iso-mpeg4/src/sys_mode.cpp
+@@ -50,7 +50,7 @@
+ 
+ 
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include "typeapi.h"
+ #include "mode.hpp"
+--- common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp
++++ common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp
+@@ -36,7 +36,7 @@
+ *************************************************************************/
+ 
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <stdlib.h>
+ 
+ #include "typeapi.h"
+--- common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp
++++ common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp
+@@ -42,8 +42,8 @@
+ 
+ *************************************************************************/
+ 
+-#include <fstream.h>
+-#include <iostream.h>
++#include <fstream>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "typeapi.h"
+--- common/video/iso-mpeg4/src/tools_entropy_huffman.cpp
++++ common/video/iso-mpeg4/src/tools_entropy_huffman.cpp
+@@ -55,7 +55,7 @@
+ #include "bitstrm.hpp"
+ 
+ #include "vlc.hpp"
+-#include <iostream.h>
++#include <iostream>
+ #ifdef __MFC_
+ #ifdef _DEBUG
+ #undef THIS_FILE
+--- common/video/iso-mpeg4/src/tools_sadct_sadct.cpp
++++ common/video/iso-mpeg4/src/tools_sadct_sadct.cpp
+@@ -37,7 +37,7 @@
+ #include "dct.hpp"
+ #include <math.h>
+ #if defined(__DEBUG_SADCT_) && !defined(NDEBUG)
+-#include <iostream.h>
++#include <iostream>
+ #endif
+ #ifdef __MFC_
+ #ifdef _DEBUG
+--- common/video/iso-mpeg4/src/type_yuvac.cpp
++++ common/video/iso-mpeg4/src/type_yuvac.cpp
+@@ -39,9 +39,11 @@
+ 
+ *************************************************************************/
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "typeapi.h"
+ 
++using namespace std;
++
+ #ifdef __MFC_
+ #ifdef _DEBUG
+ #undef THIS_FILE
+--- common/video/iso-mpeg4/src/type_yuvai.cpp
++++ common/video/iso-mpeg4/src/type_yuvai.cpp
+@@ -37,7 +37,9 @@
+ *************************************************************************/
+ 
+ #include "typeapi.h"
+-#include <iostream.h>
++#include <iostream>
++
++using namespace std;
+ 
+ #ifdef __MFC_
+ #ifdef _DEBUG
+--- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp
++++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp
+@@ -57,7 +57,7 @@
+ #include <math.h>
+ #include <assert.h>
+ // begin: added by Sharp (99/2/16)
+-#include <iostream.h>
++#include <iostream>
+ #include <sys/stat.h>
+ // end: added by Sharp (99/2/16)
+ 
+--- player/lib/audio/faad/Makefile.am
++++ player/lib/audio/faad/Makefile.am
+@@ -33,6 +33,6 @@
+ 	transfo.h\
+ 	util.h
+ INCLUDES = -I$(top_srcdir)/include
+-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing
++AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing
+ 
+ EXTRA_DIST = COPYING libfaad60.dsp README
+--- server/mp4live/video_util_resize.h
++++ server/mp4live/video_util_resize.h
+@@ -90,7 +90,7 @@
+ 
+ void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV,
+ 	     uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,
+-	     uint8_t *tY, uint8_t *tU, uint8_t *fV,
+-	     uint32_t tyStride, uint32_t tvStride, uint32_t tvStride,
++	     uint8_t *tY, uint8_t *tU, uint8_t *f_V,
++	     uint32_t tyStride, uint32_t tvStride, uint32_t tv_Stride,
+ 	     uint32_t w, uint32_t h);
+ #endif
diff --git a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild
index 553e9cacbff7..c3bffd55d536 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild,v 1.4 2008/04/07 22:17:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.5.0.1-r4.ebuild,v 1.5 2008/05/07 21:12:13 flameeyes Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -65,6 +65,13 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc42.patch"
 	epatch "${FILESDIR}/${P}-nasm-r.patch"
 	epatch "${FILESDIR}/mpeg4ip-1.5.0.1-avcodec_extern_c.patch"
+	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+
+	find "${S}" -name Makefile.am -print0 | xargs -0 \
+		sed -i -e 's:-Werror::'
+
+	find "${S}" -name configure.in -print0 | xargs -0 \
+		sed -i -e 's:-Werror::'
 
 	eautoreconf
 }