summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianfranco Costamagna <gianfranco.costamagna@abinsula.com>2019-12-10 15:10:50 +0100
committerKhem Raj <raj.khem@gmail.com>2019-12-11 16:22:40 -0800
commit41be29ccd16733063d35652c2a27217e48ba5285 (patch)
treeaaa0ad7d5be851c0b79cbc77a6358b08627ea388
parent09001b53a78db415af3308ca028898e72ab74a9c (diff)
downloadmeta-openembedded-41be29ccd16733063d35652c2a27217e48ba5285.tar.gz
boinc: update recipe to version 7.16.3
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch23
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch21
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch17
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client_7.16.bb (renamed from meta-oe/recipes-extended/boinc/boinc-client_7.12.bb)2
4 files changed, 43 insertions, 20 deletions
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
index ab8042f72..7c3b0325d 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
+++ b/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
@@ -1,21 +1,28 @@
1Add configure check for gtk2+ and objc++ 1From 7957756a3dd16498cf7a75e1fb6675a33bc7f3dc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 3 Nov 2016 01:20:33 -0700
4Subject: [PATCH] Add configure check for gtk2+ and objc++
2 5
3Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending 7Upstream-Status: Pending
5 8
6Index: boinc-client_release-7.6-7.6.33/configure.ac 9---
7=================================================================== 10 configure.ac | 3 +++
8--- boinc-client_release-7.6-7.6.33.orig/configure.ac 11 1 file changed, 3 insertions(+)
9+++ boinc-client_release-7.6-7.6.33/configure.ac 12
10@@ -64,6 +64,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX 13diff --git a/configure.ac b/configure.ac
14index d81d795de4..7beeb34ae2 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -63,6 +63,7 @@ m4_pattern_allow([AC_PROG_OBJCXX])
18 m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX],)
11 dnl ------ 19 dnl ------
12 AC_PROG_F77
13 AC_PROG_CPP 20 AC_PROG_CPP
14+AC_PROG_OBJCXX 21+AC_PROG_OBJCXX
15 AC_PROG_MAKE_SET 22 AC_PROG_MAKE_SET
16 SAH_LINKS 23 SAH_LINKS
17 AC_LANG_PUSH(C) 24 AC_LANG_PUSH(C)
18@@ -1081,6 +1082,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test 25@@ -1068,6 +1069,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes || test "x${
19 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) 26 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
20 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) 27 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
21 28
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch b/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
index 4ae8d580d..e060b1a40 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
+++ b/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
@@ -1,13 +1,20 @@
1Check for gtk2+ only when manager is enabled 1From d53e9617fb6446780478bb13907efd111f241cd1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 3 Nov 2016 01:20:33 -0700
4Subject: [PATCH] Check for gtk2+ only when manager is enabled
2 5
3Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending 7Upstream-Status: Pending
5 8
6Index: boinc-client_release-7.6-7.6.33/configure.ac 9---
7=================================================================== 10 configure.ac | 6 +++++-
8--- boinc-client_release-7.6-7.6.33.orig/configure.ac 11 1 file changed, 5 insertions(+), 1 deletion(-)
9+++ boinc-client_release-7.6-7.6.33/configure.ac 12
10@@ -1033,6 +1033,11 @@ else 13diff --git a/configure.ac b/configure.ac
14index 7beeb34ae2..35234c2762 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -1018,6 +1018,11 @@ else
11 AM_CONDITIONAL([GUI_GTK], false) 18 AM_CONDITIONAL([GUI_GTK], false)
12 fi 19 fi
13 20
@@ -19,7 +26,7 @@ Index: boinc-client_release-7.6-7.6.33/configure.ac
19 dnl ---------- libNotify -------------------------------------------------- 26 dnl ---------- libNotify --------------------------------------------------
20 if test "${enable_manager}" = yes ; then 27 if test "${enable_manager}" = yes ; then
21 PKG_CHECK_MODULES(LIBNOTIFY, [libnotify]) 28 PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
22@@ -1082,7 +1087,6 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test 29@@ -1069,7 +1074,6 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes || test "x${
23 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) 30 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
24 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) 31 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
25 32
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch b/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
index 0b057eabc..ad4493f0b 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
+++ b/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
@@ -1,13 +1,22 @@
1From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 3 Nov 2016 01:20:33 -0700
4Subject: [PATCH] boinc: Add recipe for boinc-client
5
1Do not add prefix/lib to library search path 6Do not add prefix/lib to library search path
2let sysroot take care of that 7let sysroot take care of that
3 8
4Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Inappropriate[Cross-compile specific] 10Upstream-Status: Inappropriate[Cross-compile specific]
6 11
7Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 12---
8=================================================================== 13 m4/ax_check_gl.m4 | 2 +-
9--- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 14 1 file changed, 1 insertion(+), 1 deletion(-)
10+++ boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 15
16diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4
17index e26ce5b930..1e60c9266a 100644
18--- a/m4/ax_check_gl.m4
19+++ b/m4/ax_check_gl.m4
11@@ -58,7 +58,7 @@ else 20@@ -58,7 +58,7 @@ else
12 else 21 else
13 ax_try_lib="${ax_lib}" 22 ax_try_lib="${ax_lib}"
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb
index d472d3269..ce3f691b2 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb
@@ -29,7 +29,7 @@ DEPENDS = "curl \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \
30 nettle \ 30 nettle \
31" 31"
32SRCREV = "bd12338dbd29083daa5a4b022592ca31ff68cd98" 32SRCREV = "a432e1ccbf864f99c7b29a1645de38056915f944"
33BRANCH = "client_release/7/${PV}" 33BRANCH = "client_release/7/${PV}"
34SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ 34SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
35 file://boinc-AM_CONDITIONAL.patch \ 35 file://boinc-AM_CONDITIONAL.patch \