boinc: update to 7.22.0

This commit is contained in:
dkwo 2023-02-07 09:45:28 -05:00 committed by classabbyamp
parent 11ca274c8d
commit 2d974ae46f
3 changed files with 20 additions and 59 deletions

View File

@ -1,39 +1,18 @@
--- a/client/Makefile.am 2020-05-31 01:43:58.000000000 -0400
+++ b/client/Makefile.am 2020-06-06 11:31:53.051972845 -0400
@@ -113,6 +113,7 @@
boinc_clientdir = $(bindir)
+if ANDROID
if OS_ARM_LINUX
boinc_client_LDADD += libwhetneon.a libwhetvfp.a
noinst_LIBRARIES = libwhetneon.a libwhetvfp.a
@@ -122,6 +123,7 @@
libwhetvfp_a_SOURCES = whetstone.cpp
libwhetvfp_a_CXXFLAGS = $(boinc_client_CXXFLAGS) -DANDROID_VFP -mfloat-abi=softfp -mfpu=vfp
endif
+endif
switcher_SOURCES = switcher.cpp
switcher_LDFLAGS = $(AM_LDFLAGS) -L../lib
--- a/client/whetstone.cpp 2018-01-14 11:07:52.000000000 +0100
+++ b/client/whetstone.cpp 2018-02-26 20:49:52.185904752 +0100
@@ -290,6 +290,8 @@
client/whetstone.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/client/whetstone.cpp b/client/whetstone.cpp
index 230efb1210..6e2472ca9e 100644
--- a/client/whetstone.cpp
+++ b/client/whetstone.cpp
@@ -290,6 +290,8 @@ int whetstone(double& flops, double& cpu_time, double min_cpu_time) {
return 0;
}
+#ifdef ANDROID
+#ifdef ANDROID
#if defined(ANDROID_NEON) || defined(ANDROID_VFP)
}
#endif // namespace closure
+#endif
--- a/configure.ac 2020-05-31 01:43:58.000000000 -0400
+++ b/configure.ac 2020-06-06 11:41:14.259984481 -0400
@@ -1051,6 +1051,7 @@
dnl or OS2
AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null])
AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
+AM_CONDITIONAL([ANDROID], [AS_CASE([$host_os],[linux-android*],[true], [false])])
dnl Whether to build fcgi components
AM_CONDITIONAL(ENABLE_FCGI,[test "${enable_fcgi}" = yes])
+#endif
--
2.39.1

View File

@ -1,22 +0,0 @@
Add objective c++ program and check for gtk+3
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_F77
AC_PROG_CPP
+AC_PROG_OBJCXX
AC_PROG_MAKE_SET
SAH_LINKS
AC_LANG_PUSH(C)
@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
+PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
+
dnl ======================================================================
dnl some more vodoo required for building portable client-binary (client, clientgui)
dnl ======================================================================

View File

@ -1,7 +1,7 @@
# Template file for 'boinc'
pkgname=boinc
version=7.16.20
revision=2
version=7.22.0
revision=1
_majorver=${version%.*}
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info"
@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="https://boinc.berkeley.edu/"
distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
checksum=ed2457023ed72a2ba5460494fe016032dd2cf49d9d755e1386d16a4333db7332
checksum=7c7014300cb6e859b6f784f5c76ff2cb96d36ae35d90e03d1e2e59174cb7c927
system_accounts="boinc"
boinc_homedir="/var/lib/boinc"
boinc_shell="/bin/bash"
@ -30,6 +30,7 @@ esac
pre_configure() {
autoreconf -if
}
do_configure() {
if [ -n "$CROSS_BUILD" ]; then
# XXX: cross building used to be a lot easier
@ -85,12 +86,14 @@ do_configure() {
--without-x \
--without-wxdir
}
do_build() {
cd ${wrksrc}/x11
make ${makejobs}
cd ${wrksrc}/nox
make ${makejobs}
}
do_install() {
cd ${wrksrc}/x11
make ${makejobs} DESTDIR="${DESTDIR}" install
@ -125,6 +128,7 @@ boinc-devel_package() {
vmove "usr/lib/*.so"
}
}
boinc-nox_package() {
short_desc+=" - no X"
conflicts="boinc>=0"