<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ec60ab1068a41646064b94ee381acbe0581dcc5d">https://github.com/macports/macports-ports/commit/ec60ab1068a41646064b94ee381acbe0581dcc5d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ec60ab1068a par2: Move to the 0.8.1 version in a maintained clone.
</span>ec60ab1068a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ec60ab1068a41646064b94ee381acbe0581dcc5d
</span>Author: Wilfried Teiken <wteiken@teiken.org>
AuthorDate: Fri Nov 5 18:23:15 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> par2: Move to the 0.8.1 version in a maintained clone.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The par2 packet is from a stale repo and does not compile on arm due to
</span><span style='display:block; white-space:pre;color:#404040;'> issues with config.guess. This PR replaces the package source with a maintained
</span><span style='display:block; white-space:pre;color:#404040;'> clone of the original that compiles cleanly.
</span>---
archivers/par2/Portfile | 20 ++++----
.../files/patch-par2-delete-hardcoded-stdlib.diff | 24 ----------
archivers/par2/files/patch-reedsolomon_cpp | 56 ----------------------
3 files changed, 8 insertions(+), 92 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/par2/Portfile b/archivers/par2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b2491d4c5d..f8e9107bf3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/par2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/par2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name par2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Parchive par2cmdline 0.8.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> description Parchive: Parity Archive Volume Set for data recovery
long_description Parchive takes .par files and can regenerate missing data \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,21 +17,16 @@ long_description Parchive takes .par files and can regenerate missing data \
</span> license GPL-2
maintainers jabber.org:julian
categories archivers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://parchive.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:parchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1551b63e57e3c232254dc62073b723a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e98dc84fa7a4304b8d71c1d373fdce0bca1e6290
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5e9bb8fd1b71c41c7b3fe1adf729df7b8f7936bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7b2fcc19b54c7080939fc2cbaca33ae40ac33759a526292933c94a85ba850d11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3654317
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname par2cmdline-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-reedsolomon_cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-par2-delete-hardcoded-stdlib.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --mandir=${prefix}/share/man
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/par2/files/patch-par2-delete-hardcoded-stdlib.diff b/archivers/par2/files/patch-par2-delete-hardcoded-stdlib.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 821fd552989..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/par2/files/patch-par2-delete-hardcoded-stdlib.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makefile.am Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5db5804..4b3ecd6 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,7 +45,6 @@ par2_SOURCES = par2cmdline.cpp par2cmdline.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- verificationhashtable.cpp verificationhashtable.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- verificationpacket.cpp verificationpacket.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDADD = -lstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CXXFLAGS = -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1cace84..bbc82c8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,7 +227,6 @@ par2_SOURCES = par2cmdline.cpp par2cmdline.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- verificationhashtable.cpp verificationhashtable.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- verificationpacket.cpp verificationpacket.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDADD = -lstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CXXFLAGS = -Wall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testdata.tar.gz pretest test1 test2 test3 test4 test5 test6 \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/par2/files/patch-reedsolomon_cpp b/archivers/par2/files/patch-reedsolomon_cpp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f2d808256e9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/par2/files/patch-reedsolomon_cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- reedsolomon.cpp.orig 2007-01-15 09:15:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ reedsolomon.cpp 2007-01-15 09:19:46.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputcount = (u32)present.size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -80,7 +80,7 @@ bool ReedSolomon<Galois8>::SetInput(cons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool ReedSolomon<Galois8>::SetInput(u32 count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputcount = count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,7 +101,7 @@ bool ReedSolomon<Galois8>::SetInput(u32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Look up the appropriate element in the RS matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +189,7 @@ bool ReedSolomon<Galois8>::Process(size_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Set which of the source files are present and which are missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // and compute the base values to use for the vandermonde matrix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputcount = (u32)present.size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -233,7 +233,7 @@ bool ReedSolomon<Galois16>::SetInput(con
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Record that the specified number of source files are all present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // and compute the base values to use for the vandermonde matrix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool ReedSolomon<Galois16>::SetInput(u32 count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputcount = count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,7 +267,7 @@ bool ReedSolomon<Galois16>::SetInput(u32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Look up the appropriate element in the RS matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>