| 1 |
flameeyes 08/05/07 21:12:14 |
| 2 |
|
| 3 |
Added: mpeg4ip-1.5.0.1+gcc-4.3.patch |
| 4 |
Log: |
| 5 |
Remove -Werror during build and add patch to build with GCC 4.3, thanks to Martin Väth in bug #216008. |
| 6 |
(Portage version: 2.1.5_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/mpeg4ip/files/mpeg4ip-1.5.0.1+gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1+gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mpeg4ip/files/mpeg4ip-1.5.0.1+gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mpeg4ip-1.5.0.1+gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
--- common/video/iso-mpeg4/include/bitstrm.hpp |
| 17 |
+++ common/video/iso-mpeg4/include/bitstrm.hpp |
| 18 |
@@ -45,8 +45,8 @@ |
| 19 |
#ifndef _BITSTREAM_HPP_ |
| 20 |
#define _BITSTREAM_HPP_ |
| 21 |
#include "inbits.h" |
| 22 |
-#include <istream.h> |
| 23 |
-#include <ostream.h> |
| 24 |
+#include <istream> |
| 25 |
+#include <ostream> |
| 26 |
|
| 27 |
class CIOBitStream |
| 28 |
{ |
| 29 |
--- common/video/iso-mpeg4/include/entropy.hpp |
| 30 |
+++ common/video/iso-mpeg4/include/entropy.hpp |
| 31 |
@@ -39,8 +39,10 @@ |
| 32 |
#ifndef __ENTROPY_HPP_ |
| 33 |
#define __ENTROPY_HPP_ |
| 34 |
|
| 35 |
-#include <istream.h> |
| 36 |
-#include <ostream.h> |
| 37 |
+#include <istream> |
| 38 |
+#include <ostream> |
| 39 |
+ |
| 40 |
+using namespace std; |
| 41 |
|
| 42 |
class CInBitStream; |
| 43 |
class COutBitStream; |
| 44 |
--- common/video/iso-mpeg4/include/vopseenc.hpp |
| 45 |
+++ common/video/iso-mpeg4/include/vopseenc.hpp |
| 46 |
@@ -79,6 +79,8 @@ |
| 47 |
|
| 48 |
#include "tm5rc.hpp" |
| 49 |
|
| 50 |
+using namespace std; |
| 51 |
+ |
| 52 |
class CFwdBlockDCT; |
| 53 |
|
| 54 |
// HHI Schueuer: scan selection classes to support the sadct |
| 55 |
--- common/video/iso-mpeg4/src/app_encoder_encoder.cpp |
| 56 |
+++ common/video/iso-mpeg4/src/app_encoder_encoder.cpp |
| 57 |
@@ -99,7 +99,7 @@ |
| 58 |
|
| 59 |
#include "mode.hpp" |
| 60 |
#include "tm5rc.hpp" |
| 61 |
-#include "fstream.h" |
| 62 |
+#include "fstream" |
| 63 |
#include "sesenc.hpp" |
| 64 |
// #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12) |
| 65 |
|
| 66 |
--- common/video/iso-mpeg4/src/sys_encoder_errenc.cpp |
| 67 |
+++ common/video/iso-mpeg4/src/sys_encoder_errenc.cpp |
| 68 |
@@ -54,7 +54,7 @@ |
| 69 |
#include <stdio.h> |
| 70 |
#include <math.h> |
| 71 |
#include <stdlib.h> |
| 72 |
-#include <iostream.h> |
| 73 |
+#include <iostream> |
| 74 |
|
| 75 |
#include "typeapi.h" |
| 76 |
#include "codehead.h" |
| 77 |
--- common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp |
| 78 |
+++ common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp |
| 79 |
@@ -46,7 +46,7 @@ |
| 80 |
#include <stdio.h> |
| 81 |
#include <math.h> |
| 82 |
#include <stdlib.h> |
| 83 |
-#include <iostream.h> |
| 84 |
+#include <iostream> |
| 85 |
#include <assert.h> |
| 86 |
|
| 87 |
#include "typeapi.h" |
| 88 |
--- common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp |
| 89 |
+++ common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp |
| 90 |
@@ -75,7 +75,7 @@ |
| 91 |
|
| 92 |
#include <stdlib.h> |
| 93 |
#include <math.h> |
| 94 |
-#include <iostream.h> |
| 95 |
+#include <iostream> |
| 96 |
#include "typeapi.h" |
| 97 |
#include "codehead.h" |
| 98 |
#include "mode.hpp" |
| 99 |
--- common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp |
| 100 |
+++ common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp |
| 101 |
@@ -60,7 +60,7 @@ |
| 102 |
#include <stdio.h> |
| 103 |
#include <math.h> |
| 104 |
#include <stdlib.h> |
| 105 |
-#include <iostream.h> |
| 106 |
+#include <iostream> |
| 107 |
|
| 108 |
#include "typeapi.h" |
| 109 |
#include "codehead.h" |
| 110 |
--- common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp |
| 111 |
+++ common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp |
| 112 |
@@ -53,7 +53,7 @@ |
| 113 |
#include <stdio.h> |
| 114 |
#include <math.h> |
| 115 |
#include <stdlib.h> |
| 116 |
-#include <iostream.h> |
| 117 |
+#include <iostream> |
| 118 |
|
| 119 |
#include "typeapi.h" |
| 120 |
#include "codehead.h" |
| 121 |
--- common/video/iso-mpeg4/src/sys_encoder_motest.cpp |
| 122 |
+++ common/video/iso-mpeg4/src/sys_encoder_motest.cpp |
| 123 |
@@ -67,7 +67,7 @@ |
| 124 |
#include <stdio.h> |
| 125 |
#include <math.h> |
| 126 |
#include <stdlib.h> |
| 127 |
-#include <iostream.h> |
| 128 |
+#include <iostream> |
| 129 |
|
| 130 |
#include "typeapi.h" |
| 131 |
#include "codehead.h" |
| 132 |
--- common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp |
| 133 |
+++ common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp |
| 134 |
@@ -44,7 +44,7 @@ |
| 135 |
|
| 136 |
**************************************************************************/ |
| 137 |
#include <stdio.h> |
| 138 |
-#include <fstream.h> |
| 139 |
+#include <fstream> |
| 140 |
#include <math.h> |
| 141 |
#include <stdlib.h> |
| 142 |
|
| 143 |
--- common/video/iso-mpeg4/src/sys_encoder_padenc.cpp |
| 144 |
+++ common/video/iso-mpeg4/src/sys_encoder_padenc.cpp |
| 145 |
@@ -43,7 +43,7 @@ |
| 146 |
#include <stdio.h> |
| 147 |
#include <math.h> |
| 148 |
#include <stdlib.h> |
| 149 |
-#include <iostream.h> |
| 150 |
+#include <iostream> |
| 151 |
|
| 152 |
#include "typeapi.h" |
| 153 |
#include "codehead.h" |
| 154 |
--- common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp |
| 155 |
+++ common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp |
| 156 |
@@ -83,8 +83,8 @@ |
| 157 |
#include "stdlib.h" |
| 158 |
#include "stdio.h" |
| 159 |
#include "math.h" |
| 160 |
-#include "fstream.h" |
| 161 |
-#include "ostream.h" |
| 162 |
+#include "fstream" |
| 163 |
+#include "ostream" |
| 164 |
|
| 165 |
#include "typeapi.h" |
| 166 |
#include "codehead.h" |
| 167 |
--- common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp |
| 168 |
+++ common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp |
| 169 |
@@ -40,7 +40,7 @@ |
| 170 |
*************************************************************************/ |
| 171 |
|
| 172 |
#include <stdio.h> |
| 173 |
-#include <iostream.h> |
| 174 |
+#include <iostream> |
| 175 |
#include <math.h> |
| 176 |
#include <stdlib.h> |
| 177 |
|
| 178 |
--- common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp |
| 179 |
+++ common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp |
| 180 |
@@ -52,7 +52,7 @@ |
| 181 |
|
| 182 |
#include <stdio.h> |
| 183 |
#include <stdlib.h> |
| 184 |
-#include <iostream.h> |
| 185 |
+#include <iostream> |
| 186 |
#include <math.h> |
| 187 |
#include "header.h" |
| 188 |
#include "typeapi.h" |
| 189 |
--- common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp |
| 190 |
+++ common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp |
| 191 |
@@ -73,7 +73,7 @@ |
| 192 |
#include <stdio.h> |
| 193 |
#include <math.h> |
| 194 |
#include <stdlib.h> |
| 195 |
-#include <iostream.h> |
| 196 |
+#include <iostream> |
| 197 |
|
| 198 |
#include "typeapi.h" |
| 199 |
#include "codehead.h" |
| 200 |
--- common/video/iso-mpeg4/src/sys_error.cpp |
| 201 |
+++ common/video/iso-mpeg4/src/sys_error.cpp |
| 202 |
@@ -35,7 +35,7 @@ |
| 203 |
#include <stdio.h> |
| 204 |
#include <math.h> |
| 205 |
#include <stdlib.h> |
| 206 |
-#include <iostream.h> |
| 207 |
+#include <iostream> |
| 208 |
|
| 209 |
#include "typeapi.h" |
| 210 |
#include "codehead.h" |
| 211 |
--- common/video/iso-mpeg4/src/sys_mode.cpp |
| 212 |
+++ common/video/iso-mpeg4/src/sys_mode.cpp |
| 213 |
@@ -50,7 +50,7 @@ |
| 214 |
|
| 215 |
|
| 216 |
#include <string.h> |
| 217 |
-#include <iostream.h> |
| 218 |
+#include <iostream> |
| 219 |
#include <math.h> |
| 220 |
#include "typeapi.h" |
| 221 |
#include "mode.hpp" |
| 222 |
--- common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp |
| 223 |
+++ common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp |
| 224 |
@@ -36,7 +36,7 @@ |
| 225 |
*************************************************************************/ |
| 226 |
|
| 227 |
#include <stdio.h> |
| 228 |
-#include <fstream.h> |
| 229 |
+#include <fstream> |
| 230 |
#include <stdlib.h> |
| 231 |
|
| 232 |
#include "typeapi.h" |
| 233 |
--- common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp |
| 234 |
+++ common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp |
| 235 |
@@ -42,8 +42,8 @@ |
| 236 |
|
| 237 |
*************************************************************************/ |
| 238 |
|
| 239 |
-#include <fstream.h> |
| 240 |
-#include <iostream.h> |
| 241 |
+#include <fstream> |
| 242 |
+#include <iostream> |
| 243 |
#include <stdio.h> |
| 244 |
#include <stdlib.h> |
| 245 |
#include "typeapi.h" |
| 246 |
--- common/video/iso-mpeg4/src/tools_entropy_huffman.cpp |
| 247 |
+++ common/video/iso-mpeg4/src/tools_entropy_huffman.cpp |
| 248 |
@@ -55,7 +55,7 @@ |
| 249 |
#include "bitstrm.hpp" |
| 250 |
|
| 251 |
#include "vlc.hpp" |
| 252 |
-#include <iostream.h> |
| 253 |
+#include <iostream> |
| 254 |
#ifdef __MFC_ |
| 255 |
#ifdef _DEBUG |
| 256 |
#undef THIS_FILE |
| 257 |
--- common/video/iso-mpeg4/src/tools_sadct_sadct.cpp |
| 258 |
+++ common/video/iso-mpeg4/src/tools_sadct_sadct.cpp |
| 259 |
@@ -37,7 +37,7 @@ |
| 260 |
#include "dct.hpp" |
| 261 |
#include <math.h> |
| 262 |
#if defined(__DEBUG_SADCT_) && !defined(NDEBUG) |
| 263 |
-#include <iostream.h> |
| 264 |
+#include <iostream> |
| 265 |
#endif |
| 266 |
#ifdef __MFC_ |
| 267 |
#ifdef _DEBUG |
| 268 |
--- common/video/iso-mpeg4/src/type_yuvac.cpp |
| 269 |
+++ common/video/iso-mpeg4/src/type_yuvac.cpp |
| 270 |
@@ -39,9 +39,11 @@ |
| 271 |
|
| 272 |
*************************************************************************/ |
| 273 |
|
| 274 |
-#include <iostream.h> |
| 275 |
+#include <iostream> |
| 276 |
#include "typeapi.h" |
| 277 |
|
| 278 |
+using namespace std; |
| 279 |
+ |
| 280 |
#ifdef __MFC_ |
| 281 |
#ifdef _DEBUG |
| 282 |
#undef THIS_FILE |
| 283 |
--- common/video/iso-mpeg4/src/type_yuvai.cpp |
| 284 |
+++ common/video/iso-mpeg4/src/type_yuvai.cpp |
| 285 |
@@ -37,7 +37,9 @@ |
| 286 |
*************************************************************************/ |
| 287 |
|
| 288 |
#include "typeapi.h" |
| 289 |
-#include <iostream.h> |
| 290 |
+#include <iostream> |
| 291 |
+ |
| 292 |
+using namespace std; |
| 293 |
|
| 294 |
#ifdef __MFC_ |
| 295 |
#ifdef _DEBUG |
| 296 |
--- common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp |
| 297 |
+++ common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp |
| 298 |
@@ -57,7 +57,7 @@ |
| 299 |
#include <math.h> |
| 300 |
#include <assert.h> |
| 301 |
// begin: added by Sharp (99/2/16) |
| 302 |
-#include <iostream.h> |
| 303 |
+#include <iostream> |
| 304 |
#include <sys/stat.h> |
| 305 |
// end: added by Sharp (99/2/16) |
| 306 |
|
| 307 |
--- player/lib/audio/faad/Makefile.am |
| 308 |
+++ player/lib/audio/faad/Makefile.am |
| 309 |
@@ -33,6 +33,6 @@ |
| 310 |
transfo.h\ |
| 311 |
util.h |
| 312 |
INCLUDES = -I$(top_srcdir)/include |
| 313 |
-AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing |
| 314 |
+AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing |
| 315 |
|
| 316 |
EXTRA_DIST = COPYING libfaad60.dsp README |
| 317 |
--- server/mp4live/video_util_resize.h |
| 318 |
+++ server/mp4live/video_util_resize.h |
| 319 |
@@ -90,7 +90,7 @@ |
| 320 |
|
| 321 |
void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV, |
| 322 |
uint32_t fyStride, uint32_t fuStride, uint32_t fvStride, |
| 323 |
- uint8_t *tY, uint8_t *tU, uint8_t *fV, |
| 324 |
- uint32_t tyStride, uint32_t tvStride, uint32_t tvStride, |
| 325 |
+ uint8_t *tY, uint8_t *tU, uint8_t *f_V, |
| 326 |
+ uint32_t tyStride, uint32_t tvStride, uint32_t tv_Stride, |
| 327 |
uint32_t w, uint32_t h); |
| 328 |
#endif |
| 329 |
|
| 330 |
|
| 331 |
|
| 332 |
-- |
| 333 |
gentoo-commits@l.g.o mailing list |
Archives