Attachment 93621 Details for Bug 131570 – file.diff

[patch] file.diff

file.diff (text/plain), 6.25 KB, created by Ganael LAPLANCHE on 2009-02-10 18:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2009-02-10 18:40:02 UTC

Size: 6.25 KB

patch

obsolete

>diff -aurN par2cmdline-tbb.orig/Makefile par2cmdline-tbb/Makefile
>--- par2cmdline-tbb.orig/Makefile	2008-05-06 21:49:44.000000000 +0200
>+++ par2cmdline-tbb/Makefile	2009-02-10 11:03:10.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	par2cmdline-tbb
>-PORTVERSION=	20080420
>+PORTVERSION=	20090203
> CATEGORIES=	archivers
> MASTER_SITES=	http://chuchusoft.com/par2_tbb/
> DISTNAME=	par2cmdline-0.4-tbb-${PORTVERSION}
>@@ -14,22 +14,21 @@
> MAINTAINER=	ganael.laplanche@martymac.com
> COMMENT=	Tools for using Parity v2 Archive files (tbb version)
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libtbb.so:${PORTSDIR}/devel/tbb \
>-		${NONEXISTENT}:${PORTSDIR}/devel/tbb:extract
>+BUILD_DEPENDS=	${LOCALBASE}/lib/libtbb.so:${PORTSDIR}/devel/tbb
> 
>+ONLY_FOR_ARCHS=	i386 amd64 ia64
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		LDFLAGS="-L${LOCALBASE}/lib"
>+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
>+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262
>+USE_GCC=	4.2+
> 
> PORTDOCS=	README
> CONFLICTS=	par2cmdline-[0-9]*
> PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify
> 
>-TBBWRKSRC=	`(cd ${PORTSDIR}/devel/tbb && ${MAKE} -V WRKSRC)`
>-
>-post-configure:
>-	@${CP} ${TBBWRKSRC}/src/tbb/tbb_misc.h ${WRKSRC}/tbb_misc.h
>-	@${REINPLACE_CMD} -e 's|#include "tbb/tbb_misc\.h"|#include "tbb_misc.h"|' ${WRKSRC}/par2cmdline.h
>+post-extract:
>+	@${CHMOD} u+x ${WRKSRC}/install-sh
> 
> post-install:
> .if !defined(NOPORTDOCS)
>diff -aurN par2cmdline-tbb.orig/distinfo par2cmdline-tbb/distinfo
>--- par2cmdline-tbb.orig/distinfo	2008-05-06 21:49:44.000000000 +0200
>+++ par2cmdline-tbb/distinfo	2009-02-06 13:47:55.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (par2cmdline-0.4-tbb-20080420.tar.gz) = 806d0a4810da2d8fca2375ca12e07fcd
>-SHA256 (par2cmdline-0.4-tbb-20080420.tar.gz) = 37220ff064b256e24f59b4c733baeffd124efa1551ff32d469ca574f40aae3c1
>-SIZE (par2cmdline-0.4-tbb-20080420.tar.gz) = 283148
>+MD5 (par2cmdline-0.4-tbb-20090203.tar.gz) = f32c83c524f55171e8d639d6bfe9a7d8
>+SHA256 (par2cmdline-0.4-tbb-20090203.tar.gz) = 6105dd1a4debd773a35d3274ef8d3ab97f1f25c55d130e2596201a5b850838a4
>+SIZE (par2cmdline-0.4-tbb-20090203.tar.gz) = 320864
>diff -aurN par2cmdline-tbb.orig/files/patch-Makefile.am par2cmdline-tbb/files/patch-Makefile.am
>--- par2cmdline-tbb.orig/files/patch-Makefile.am	1970-01-01 01:00:00.000000000 +0100
>+++ par2cmdline-tbb/files/patch-Makefile.am	2009-02-09 13:45:35.000000000 +0100
>@@ -0,0 +1,44 @@
>+--- Makefile.am.orig	2009-02-09 13:44:21.426445712 +0100
>++++ Makefile.am	2009-02-09 13:45:18.592707625 +0100
>+@@ -22,23 +22,23 @@
>+ bin_PROGRAMS = par2
>+ 
>+ if AMD64
>+-ARCH = x86_64
>++ARCH_SCALAR = x86_64
>+ ARCH_MMX = x86_64
>+ endif
>+ if X86MMX
>+-ARCH = i386
>++ARCH_SCALAR = i386
>+ ARCH_MMX = i686
>+ else
>+ if X86CPU
>+-ARCH = i386
>++ARCH_SCALAR = i386
>+ ARCH_MMX = i686
>+ endif
>+ endif
>+ if PPC64
>+-ARCH = ppc64
>++ARCH_SCALAR = ppc64
>+ endif
>+ if PPC32
>+-ARCH = ppc
>++ARCH_SCALAR = ppc
>+ endif
>+ 
>+ if PLATFORM_DARWIN
>+@@ -55,10 +55,10 @@
>+ endif
>+ 
>+ if AMD64
>+-ASMSOURCES = reedsolomon-$(ARCH)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s
>++ASMSOURCES = reedsolomon-$(ARCH_SCALAR)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s
>+ endif
>+ if X86CPU
>+-ASMSOURCES = reedsolomon-$(ARCH)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s $(ASMSOURCES_PLATFORM)
>++ASMSOURCES = reedsolomon-$(ARCH_SCALAR)-scalar-$(PLATFORM).s reedsolomon-$(ARCH_MMX)-mmx-$(PLATFORM).s $(ASMSOURCES_PLATFORM)
>+ endif
>+ 
>+ if GPGPU_CUDA
>diff -aurN par2cmdline-tbb.orig/files/patch-configure par2cmdline-tbb/files/patch-configure
>--- par2cmdline-tbb.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ par2cmdline-tbb/files/patch-configure	2009-02-09 06:09:55.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- configure.orig	2009-02-09 06:07:02.000000000 +0100
>++++ configure	2009-02-09 06:09:27.000000000 +0100
>+@@ -4113,7 +4113,7 @@
>+ 
>+ 
>+ case "$host_cpu" in
>+-	x86_64|amd64)
>++	x86_64|amd64|ia64)
>+ 		{ echo "$as_me:$LINENO: result: SSE2_on_x86_64 is enabled" >&5
>+ echo "${ECHO_T}SSE2_on_x86_64 is enabled" >&6; }
>+ 		 if true; then
>diff -aurN par2cmdline-tbb.orig/files/patch-md5.h par2cmdline-tbb/files/patch-md5.h
>--- par2cmdline-tbb.orig/files/patch-md5.h	2008-05-06 21:50:55.000000000 +0200
>+++ par2cmdline-tbb/files/patch-md5.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,47 +0,0 @@
>---- md5.h.orig	2008-05-06 13:24:40.000000000 +0200
>-+++ md5.h	2008-05-06 13:24:58.000000000 +0200
>-@@ -38,11 +38,8 @@
>- class MD5Hash
>- {
>- public:
>--  // removed this to stop GCC warnings about using the 'pack' attribute on
>--  // non-POD members in classes such as PACKET_HEADER:
>--
>-   // Constructor does not initialise the value
>--  //MD5Hash(void) {};
>-+  MD5Hash(void) {};
>- 
>-   // Comparison operators
>-   bool operator==(const MD5Hash &other) const;
>-@@ -57,12 +54,9 @@
>-   friend ostream& operator<<(ostream &s, const MD5Hash &hash);
>-   string print(void) const;
>- 
>--  // removed these to stop GCC warnings about using the 'pack' attribute on
>--  // non-POD members in classes such as PACKET_HEADER:
>--
>-   // Copy and assignment
>--  //MD5Hash(const MD5Hash &other);
>--  //MD5Hash& operator=(const MD5Hash &other);
>-+  MD5Hash(const MD5Hash &other);
>-+  MD5Hash& operator=(const MD5Hash &other);
>- 
>- public:
>-   u8 hash[16]; // 16 byte MD5 Hash value
>-@@ -150,7 +144,7 @@
>-   return !other.operator<(*this);
>- }
>- 
>--/*inline MD5Hash::MD5Hash(const MD5Hash &other)
>-+inline MD5Hash::MD5Hash(const MD5Hash &other)
>- {
>-   memcpy(&hash, &other.hash, sizeof(hash));
>- }
>-@@ -160,6 +154,6 @@
>-   memcpy(&hash, &other.hash, sizeof(hash));
>- 
>-   return *this;
>--}*/
>-+}
>- 
>- #endif // __MD5_H__
>diff -aurN par2cmdline-tbb.orig/files/patch-par2cmdline.h par2cmdline-tbb/files/patch-par2cmdline.h
>--- par2cmdline-tbb.orig/files/patch-par2cmdline.h	2008-05-06 21:50:55.000000000 +0200
>+++ par2cmdline-tbb/files/patch-par2cmdline.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- par2cmdline.h.orig	2008-05-01 08:53:49.729467641 +0200
>-+++ par2cmdline.h	2008-05-01 08:54:02.616707220 +0200
>-@@ -443,7 +443,7 @@
>-                   incrementing_parallel_while_with_max> >& w,
>-     ITEM* item)
>-   {
>--    const size_t n = item->is_first() ? tbb::DetectNumberOfWorkers() : 1;
>-+    const size_t n = item->is_first() ? tbb::internal::DetectNumberOfWorkers() : 1;
>- 
>-     bool res = false;
>-     std::pair<bool, size_t> pr(w.increment_next_i());

Actions: View | Diff

Attachments on bug 131570: 93621 | 93622