Fix building with GCC 4.3 and various other build issues with patch from

Nikolay Orlyuk in bug #240614. Fix building with GCC 4.4 with patch by me.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 225 insertions, 6 deletions

diff --git a/media-video/mmsv2/ChangeLog b/media-video/mmsv2/ChangeLog
index 617f87a5f19e..70d3cf0d75b5 100644
--- a/media-video/mmsv2/ChangeLog
+++ b/media-video/mmsv2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mmsv2
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/ChangeLog,v 1.26 2007/10/26 20:24:11 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/ChangeLog,v 1.27 2009/07/30 08:33:17 dirtyepic Exp $
+
+  30 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> mmsv2-1.0.8.5.ebuild,
+  +files/mmsv2-1.0.8.5-gcc44.patch, +files/mmsv2-1.0.8.5-gcc_compat.patch:
+  Fix building with GCC 4.3 and various other build issues with patch from
+  Nikolay Orlyuk in bug #240614. Fix building with GCC 4.4 with patch by me.
 
 *mmsv2-1.0.8.5 (26 Oct 2007)
 
diff --git a/media-video/mmsv2/Manifest b/media-video/mmsv2/Manifest
index 1162a622f39a..47d23e05d55d 100644
--- a/media-video/mmsv2/Manifest
+++ b/media-video/mmsv2/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mmsv2-1.0.8.5-cc.patch 475 RMD160 4d84a393fe12bcbebe0393081b9e09a3c9734c78 SHA1 c80f514a956ff938f06a4657a7dd3b18da11bbcb SHA256 2cd23cffdb0e227d00f6789d66e77a1cc39e780f38c5e31bd33b5da033f02c05
+AUX mmsv2-1.0.8.5-gcc44.patch 546 RMD160 53f930dac6619ac5662eac4b67fe83084fe35379 SHA1 a4e472927a3ebb42736fddf3e0f5ae0584a1017c SHA256 d1577fa294c257cb1fb7093fb9a5dc683ce18d623bb98403c182608032d369bb
+AUX mmsv2-1.0.8.5-gcc_compat.patch 4541 RMD160 61c714cb2cadddde6bc23cdddbb9175c2f372853 SHA1 27a2ddedc600fbf0bcc2d7fd75eaa393db73a5d7 SHA256 1f259735d0ce2982c4c0b65709a7352d3f10f449e8cfe9e13d8ffc6b038c76df
 DIST mms-1.0.8.5.tar.bz2 5600869 RMD160 fc254c92a316a8c1186b3b0f912d0d694c795bd5 SHA1 c4295d5f815f4d925afb0f5c2e3af2de5a101012 SHA256 2edbab2dae7dbe9a6b65c4be20ac0941f54da98ca4dd7b58c234e5580b9e9b3e
