diff options
author | Larry Rosenman <ler@FreeBSD.org> | 2018-01-15 06:26:08 +0800 |
---|---|---|
committer | Larry Rosenman <ler@FreeBSD.org> | 2018-01-15 06:26:08 +0800 |
commit | f64b0095b7517ecd48e21cdaec401bbbba382c6b (patch) | |
tree | bf5f7d084fb1ad1ecccf375ae734fa8afe342b85 /astro | |
parent | b4d28e1f9177c7ec9664bf3e2286152aa11dfbb2 (diff) | |
download | freebsd-ports-gnome-f64b0095b7517ecd48e21cdaec401bbbba382c6b.tar.gz freebsd-ports-gnome-f64b0095b7517ecd48e21cdaec401bbbba382c6b.tar.zst freebsd-ports-gnome-f64b0095b7517ecd48e21cdaec401bbbba382c6b.zip |
astro/boinc-setiathome-v7 -> astro/boinc-setiathome-v8
- get current
- rename port to reflect reality
Diffstat (limited to 'astro')
20 files changed, 34 insertions, 211 deletions
diff --git a/astro/Makefile b/astro/Makefile index 4b8bdfed4d9f..3dcf68249659 100644 --- a/astro/Makefile +++ b/astro/Makefile @@ -7,7 +7,7 @@ SUBDIR += accrete SUBDIR += astrometry SUBDIR += boinc-astropulse - SUBDIR += boinc-setiathome-v7 + SUBDIR += boinc-setiathome-v8 SUBDIR += celestia SUBDIR += celestia-gnome SUBDIR += celestia-gtk diff --git a/astro/boinc-setiathome-v7/distinfo b/astro/boinc-setiathome-v7/distinfo deleted file mode 100644 index fbbd17cfd917..000000000000 --- a/astro/boinc-setiathome-v7/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (setiathome-svn-1924.tar.xz) = 8ef1164462dabe72574c504bcab74d8b0a168833c374872e9fa204737f376298 -SIZE (setiathome-svn-1924.tar.xz) = 992080 diff --git a/astro/boinc-setiathome-v7/files/patch-client_Makefile.am b/astro/boinc-setiathome-v7/files/patch-client_Makefile.am deleted file mode 100644 index fe1245fe5f86..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-client_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- client/Makefile.am.orig 2013-06-26 17:01:48 UTC -+++ client/Makefile.am -@@ -199,7 +199,7 @@ if PPC - seti_boinc-analyzeFuncs_altivec.o: vector/analyzeFuncs_altivec.cpp - if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(seti_boinc_CXXFLAGS) $(CXXFLAGS) -DUSE_ALTIVEC \ -- -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -faltivec \ -+ -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -maltivec -mabi=altivec \ - -c -o $@ $<; then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - seti_boinc-analyzeFuncs_vector.o: vector/analyzeFuncs_vector.cpp diff --git a/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp deleted file mode 100644 index 65ac60317069..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__sse.cpp +++ /dev/null @@ -1,35 +0,0 @@ ---- client/vector/analyzeFuncs_sse.cpp.orig 2013-06-26 16:56:49 UTC -+++ client/vector/analyzeFuncs_sse.cpp -@@ -191,7 +191,7 @@ inline void v_vsubTranspose4(float *in, - prefetcht0(out+3*yline); - // TODO: figure out why the intrinsic version crashes for MinGW build - // not critical, but shuffle-only _MM_TRANSPOSE4_PS is optimal on some --#if defined(USE_INTRINSICS) && defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) -+#if defined(USE_INTRINSICS) && (defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) || defined(__clang__)) - register float4 row0=*(__m128 *)in; - register float4 row1=*(__m128 *)(in+xline); - register float4 row2=*(__m128 *)(in+2*xline); -@@ -273,7 +273,7 @@ inline void v_vsubTranspose4np(float *in - - // TODO: figure out why the intrinsic version crashes for MinGW build - // not critical, but the shuffle-only _MM_TRANSPOSE4_PS is optimal on some --#if defined(USE_INTRINSICS) && defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) -+#if defined(USE_INTRINSICS) && (defined(_MM_TRANSPOSE4_PS) && !defined(__GNUC__) || defined(__clang__)) - register float4 row0=*(__m128 *)in; - register float4 row1=*(__m128 *)(in+xline); - register float4 row2=*(__m128 *)(in+2*xline); -@@ -1592,8 +1592,14 @@ inline float s_maxp2f( __m128 max1 ) { - return ( tMax ); - } - -+#ifdef __clang__ -+#define s_getU( aaaa, ptr ) \ -+ aaaa = _mm_loadl_pi(aaaa, (__m64 *)ptr); \ -+ aaaa = _mm_loadh_pi(aaaa, ((__m64 *)(ptr))+1 ) -+#else - #define s_getU( aaaa, ptr ) \ - aaaa = _mm_loadh_pi( _mm_loadl_pi(aaaa, (__m64 *)ptr), ((__m64 *)(ptr))+1 ) -+#endif - - #define s_putU( ptr, aaaa ) \ - _mm_storel_pi((__m64 *)ptr, aaaa), _mm_storeh_pi( ((__m64 *)ptr)+1 , aaaa) diff --git a/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp deleted file mode 100644 index f047dc9898ca..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__vector.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- client/vector/analyzeFuncs_vector.cpp.orig 2011-08-04 00:35:40 UTC -+++ client/vector/analyzeFuncs_vector.cpp -@@ -98,9 +98,7 @@ - - - #ifndef __APPLE_CC__ --#ifdef HAVE___ISNAN --#define isnotnan(x) (!__isnan(x)) --#elif defined(HAVE__ISNAN) -+#if defined(HAVE__ISNAN) - #define isnotnan(x) (!_isnan(x)) - #elif defined(HAVE_ISNAN) - #define isnotnan(x) (!isnan(x)) diff --git a/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp b/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp deleted file mode 100644 index 82b9b0df5fff..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-client_vector_analyzeFuncs__x86__64.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- client/vector/analyzeFuncs_x86_64.cpp.orig 2011-04-03 05:25:53 UTC -+++ client/vector/analyzeFuncs_x86_64.cpp -@@ -61,8 +61,14 @@ int v_vChirpData_x86_64( - static const int as [4] __attribute__((aligned(16)))= {INT_MIN, 0, INT_MIN, 0} ; // {-, +, -, +} - char *cblock = (char *)alloca(11*16); - cblock+=(16-((ssize_t)cblock % 16)); -+#ifdef __clang__ -+ __m128 *fblock=reinterpret_cast<__m128 *>(cblock); -+ __m128d *dblock=reinterpret_cast<__m128d *>(cblock); -+#else - x86_m128 *fblock=reinterpret_cast<x86_m128 *>(cblock); - x86_m128d *dblock=reinterpret_cast<x86_m128d *>(cblock); -+#endif -+ - #define CC dblock[0] - #define DD dblock[1] - #define cc fblock[2] diff --git a/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h deleted file mode 100644 index 75316f94e46c..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-client_vector_x86__float4.h +++ /dev/null @@ -1,25 +0,0 @@ ---- client/vector/x86_float4.h.orig 2011-05-22 19:08:50 UTC -+++ client/vector/x86_float4.h -@@ -58,11 +58,15 @@ extern const_float4 INDGEN[2]; - - ALIGNED(static const int sign_bits[4],16)={INT_MIN, INT_MIN, INT_MIN, INT_MIN}; - ALIGNED(static const int other_bits[4],16)={INT_MAX, INT_MAX, INT_MAX, INT_MAX}; -+ -+#ifdef __clang__ -+#ifndef __EMMINTRIN_H -+typedef long long __m128i __attribute__((__vector_size__(16))); -+#endif -+#endif - #define SIGN_BITS (*(__m128i *)sign_bits) - #define OTHER_BITS (*(__m128i *)other_bits) - -- -- - struct float4 { - float4() {}; - float4(const __m128 b) { m=b; }; -@@ -263,4 +267,3 @@ struct const_float4 : public float4 { - - #endif - #endif -- diff --git a/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h b/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h deleted file mode 100644 index f84ade69d655..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-client_vector_x86__ops.h +++ /dev/null @@ -1,43 +0,0 @@ ---- client/vector/x86_ops.h.orig 2011-05-22 19:08:50 UTC -+++ client/vector/x86_ops.h -@@ -135,7 +135,11 @@ - - #if defined(__SSE2__) - // SSE2 specific functions/macros here. --#ifdef _MSC_VER -+#ifdef __clang__ -+#ifndef __EMMINTRIN_H -+#include <emmintrin.h> -+#endif -+#elif defined _MSC_VER - typedef __m128d x86_m128d; - #else - typedef double x86_m128d __attribute__ ((mode(V2DF))) __attribute__((aligned(16))); -@@ -144,7 +148,11 @@ typedef double x86_m128d __attribute__ ( - - #if defined(__SSE__) - // SSE specific functions/macros here. --#ifdef _MSC_VER -+#ifdef __clang__ -+#ifndef __XMMINTRIN_H -+#include <xmmintrin.h> -+#endif -+#elif defined _MSC_VER - typedef __m128 x86_m128; - typedef __m128i x86_m128i; - #else -@@ -186,6 +194,7 @@ static inline void prefetchnta(const voi - - #endif - -+#ifndef __clang__ - #ifndef __m128d - #define __m128d x86_m128d - #endif -@@ -197,5 +206,6 @@ static inline void prefetchnta(const voi - #ifndef __m128 - #define __m128 x86_m128 - #endif -+#endif - - #endif diff --git a/astro/boinc-setiathome-v7/files/patch-configure.ac b/astro/boinc-setiathome-v7/files/patch-configure.ac deleted file mode 100644 index 5cb2366b2ef7..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-configure.ac +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.ac.orig 2013-07-02 20:51:54 UTC -+++ configure.ac -@@ -5,17 +5,10 @@ - - AC_PREREQ(2.57) - AC_INIT(setiathome_v7, 7.00, korpela@ssl.berkeley.edu) --svnrev="`svn info | grep Revision:`" - --if test -n "${svnrev}" ; then -- AC_REVISION("${svnrev}") -- AC_DEFINE_UNQUOTED(SVN_REV,"${svnrev}", -- [Define to be the subversion revision number]) --else -- AC_REVISION([$Revision: 1146 $]) -- AC_DEFINE(SVN_REV,"$Revision: 1146 $", -- [Define to be the subversion revision number]) --fi -+AC_REVISION([$Revision: 1924 $]) -+AC_DEFINE(SVN_REV,"$Revision: 1924 $", -+ [Define to be the subversion revision number]) - - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE(dist-zip) -@@ -55,8 +48,6 @@ if test -z "`echo ${LDFLAGS} | grep ${tm - fi - - # set posix source on linux --CFLAGS="-D_POSIX_C_SOURCE=1 ${CFLAGS}" --CXXFLAGS="-D_POSIX_C_SOURCE=1 ${CXXFLAGS}" - - AC_ARG_ENABLE(intrinsics, - AS_HELP_STRING([--disable-intrinsics], diff --git a/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 b/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 deleted file mode 100644 index 762f6c940204..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-m4_sah__check__boinc.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/sah_check_boinc.m4.orig 2008-09-09 16:55:19 UTC -+++ m4/sah_check_boinc.m4 -@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[ - cd $thisdir - break - else -- if $FIND $boinc_dir -name "std_fixes.h" >& /dev/null -+ if $FIND $boinc_dir -name "std_fixes.h" > /dev/null - then - BOINCDIR=`$FIND $boinc_dir -name "std_fixes.h" -print | $HEAD -1 | sed 's/\/std_fixes.h//'` - cd $BOINCDIR/.. diff --git a/astro/boinc-setiathome-v7/files/patch-sah__config.h b/astro/boinc-setiathome-v7/files/patch-sah__config.h deleted file mode 100644 index b88bf5b419df..000000000000 --- a/astro/boinc-setiathome-v7/files/patch-sah__config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- sah_config.h.orig 2012-09-18 22:45:14 UTC -+++ sah_config.h -@@ -21,7 +21,7 @@ - #define AVX_MASKSTORE_TYPECAST(x) reinterpret_cast<__m256i>(x) - - /* Define to 1 to build a graphical application */ --#define BOINC_APP_GRAPHICS 1 -+/* #undef BOINC_APP_GRAPHICS */ - - /* Define to a string identifying your compiler */ - #define COMPILER_STRING "g++ (GCC) 4.4.6 20110731 (Red Hat 4.4.6-3)" diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v8/Makefile index 1c8732a7289e..e6e146599996 100644 --- a/astro/boinc-setiathome-v7/Makefile +++ b/astro/boinc-setiathome-v8/Makefile @@ -1,12 +1,11 @@ # Created by: rene # $FreeBSD$ -PORTNAME= boinc-setiathome-v7 -PORTVERSION= 7.00 -PORTREVISION= 9 +PORTNAME= boinc-setiathome-v8 +PORTVERSION= 8.00 CATEGORIES= astro -MASTER_SITES= LOCAL/rene -DISTNAME= setiathome-svn-1924 # modified archive, see leftout in top directory +MASTER_SITES= LOCAL/ler/setiathome +DISTNAME= setiathome-svn-3725 # no releases available, snapshot MAINTAINER= ler@FreeBSD.org COMMENT= Setiathome Enhanced for BOINC @@ -19,7 +18,7 @@ RUN_DEPENDS= boinc_client:net/boinc-client LIB_DEPENDS= libfftw3f.so:math/fftw3-float GNU_CONFIGURE= yes -USES= autoreconf compiler gmake libtool pkgconfig ssl tar:xz +USES= autoreconf compiler gmake libtool pkgconfig tar:xz CFLAGS+= -O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include \ -L${LOCALBASE}/lib diff --git a/astro/boinc-setiathome-v8/distinfo b/astro/boinc-setiathome-v8/distinfo new file mode 100644 index 000000000000..3faee7c21c5f --- /dev/null +++ b/astro/boinc-setiathome-v8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1515965298 +SHA256 (setiathome-svn-3725.tar.xz) = 78747ec516b122c681024d668a113e3bc72b2c0033b9de39c4933423f0821c57 +SIZE (setiathome-svn-3725.tar.xz) = 12548856 diff --git a/astro/boinc-setiathome-v8/files/patch-client_vector_hires__timer.cpp b/astro/boinc-setiathome-v8/files/patch-client_vector_hires__timer.cpp new file mode 100644 index 000000000000..aa82e831fb89 --- /dev/null +++ b/astro/boinc-setiathome-v8/files/patch-client_vector_hires__timer.cpp @@ -0,0 +1,11 @@ +--- client/vector/hires_timer.cpp.orig 2018-01-14 21:26:29 UTC ++++ client/vector/hires_timer.cpp +@@ -267,7 +267,7 @@ hires_timer::hires_timer() : rollover(0),last_ticks(0) + #endif + if (period==0) { + install_sighandler(); +- if (setjmp(jb)) { ++ if (sigsetjmp(jb,0)) { + fprintf(stderr,"using fallback timer\n"); + use_fallback=1; + } else { diff --git a/astro/boinc-setiathome-v8/files/patch-client_vector_sighandler.h b/astro/boinc-setiathome-v8/files/patch-client_vector_sighandler.h new file mode 100644 index 000000000000..742230dd48fb --- /dev/null +++ b/astro/boinc-setiathome-v8/files/patch-client_vector_sighandler.h @@ -0,0 +1,10 @@ +--- client/vector/sighandler.h.orig 2018-01-14 21:49:26 UTC ++++ client/vector/sighandler.h +@@ -44,6 +44,7 @@ + #define SIGHANDLER_H + + ++#include <stddef.h> + #include <signal.h> + #include <setjmp.h> + diff --git a/astro/boinc-setiathome-v7/files/pkg-deinstall.in b/astro/boinc-setiathome-v8/files/pkg-deinstall.in index a2e70a448f25..c2b6d27a0ca7 100644 --- a/astro/boinc-setiathome-v7/files/pkg-deinstall.in +++ b/astro/boinc-setiathome-v8/files/pkg-deinstall.in @@ -9,7 +9,7 @@ fi F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml echo Removing setiathome_v7 lines from $F -l=`grep -n "<name>setiathome_v7</name>" $F | cut -f 1 -d :` +l=`grep -n "<name>setiathome_v8</name>" $F | cut -f 1 -d :` if [ $? -ne 0 ]; then echo $F is corrupt exit 1 diff --git a/astro/boinc-setiathome-v7/files/pkg-install.in b/astro/boinc-setiathome-v8/files/pkg-install.in index 514e2f4b7088..b2b6d8566951 100644 --- a/astro/boinc-setiathome-v7/files/pkg-install.in +++ b/astro/boinc-setiathome-v8/files/pkg-install.in @@ -15,18 +15,18 @@ if [ ! -f $F ]; then chown %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% $F fi -echo Adding setiathome_v7 lines to $F +echo Adding setiathome_v8 lines to $F ed - $F <<EOF 1a <app> -<name>setiathome_v7</name> +<name>setiathome_v8</name> </app> <file_info> <name>%%SETI_BINARY%%</name> <executable/> </file_info> <app_version> -<app_name>setiathome_v7</app_name> +<app_name>setiathome_v8</app_name> <version_num>%%SETI_VERSION%%</version_num> <file_ref> <file_name>%%SETI_BINARY%%</file_name> diff --git a/astro/boinc-setiathome-v7/files/pkg-message.in b/astro/boinc-setiathome-v8/files/pkg-message.in index ef9093d931f6..ef9093d931f6 100644 --- a/astro/boinc-setiathome-v7/files/pkg-message.in +++ b/astro/boinc-setiathome-v8/files/pkg-message.in diff --git a/astro/boinc-setiathome-v7/pkg-descr b/astro/boinc-setiathome-v8/pkg-descr index f80ebcb83b31..f80ebcb83b31 100644 --- a/astro/boinc-setiathome-v7/pkg-descr +++ b/astro/boinc-setiathome-v8/pkg-descr diff --git a/astro/boinc-setiathome-v7/pkg-plist b/astro/boinc-setiathome-v8/pkg-plist index 7d92c1fa29a9..7d92c1fa29a9 100644 --- a/astro/boinc-setiathome-v7/pkg-plist +++ b/astro/boinc-setiathome-v8/pkg-plist |