Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (013fc2cb917521906e8b46d48998beb25546cd85)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (013fc2cb917521906e8b46d48998beb25546cd85)
  • Date: Wed, 31 Oct 2007 07:00:35 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT mages.ath.cx>:

archive/par2cmdline/HISTORY | 3 +
archive/par2cmdline/PRE_BUILD | 5 ++
archive/par2cmdline/par2cmdline-0.4-gcc4.patch | 62
+++++++++++++++++++++++++
3 files changed, 70 insertions(+)

New commits:
commit 013fc2cb917521906e8b46d48998beb25546cd85
Author: Elisamuel Resto <ryuji AT mages.ath.cx>
Commit: Elisamuel Resto <ryuji AT mages.ath.cx>

archive/par2cmdline: fix for gcc4

diff --git a/archive/par2cmdline/HISTORY b/archive/par2cmdline/HISTORY
index e624809..8346fa4 100644
--- a/archive/par2cmdline/HISTORY
+++ b/archive/par2cmdline/HISTORY
@@ -1,3 +1,6 @@
+2007-10-30 Elisamuel Resto <ryuji AT mages.ath.cx>
+ * PRE_BUILD, par2cmdline-0.4-gcc4.patch: fix for gcc4
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/archive/par2cmdline/PRE_BUILD b/archive/par2cmdline/PRE_BUILD
new file mode 100755
index 0000000..b49b864
--- /dev/null
+++ b/archive/par2cmdline/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+
+if [ "$(installed_version gcc | cut -d. -f1)" == "4" ]; then
+ patch -p0 < ${SCRIPT_DIRECTORY}/par2cmdline-0.4-gcc4.patch
+fi
diff --git a/archive/par2cmdline/par2cmdline-0.4-gcc4.patch
b/archive/par2cmdline/par2cmdline-0.4-gcc4.patch
new file mode 100644
index 0000000..c6da267
--- /dev/null
+++ b/archive/par2cmdline/par2cmdline-0.4-gcc4.patch
@@ -0,0 +1,62 @@
+Fix compilation with gcc-4.
+
+Patch by Dirk-Jan Heijs.
+
+http://bugs.gentoo.org/102391
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=287904
+
+--- par2cmdline-0.4/reedsolomon.cpp
++++ par2cmdline-0.4/reedsolomon.cpp
+@@ -51,7 +51,7 @@
+ }
+ }
+
+-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 @@
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -101,7 +101,7 @@
+ 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 @@
+
+ // 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 @@
+
+ // 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 @@
+ 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



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (013fc2cb917521906e8b46d48998beb25546cd85), Elisamuel Resto, 10/31/2007

Archive powered by MHonArc 2.6.24.

Top of Page