-EBUILD mmsv2-1.0.8.5.ebuild 2622 RMD160 3062615353f9716d7eebb5b2019dde11793083af SHA1 707b9e300e6e185ac513665d3b4bf3f2ae2a2011 SHA256 533f9ba3f78cd4256563f760c2d1c8ba284dc9d0e652726980d91d9c04311337
-MISC ChangeLog 3860 RMD160 c8a0860f56136dd968c929b04d646a7f896173a8 SHA1 f8692dd9a5c4dd7dd5e848dc3076c16b18d9a989 SHA256 9fcc1688b52f87f421d8c7c533b4bfdc4199681b7556bf81b8e1db2eb6895faf
+EBUILD mmsv2-1.0.8.5.ebuild 2710 RMD160 3fd74f30fb993e38b6e201878a61934c2cb8ba1c SHA1 e8a8ff9b285242338d6ccc31415ab72bc06afae9 SHA256 93f2ee5c93dbca5cc131a8513838c8e00a5cac2f1918b15aecf3444e846e2533
+MISC ChangeLog 4163 RMD160 0a3d1495c2533dc0aad0b0f6cc72f2ce8f04496e SHA1 32cfb2b69c4df787049b0bfcfff0e46fb6305234 SHA256 ea975fe3c607e9859d9ed3ed6060b81f47faa2e8f2f6ee6e93b63f5737333b01
 MISC metadata.xml 428 RMD160 934cc81da89b986b98e3c961be99be86546070e5 SHA1 33f683ee52fda01a7b5dbb4bdf1abb44ab801571 SHA256 990c16cc23f6200f37e596166407f23d308cdd032f103a02e41e4d14a0084188
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpxWvIACgkQiqiDRvmkBmIH6gCeJ2z/dEu4N1WhxY6M3AHvxN3z
+zjkAn1tEE5tGhWuYwWvBctH1KASmpw1w
+=Q26t
+-----END PGP SIGNATURE-----
diff --git a/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc44.patch b/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc44.patch
new file mode 100644
index 000000000000..74a865e4ff90
--- /dev/null
+++ b/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc44.patch
@@ -0,0 +1,31 @@
+--- mms-1.0.8.5-orig/keyboard.cpp
++++ mms-1.0.8.5/keyboard.cpp
+@@ -8,6 +8,7 @@
+ #endif
+ 
+ #include <iostream>
++#include <cstdio>
+ 
+ using std::string;
+ 
+--- mms-1.0.8.5-orig/mpeg_out.cpp
++++ mms-1.0.8.5/mpeg_out.cpp
+@@ -4,6 +4,8 @@
+ 
+ #include "gettext.hpp"
+ 
++#include <cstdio>
++
+ #ifdef benchmark_output
+ #include "bench.hpp"
+ #endif
+--- mms-1.0.8.5-orig/library-builder/main.cc
++++ mms-1.0.8.5/library-builder/main.cc
+@@ -8,6 +8,7 @@
+ #include "../config.hpp"
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ using std::list;
+ using std::string;
diff --git a/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc_compat.patch b/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc_compat.patch
new file mode 100644
index 000000000000..c754f330c099
--- /dev/null
+++ b/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc_compat.patch
@@ -0,0 +1,169 @@
+--- mms-1.0.8.5/config_header.hpp.orig
++++ mms-1.0.8.5/config_header.hpp
+@@ -1,5 +1,6 @@
+ #include <string>
+ #include <list>
++#include <cstdlib>
+ 
+ #include "print.hpp"
+ 
+--- mms-1.0.8.5/config_maker.hpp.orig
++++ mms-1.0.8.5/config_maker.hpp
+@@ -3,6 +3,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ 
+ #include "gettext.hpp"
+ 
+--- mms-1.0.8.5/input.cpp.orig
++++ mms-1.0.8.5/input.cpp
+@@ -13,6 +13,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <iostream>
++#include <cstdlib>
+ 
+ using std::string;
+ 
+--- mms-1.0.8.5/renderer.cpp.orig
++++ mms-1.0.8.5/renderer.cpp
+@@ -1219,16 +1219,16 @@
+ }
+ 
+ void Render::text_part(const string& message, const string& font_name, int r, int g, int b, 
+-		       int x, int y, int total_w, int total_h, const rect& rect)
++		       int x, int y, int total_w, int total_h, const rect& rct)
+ {
+   if (set_font(font_name)) {
+-    Imlib_Image temp2= imlib_create_cropped_image(rect.x, rect.y, rect.w, rect.h);
++    Imlib_Image temp2= imlib_create_cropped_image(rct.x, rct.y, rct.w, rct.h);
+ 
+     Imlib_Image temp = imlib_create_image(total_w, total_h);
+     
+     imlib_context_set_image(temp);
+ 
+-    imlib_blend_image_onto_image(temp2, 0, 0, 0, rect.w, rect.h, rect.x-x, rect.y-y, rect.w, rect.h);
++    imlib_blend_image_onto_image(temp2, 0, 0, 0, rct.w, rct.h, rct.x-x, rct.y-y, rct.w, rct.h);
+ 
+     imlib_context_set_image(temp2);
+     imlib_free_image();
+@@ -1251,7 +1251,7 @@
+ 
+     imlib_context_set_image(current.image_data);
+ 
+-    imlib_blend_image_onto_image(temp, 0, rect.x-x, rect.y-y, rect.w, rect.h, rect.x, rect.y, rect.w, rect.h);
++    imlib_blend_image_onto_image(temp, 0, rct.x-x, rct.y-y, rct.w, rct.h, rct.x, rct.y, rct.w, rct.h);
+ 
+     imlib_context_set_image(temp);
+     imlib_free_image();
+--- mms-1.0.8.5/renderer.hpp.orig
++++ mms-1.0.8.5/renderer.hpp
+@@ -182,7 +182,7 @@
+ 
+   void text(const std::string& text, const std::string& font, int x, int y, int r, int g, int b);
+   void text_part(const std::string& text, const std::string& font, int r, int g, int b,  
+-		 int x, int y, int total_w, int total_h, const rect& r);
++		 int x, int y, int total_w, int total_h, const rect& rct);
+   void rectangle(int x, int y, int width, int height, int r, int g, int b, int a);
+ };
+ 
+--- mms-1.0.8.5/general.cc.orig
++++ mms-1.0.8.5/general.cc
+@@ -7,6 +7,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <sstream>
++#include <cstdlib>
+ 
+ #include <map>
+ #include <string>
+--- mms-1.0.8.5/library-builder/md5digest.h.orig
++++ mms-1.0.8.5/library-builder/md5digest.h
+@@ -3,6 +3,7 @@
+ 
+ #include <string>
+ #include <stdio.h>
++#include <cstring>
+ #include "md5.h"
+ 
+ using std::string;
+--- mms-1.0.8.5/library-builder/picker.cc.orig
++++ mms-1.0.8.5/library-builder/picker.cc
+@@ -1,5 +1,6 @@
+ #include <iostream>
+ #include <algorithm>
++#include <climits>
+ 
+ #include <math.h>
+ 
+--- mms-1.0.8.5/library-builder/sqldb.cc.orig
++++ mms-1.0.8.5/library-builder/sqldb.cc
+@@ -1,5 +1,6 @@
+ #include <iostream>
+ #include <sstream>
++#include <cstring>
+ #include <sqlite.h>
+ 
+ #include "strmanip.h"
+--- mms-1.0.8.5/library-builder/spectrum.cc.orig
++++ mms-1.0.8.5/library-builder/spectrum.cc
+@@ -1,5 +1,8 @@
+ #include <math.h>
+ #include <assert.h>
++#include <climits>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include <iostream>
+ #include <utility>
+--- mms-1.0.8.5/imdb.cpp.orig
++++ mms-1.0.8.5/imdb.cpp
+@@ -2,6 +2,8 @@
+ // converted from Winblows to UNIX by Anders Rune Jensen
+ // changed to use http_fetcher library instead of buggy and ugly http class
+ 
++#include <cstdlib>
++
+ #include "imdb.hpp"
+ 
+ #include "print.hpp"
+--- mms-1.0.8.5/libs/libavcodec/i386/mpegvideo_mmx.c.orig
++++ mms-1.0.8.5/libs/libavcodec/i386/mpegvideo_mmx.c
+@@ -25,6 +25,17 @@
+ #include "../avcodec.h"
+ #include "mmx.h"
+ 
++/* x86_cpu.h from ffmpeg */
++
++#include <stdint.h>
++
++#ifdef ARCH_X86_64
++typedef int64_t x86_reg;
++#elif ARCH_X86_32
++typedef int32_t x86_reg;
++#endif
++
++
+ extern uint8_t zigzag_direct_noperm[64];
+ extern uint16_t inv_zigzag_direct16[64];
+ 
+@@ -35,7 +46,7 @@
+ static void dct_unquantize_h263_intra_mmx(MpegEncContext *s,
+                                   DCTELEM *block, int n, int qscale)
+ {
+-    long level, qmul, qadd, nCoeffs;
++    x86_reg level, qmul, qadd, nCoeffs;
+ 
+     qmul = qscale << 1;
+ 
+@@ -100,7 +111,7 @@
+ 
+ 		"add $16, %3			\n\t"
+ 		"jng 1b				\n\t"
+-		::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs))
++		::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs))
+ 		: "memory"
+ 	);
+         block[0]= level;
diff --git a/media-video/mmsv2/mmsv2-1.0.8.5.ebuild b/media-video/mmsv2/mmsv2-1.0.8.5.ebuild
index c00339bc80fc..debb4d978396 100644
--- a/media-video/mmsv2/mmsv2-1.0.8.5.ebuild
+++ b/media-video/mmsv2/mmsv2-1.0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/mmsv2-1.0.8.5.ebuild,v 1.2 2007/10/27 09:43:43 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mmsv2/mmsv2-1.0.8.5.ebuild,v 1.3 2009/07/30 08:33:17 dirtyepic Exp $
 
 inherit eutils toolchain-funcs
 
@@ -38,6 +38,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-cc.patch
+	epatch "${FILESDIR}"/${P}-gcc_compat.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_compile() {