| 1 |
dirtyepic 09/07/30 08:33:16 |
| 2 |
|
| 3 |
Added: mmsv2-1.0.8.5-gcc_compat.patch |
| 4 |
mmsv2-1.0.8.5-gcc44.patch |
| 5 |
Log: |
| 6 |
Fix building with GCC 4.3 and various other build issues with patch from |
| 7 |
Nikolay Orlyuk in bug #240614. Fix building with GCC 4.4 with patch by me. |
| 8 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-video/mmsv2/files/mmsv2-1.0.8.5-gcc_compat.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc_compat.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc_compat.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mmsv2-1.0.8.5-gcc_compat.patch |
| 17 |
=================================================================== |
| 18 |
--- mms-1.0.8.5/config_header.hpp.orig |
| 19 |
+++ mms-1.0.8.5/config_header.hpp |
| 20 |
@@ -1,5 +1,6 @@ |
| 21 |
#include <string> |
| 22 |
#include <list> |
| 23 |
+#include <cstdlib> |
| 24 |
|
| 25 |
#include "print.hpp" |
| 26 |
|
| 27 |
--- mms-1.0.8.5/config_maker.hpp.orig |
| 28 |
+++ mms-1.0.8.5/config_maker.hpp |
| 29 |
@@ -3,6 +3,7 @@ |
| 30 |
#include <fstream> |
| 31 |
#include <iostream> |
| 32 |
#include <sstream> |
| 33 |
+#include <cstdlib> |
| 34 |
|
| 35 |
#include "gettext.hpp" |
| 36 |
|
| 37 |
--- mms-1.0.8.5/input.cpp.orig |
| 38 |
+++ mms-1.0.8.5/input.cpp |
| 39 |
@@ -13,6 +13,7 @@ |
| 40 |
#include <fstream> |
| 41 |
#include <sstream> |
| 42 |
#include <iostream> |
| 43 |
+#include <cstdlib> |
| 44 |
|
| 45 |
using std::string; |
| 46 |
|
| 47 |
--- mms-1.0.8.5/renderer.cpp.orig |
| 48 |
+++ mms-1.0.8.5/renderer.cpp |
| 49 |
@@ -1219,16 +1219,16 @@ |
| 50 |
} |
| 51 |
|
| 52 |
void Render::text_part(const string& message, const string& font_name, int r, int g, int b, |
| 53 |
- int x, int y, int total_w, int total_h, const rect& rect) |
| 54 |
+ int x, int y, int total_w, int total_h, const rect& rct) |
| 55 |
{ |
| 56 |
if (set_font(font_name)) { |
| 57 |
- Imlib_Image temp2= imlib_create_cropped_image(rect.x, rect.y, rect.w, rect.h); |
| 58 |
+ Imlib_Image temp2= imlib_create_cropped_image(rct.x, rct.y, rct.w, rct.h); |
| 59 |
|
| 60 |
Imlib_Image temp = imlib_create_image(total_w, total_h); |
| 61 |
|
| 62 |
imlib_context_set_image(temp); |
| 63 |
|
| 64 |
- imlib_blend_image_onto_image(temp2, 0, 0, 0, rect.w, rect.h, rect.x-x, rect.y-y, rect.w, rect.h); |
| 65 |
+ imlib_blend_image_onto_image(temp2, 0, 0, 0, rct.w, rct.h, rct.x-x, rct.y-y, rct.w, rct.h); |
| 66 |
|
| 67 |
imlib_context_set_image(temp2); |
| 68 |
imlib_free_image(); |
| 69 |
@@ -1251,7 +1251,7 @@ |
| 70 |
|
| 71 |
imlib_context_set_image(current.image_data); |
| 72 |
|
| 73 |
- 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); |
| 74 |
+ 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); |
| 75 |
|
| 76 |
imlib_context_set_image(temp); |
| 77 |
imlib_free_image(); |
| 78 |
--- mms-1.0.8.5/renderer.hpp.orig |
| 79 |
+++ mms-1.0.8.5/renderer.hpp |
| 80 |
@@ -182,7 +182,7 @@ |
| 81 |
|
| 82 |
void text(const std::string& text, const std::string& font, int x, int y, int r, int g, int b); |
| 83 |
void text_part(const std::string& text, const std::string& font, int r, int g, int b, |
| 84 |
- int x, int y, int total_w, int total_h, const rect& r); |
| 85 |
+ int x, int y, int total_w, int total_h, const rect& rct); |
| 86 |
void rectangle(int x, int y, int width, int height, int r, int g, int b, int a); |
| 87 |
}; |
| 88 |
|
| 89 |
--- mms-1.0.8.5/general.cc.orig |
| 90 |
+++ mms-1.0.8.5/general.cc |
| 91 |
@@ -7,6 +7,7 @@ |
| 92 |
#include <sys/stat.h> |
| 93 |
#include <unistd.h> |
| 94 |
#include <sstream> |
| 95 |
+#include <cstdlib> |
| 96 |
|
| 97 |
#include <map> |
| 98 |
#include <string> |
| 99 |
--- mms-1.0.8.5/library-builder/md5digest.h.orig |
| 100 |
+++ mms-1.0.8.5/library-builder/md5digest.h |
| 101 |
@@ -3,6 +3,7 @@ |
| 102 |
|
| 103 |
#include <string> |
| 104 |
#include <stdio.h> |
| 105 |
+#include <cstring> |
| 106 |
#include "md5.h" |
| 107 |
|
| 108 |
using std::string; |
| 109 |
--- mms-1.0.8.5/library-builder/picker.cc.orig |
| 110 |
+++ mms-1.0.8.5/library-builder/picker.cc |
| 111 |
@@ -1,5 +1,6 @@ |
| 112 |
#include <iostream> |
| 113 |
#include <algorithm> |
| 114 |
+#include <climits> |
| 115 |
|
| 116 |
#include <math.h> |
| 117 |
|
| 118 |
--- mms-1.0.8.5/library-builder/sqldb.cc.orig |
| 119 |
+++ mms-1.0.8.5/library-builder/sqldb.cc |
| 120 |
@@ -1,5 +1,6 @@ |
| 121 |
#include <iostream> |
| 122 |
#include <sstream> |
| 123 |
+#include <cstring> |
| 124 |
#include <sqlite.h> |
| 125 |
|
| 126 |
#include "strmanip.h" |
| 127 |
--- mms-1.0.8.5/library-builder/spectrum.cc.orig |
| 128 |
+++ mms-1.0.8.5/library-builder/spectrum.cc |
| 129 |
@@ -1,5 +1,8 @@ |
| 130 |
#include <math.h> |
| 131 |
#include <assert.h> |
| 132 |
+#include <climits> |
| 133 |
+#include <cstring> |
| 134 |
+#include <cstdlib> |
| 135 |
|
| 136 |
#include <iostream> |
| 137 |
#include <utility> |
| 138 |
--- mms-1.0.8.5/imdb.cpp.orig |
| 139 |
+++ mms-1.0.8.5/imdb.cpp |
| 140 |
@@ -2,6 +2,8 @@ |
| 141 |
// converted from Winblows to UNIX by Anders Rune Jensen |
| 142 |
// changed to use http_fetcher library instead of buggy and ugly http class |
| 143 |
|
| 144 |
+#include <cstdlib> |
| 145 |
+ |
| 146 |
#include "imdb.hpp" |
| 147 |
|
| 148 |
#include "print.hpp" |
| 149 |
--- mms-1.0.8.5/libs/libavcodec/i386/mpegvideo_mmx.c.orig |
| 150 |
+++ mms-1.0.8.5/libs/libavcodec/i386/mpegvideo_mmx.c |
| 151 |
@@ -25,6 +25,17 @@ |
| 152 |
#include "../avcodec.h" |
| 153 |
#include "mmx.h" |
| 154 |
|
| 155 |
+/* x86_cpu.h from ffmpeg */ |
| 156 |
+ |
| 157 |
+#include <stdint.h> |
| 158 |
+ |
| 159 |
+#ifdef ARCH_X86_64 |
| 160 |
+typedef int64_t x86_reg; |
| 161 |
+#elif ARCH_X86_32 |
| 162 |
+typedef int32_t x86_reg; |
| 163 |
+#endif |
| 164 |
+ |
| 165 |
+ |
| 166 |
extern uint8_t zigzag_direct_noperm[64]; |
| 167 |
extern uint16_t inv_zigzag_direct16[64]; |
| 168 |
|
| 169 |
@@ -35,7 +46,7 @@ |
| 170 |
static void dct_unquantize_h263_intra_mmx(MpegEncContext *s, |
| 171 |
DCTELEM *block, int n, int qscale) |
| 172 |
{ |
| 173 |
- long level, qmul, qadd, nCoeffs; |
| 174 |
+ x86_reg level, qmul, qadd, nCoeffs; |
| 175 |
|
| 176 |
qmul = qscale << 1; |
| 177 |
|
| 178 |
@@ -100,7 +111,7 @@ |
| 179 |
|
| 180 |
"add $16, %3 \n\t" |
| 181 |
"jng 1b \n\t" |
| 182 |
- ::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs)) |
| 183 |
+ ::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs)) |
| 184 |
: "memory" |
| 185 |
); |
| 186 |
block[0]= level; |
| 187 |
|
| 188 |
|
| 189 |
|
| 190 |
1.1 media-video/mmsv2/files/mmsv2-1.0.8.5-gcc44.patch |
| 191 |
|
| 192 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc44.patch?rev=1.1&view=markup |
| 193 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mmsv2/files/mmsv2-1.0.8.5-gcc44.patch?rev=1.1&content-type=text/plain |
| 194 |
|
| 195 |
Index: mmsv2-1.0.8.5-gcc44.patch |
| 196 |
=================================================================== |
| 197 |
--- mms-1.0.8.5-orig/keyboard.cpp |
| 198 |
+++ mms-1.0.8.5/keyboard.cpp |
| 199 |
@@ -8,6 +8,7 @@ |
| 200 |
#endif |
| 201 |
|
| 202 |
#include <iostream> |
| 203 |
+#include <cstdio> |
| 204 |
|
| 205 |
using std::string; |
| 206 |
|
| 207 |
--- mms-1.0.8.5-orig/mpeg_out.cpp |
| 208 |
+++ mms-1.0.8.5/mpeg_out.cpp |
| 209 |
@@ -4,6 +4,8 @@ |
| 210 |
|
| 211 |
#include "gettext.hpp" |
| 212 |
|
| 213 |
+#include <cstdio> |
| 214 |
+ |
| 215 |
#ifdef benchmark_output |
| 216 |
#include "bench.hpp" |
| 217 |
#endif |
| 218 |
--- mms-1.0.8.5-orig/library-builder/main.cc |
| 219 |
+++ mms-1.0.8.5/library-builder/main.cc |
| 220 |
@@ -8,6 +8,7 @@ |
| 221 |
#include "../config.hpp" |
| 222 |
|
| 223 |
#include <iostream> |
| 224 |
+#include <cstring> |
| 225 |
|
| 226 |
using std::list; |
| 227 |
using std::string; |
Archives