diff options
author | 2019-12-10 15:10:50 +0100 | |
---|---|---|
committer | 2019-12-11 16:22:40 -0800 | |
commit | 41be29ccd16733063d35652c2a27217e48ba5285 (patch) | |
tree | aaa0ad7d5be851c0b79cbc77a6358b08627ea388 | |
parent | 09001b53a78db415af3308ca028898e72ab74a9c (diff) | |
download | meta-openembedded-contrib-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.patch | 23 | ||||
-rw-r--r-- | meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch | 21 | ||||
-rw-r--r-- | meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch | 17 | ||||
-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 ab8042f723..7c3b0325dd 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 @@ -Add configure check for gtk2+ and objc++ +From 7957756a3dd16498cf7a75e1fb6675a33bc7f3dc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 3 Nov 2016 01:20:33 -0700 +Subject: [PATCH] Add configure check for gtk2+ and objc++ Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: boinc-client_release-7.6-7.6.33/configure.ac -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/configure.ac -+++ boinc-client_release-7.6-7.6.33/configure.ac -@@ -64,6 +64,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d81d795de4..7beeb34ae2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -63,6 +63,7 @@ m4_pattern_allow([AC_PROG_OBJCXX]) + m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX],) dnl ------ - AC_PROG_F77 AC_PROG_CPP +AC_PROG_OBJCXX AC_PROG_MAKE_SET SAH_LINKS AC_LANG_PUSH(C) -@@ -1081,6 +1082,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test +@@ -1068,6 +1069,8 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes || test "x${ 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]) 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 4ae8d580d7..e060b1a40c 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 @@ -Check for gtk2+ only when manager is enabled +From d53e9617fb6446780478bb13907efd111f241cd1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 3 Nov 2016 01:20:33 -0700 +Subject: [PATCH] Check for gtk2+ only when manager is enabled Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: boinc-client_release-7.6-7.6.33/configure.ac -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/configure.ac -+++ boinc-client_release-7.6-7.6.33/configure.ac -@@ -1033,6 +1033,11 @@ else +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7beeb34ae2..35234c2762 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1018,6 +1018,11 @@ else AM_CONDITIONAL([GUI_GTK], false) fi @@ -19,7 +26,7 @@ Index: boinc-client_release-7.6-7.6.33/configure.ac dnl ---------- libNotify -------------------------------------------------- if test "${enable_manager}" = yes ; then PKG_CHECK_MODULES(LIBNOTIFY, [libnotify]) -@@ -1082,7 +1087,6 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test +@@ -1069,7 +1074,6 @@ AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes || test "x${ 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]) 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 0b057eabc8..ad4493f0b6 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 @@ +From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 3 Nov 2016 01:20:33 -0700 +Subject: [PATCH] boinc: Add recipe for boinc-client + Do not add prefix/lib to library search path let sysroot take care of that Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Inappropriate[Cross-compile specific] -Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 -=================================================================== ---- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 -+++ boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 +--- + m4/ax_check_gl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 +index e26ce5b930..1e60c9266a 100644 +--- a/m4/ax_check_gl.m4 ++++ b/m4/ax_check_gl.m4 @@ -58,7 +58,7 @@ else else 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 d472d3269e..ce3f691b2c 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 \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "bd12338dbd29083daa5a4b022592ca31ff68cd98" +SRCREV = "a432e1ccbf864f99c7b29a1645de38056915f944" BRANCH = "client_release/7/${PV}" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ |