diff options
| author | minskim <minskim@pkgsrc.org> | 2006-06-21 18:47:02 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-06-21 18:47:02 +0000 |
| commit | bbd2fb80de5a21750168b95da9a9d081339e3cb0 (patch) | |
| tree | 398b13f985df6fc807823c9b1816b56db2284d5a /archivers/par2 | |
| parent | e992931f9caf8635700926957bf8cd5849f3034b (diff) | |
| download | pkgsrc-bbd2fb80de5a21750168b95da9a9d081339e3cb0.tar.gz | |
Make this pacakge build with gcc-4. Patches provided by martijnb in
PR pkg/33694.
Diffstat (limited to 'archivers/par2')
| -rw-r--r-- | archivers/par2/distinfo | 3 | ||||
| -rw-r--r-- | archivers/par2/patches/patch-aa | 58 |
2 files changed, 60 insertions, 1 deletions
diff --git a/archivers/par2/distinfo b/archivers/par2/distinfo index 8fc3b52cbbc..ae76826f4f6 100644 --- a/archivers/par2/distinfo +++ b/archivers/par2/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/08/26 18:56:03 tv Exp $ +$NetBSD: distinfo,v 1.4 2006/06/21 18:47:02 minskim Exp $ SHA1 (par2cmdline-0.4.tar.gz) = 2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f RMD160 (par2cmdline-0.4.tar.gz) = e98dc84fa7a4304b8d71c1d373fdce0bca1e6290 Size (par2cmdline-0.4.tar.gz) = 239312 bytes +SHA1 (patch-aa) = cb2cc7bb718cd003fea2afc1f278d5d8a46381e0 diff --git a/archivers/par2/patches/patch-aa b/archivers/par2/patches/patch-aa new file mode 100644 index 00000000000..45e503fcbaa --- /dev/null +++ b/archivers/par2/patches/patch-aa @@ -0,0 +1,58 @@ +$NetBSD: patch-aa,v 1.1 2006/06/21 18:47:02 minskim Exp $ + +--- reedsolomon.cpp.orig 2003-05-26 18:01:31.000000000 +0000 ++++ reedsolomon.cpp +@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b) + } + } + +-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) ++template<> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present) + { + inputcount = (u32)present.size(); + +@@ -80,7 +80,7 @@ bool ReedSolomon<Galois8>::SetInput(cons + return true; + } + +-bool ReedSolomon<Galois8>::SetInput(u32 count) ++template<> bool ReedSolomon<Galois8>::SetInput(u32 count) + { + inputcount = count; + +@@ -101,7 +101,7 @@ bool ReedSolomon<Galois8>::SetInput(u32 + return true; + } + +-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) ++template<> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) + { + // Look up the appropriate element in the RS matrix + Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; +@@ -189,7 +189,7 @@ bool ReedSolomon<Galois8>::Process(size_ + + // Set which of the source files are present and which are missing + // and compute the base values to use for the vandermonde matrix. +-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) ++template<> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present) + { + inputcount = (u32)present.size(); + +@@ -233,7 +233,7 @@ bool ReedSolomon<Galois16>::SetInput(con + + // Record that the specified number of source files are all present + // and compute the base values to use for the vandermonde matrix. +-bool ReedSolomon<Galois16>::SetInput(u32 count) ++template<> bool ReedSolomon<Galois16>::SetInput(u32 count) + { + inputcount = count; + +@@ -267,7 +267,7 @@ bool ReedSolomon<Galois16>::SetInput(u32 + return true; + } + +-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) ++template<> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) + { + // Look up the appropriate element in the RS matrix + |