| 1 |
vapier 08/04/20 08:02:36 |
| 2 |
|
| 3 |
Added: mjpegtools-1.9.0_rc3-gcc43.patch |
| 4 |
Log: |
| 5 |
Fix by Ryan Hill for building with gcc-4.3 #200767. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mjpegtools-1.9.0_rc3-gcc43.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/200767 |
| 17 |
http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id=5776&atid=305776 |
| 18 |
|
| 19 |
--- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h |
| 20 |
+++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h |
| 21 |
@@ -25,6 +25,8 @@ |
| 22 |
*/ |
| 23 |
|
| 24 |
|
| 25 |
+#include <stdlib.h> |
| 26 |
+ |
| 27 |
class Parity |
| 28 |
{ |
| 29 |
public: |
| 30 |
--- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc |
| 31 |
+++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc |
| 32 |
@@ -21,6 +21,7 @@ |
| 33 |
|
| 34 |
#include <stdio.h> |
| 35 |
#include <cassert> |
| 36 |
+#include <limits.h> |
| 37 |
|
| 38 |
#include "macroblock.hh" |
| 39 |
#include "mpeg2syntaxcodes.h" |
| 40 |
--- mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc |
| 41 |
+++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc |
| 42 |
@@ -23,6 +23,7 @@ |
| 43 |
#include "picturereader.hh" |
| 44 |
#include "mpeg2encoder.hh" |
| 45 |
#include "imageplanes.hh" |
| 46 |
+#include <limits.h> |
| 47 |
//#include <stdio.h> |
| 48 |
//#include <stdlib.h> |
| 49 |
//#include <unistd.h> |
| 50 |
--- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp |
| 51 |
+++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp |
| 52 |
@@ -23,6 +23,7 @@ |
| 53 |
|
| 54 |
#include <config.h> |
| 55 |
#include <assert.h> |
| 56 |
+#include <limits.h> |
| 57 |
|
| 58 |
#include "mjpeg_types.h" |
| 59 |
#include "inputstrm.hpp" |
| 60 |
--- mjpegtools-1.9.0rc3/mplex/padstrm.cpp |
| 61 |
+++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp |
| 62 |
@@ -24,6 +24,7 @@ |
| 63 |
#include "config.h" |
| 64 |
#endif |
| 65 |
|
| 66 |
+#include <string.h> |
| 67 |
#include "padstrm.hpp" |
| 68 |
|
| 69 |
|
| 70 |
--- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp |
| 71 |
+++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp |
| 72 |
@@ -22,6 +22,7 @@ |
| 73 |
#include <config.h> |
| 74 |
#include <math.h> |
| 75 |
#include <stdlib.h> |
| 76 |
+#include <string.h> |
| 77 |
|
| 78 |
#include <mjpeg_types.h> |
| 79 |
#include <mjpeg_logging.h> |
| 80 |
--- mjpegtools-1.9.0rc3/mplex/main.cpp |
| 81 |
+++ mjpegtools-1.9.0rc3/mplex/main.cpp |
| 82 |
@@ -31,6 +31,7 @@ |
| 83 |
#include <getopt.h> |
| 84 |
#endif |
| 85 |
#include <string> |
| 86 |
+#include <string.h> |
| 87 |
#include <memory> |
| 88 |
#include <sys/stat.h> |
| 89 |
#ifndef _WIN32 |
| 90 |
--- mjpegtools-1.9.0rc3/y4mdenoise/Set.hh |
| 91 |
+++ mjpegtools-1.9.0rc3/y4mdenoise/Set.hh |
| 92 |
@@ -23,7 +23,7 @@ |
| 93 |
// How we implement ourselves. |
| 94 |
|
| 95 |
public: |
| 96 |
- typedef typename Imp::Allocator Allocator; |
| 97 |
+ typedef typename Imp::Allocator_t Allocator; |
| 98 |
// The type of allocator to use to allocate items in the set. |
| 99 |
|
| 100 |
Set (const PRED &a_rPred = PRED(), |
| 101 |
--- mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh |
| 102 |
+++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh |
| 103 |
@@ -57,19 +57,19 @@ |
| 104 |
// Will give good sorting for up to e^10 items. |
| 105 |
|
| 106 |
public: |
| 107 |
- typedef Allocator<Node,HEADERCHUNK> Allocator; |
| 108 |
+ typedef Allocator<Node,HEADERCHUNK> Allocator_t; |
| 109 |
// The type of node allocator to use. |
| 110 |
|
| 111 |
- static Allocator sm_oNodeAllocator; |
| 112 |
+ static Allocator_t sm_oNodeAllocator; |
| 113 |
// The default node allocator. |
| 114 |
|
| 115 |
SkipList (const PRED &a_rPred = PRED(), |
| 116 |
- Allocator &a_rAlloc = sm_oNodeAllocator); |
| 117 |
+ Allocator_t &a_rAlloc = sm_oNodeAllocator); |
| 118 |
// Default constructor. Must be followed by Init(). |
| 119 |
|
| 120 |
SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates, |
| 121 |
uint32_t a_nRandSeed, const PRED &a_rPred = PRED(), |
| 122 |
- Allocator &a_rAlloc = sm_oNodeAllocator); |
| 123 |
+ Allocator_t &a_rAlloc = sm_oNodeAllocator); |
| 124 |
// Constructor. Specify whether or not duplicates are allowed, |
| 125 |
// and provide a random number seed. |
| 126 |
|
| 127 |
@@ -255,7 +255,7 @@ |
| 128 |
|
| 129 |
private: |
| 130 |
|
| 131 |
- Allocator &m_rNodeAllocator; |
| 132 |
+ Allocator_t &m_rNodeAllocator; |
| 133 |
// Where we get memory to allocate nodes. |
| 134 |
|
| 135 |
bool m_bAllowDuplicates; |
| 136 |
@@ -337,7 +337,7 @@ |
| 137 |
|
| 138 |
// The default node allocator. Allocates 64K at a time. |
| 139 |
template <class KEY, class VALUE, class KEYFN, class PRED> |
| 140 |
-typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator |
| 141 |
+typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t |
| 142 |
SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536); |
| 143 |
|
| 144 |
|
| 145 |
@@ -345,7 +345,7 @@ |
| 146 |
// Default constructor. Must be followed by Init(). |
| 147 |
template <class KEY, class VALUE, class KEYFN, class PRED> |
| 148 |
SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred, |
| 149 |
- Allocator &a_rAlloc) |
| 150 |
+ Allocator_t &a_rAlloc) |
| 151 |
: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) |
| 152 |
{ |
| 153 |
// Set up some defaults. |
| 154 |
@@ -371,7 +371,7 @@ |
| 155 |
template <class KEY, class VALUE, class KEYFN, class PRED> |
| 156 |
SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus, |
| 157 |
bool a_bAllowDuplicates, uint32_t a_nRandSeed, |
| 158 |
- const PRED &a_rPred, Allocator &a_rAlloc) |
| 159 |
+ const PRED &a_rPred, Allocator_t &a_rAlloc) |
| 160 |
: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) |
| 161 |
{ |
| 162 |
// Make sure they didn't start us off with an error. |
| 163 |
|
| 164 |
|
| 165 |
|
| 166 |
-- |
| 167 |
gentoo-commits@l.g.o mailing list |
Archives