From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/
Date: Sat, 26 Feb 2022 18:16:39 +0000 (UTC) [thread overview]
Message-ID: <1645822051.36e42377c96008cd4bc4b200f98ec2348ba4b2a9.flow@gentoo> (raw)
commit: 36e42377c96008cd4bc4b200f98ec2348ba4b2a9
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Feb 25 20:47:31 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 20:47:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36e42377
dev-libs/open62541: Bump version to v1.2.4
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
dev-libs/open62541/Manifest | 1 +
| 31 ++++++
.../open62541/files/open62541-1.2.4-tests.patch | 124 +++++++++++++++++++++
dev-libs/open62541/open62541-1.2.4.ebuild | 104 +++++++++++++++++
4 files changed, 260 insertions(+)
diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest
index d59ef7daa..aa9a52758 100644
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1 +1,2 @@
DIST open62541-1.2.3.tar.gz 3645511 BLAKE2B 3cebe1a4200cb026916cd801303937509d8e59c10af5400f5a212c16006c1744bc403fad25b40fb7bcf9043982649f1661c13aa16df8a07db6334f7e2fc55872 SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
+DIST open62541-1.2.4.tar.gz 3646665 BLAKE2B 83441f05d4f846e83d441a84d46e6bff4459a239d02eee7a78f846a26cb433ecb67a2b178c8a5bcbc748b10ac49f055f5c9063b02dd72d2e574f1b1e0ea3fe97 SHA512 4fb4c01c0573dd5e06c4f3a0caa6b7b5ef3bafbbf3d4d7a0770e9e448e111b5f4906d6911271f28c27a2b1f07710a6bc0b3204ca39e043c350f5051c3ee8e821
--git a/dev-libs/open62541/files/open62541-1.2.4-headers.patch b/dev-libs/open62541/files/open62541-1.2.4-headers.patch
new file mode 100644
index 000000000..75d79ec46
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.4-headers.patch
@@ -0,0 +1,31 @@
+From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sun, 12 Jul 2020 10:39:31 +0200
+Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers
+
+When the corresponding features are enabled, the headers should be installed as
+well.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -907,6 +907,7 @@ if(UA_ENABLE_PUBSUB)
+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
+ list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
+ if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h)
+ list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c)
+ endif()
+ if(UA_ENABLE_PUBSUB_ETH_UADP)
+@@ -916,6 +917,7 @@ if(UA_ENABLE_PUBSUB)
+ if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
+ if(EXISTS "${XDP_LIBRARY}")
+ list(APPEND open62541_LIBRARIES ${XDP_LIBRARY})
++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h)
+ list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c)
+ else()
+ MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP")
diff --git a/dev-libs/open62541/files/open62541-1.2.4-tests.patch b/dev-libs/open62541/files/open62541-1.2.4-tests.patch
new file mode 100644
index 000000000..e8b83fe08
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.2.4-tests.patch
@@ -0,0 +1,124 @@
+From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Sat, 20 Jun 2020 14:28:57 +0200
+Subject: [PATCH 1/3] cmake: pubsub: Disable failing tests within portage
+
+The Pub/Sub tests won't work within portage. Disable them.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ tests/CMakeLists.txt | 103 ---------------------------------------------------
+ 1 file changed, 103 deletions(-)
+
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -341,109 +341,6 @@ if(UA_ENABLE_DISCOVERY)
+ add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery)
+ endif()
+
+-if(UA_ENABLE_PUBSUB)
+- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+- target_link_libraries(check_pubsub_encoding ${LIBS})
+- add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding)
+- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_pds ${LIBS})
+- add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds)
+- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_connection_udp ${LIBS})
+- add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp)
+- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_publish ${LIBS})
+- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish)
+- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_publish_uadp ${LIBS})
+- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp)
+- add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_get_state ${LIBS})
+- add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state)
+-
+- #Link libraries for executing subscriber unit test
+- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_subscribe ${LIBS})
+- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_publishspeed ${LIBS})
+- add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish)
+- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_config_freeze ${LIBS})
+- add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze)
+- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_publish_rt_levels ${LIBS})
+- add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels)
+- add_executable(check_pubsub_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS})
+- add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze)
+- add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS})
+- add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels)
+- add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS})
+- add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_rt_levels)
+-
+- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_multiple_layer ${LIBS})
+- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer)
+-
+- if (UA_ENABLE_PUBSUB_MONITORING)
+- add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+- $<TARGET_OBJECTS:open62541-object>
+- $<TARGET_OBJECTS:open62541-testplugins>)
+- target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS})
+- add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout)
+- endif()
+-
+- if(UA_ENABLE_PUBSUB_ETH_UADP)
+- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF)
+- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_connection_ethernet ${LIBS})
+- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet)
+- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_publish_ethernet ${LIBS})
+- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet)
+- endif()
+- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
+- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_connection_xdp ${LIBS})
+- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp)
+- endif()
+- endif()
+- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
+- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS})
+- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf)
+- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS})
+- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf)
+- endif()
+-
+- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
+- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_informationmodel ${LIBS})
+- add_test_valgrind(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel)
+- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
+- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_informationmodel_methods ${LIBS})
+- add_test_valgrind(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods)
+-
+- endif()
+- endif()
+- if(UA_ENABLE_PUBSUB_MQTT)
+- if(NOT WIN32)
+- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_connection_mqtt ${LIBS})
+- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt)
+- endif()
+- endif()
+- if(UA_ENABLE_PUBSUB_FILE_CONFIG)
+- add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+- target_link_libraries(check_pubsub_configuration ${LIBS})
+- add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration)
+- endif()
+-endif()
+-
+ add_executable(check_server_readspeed server/check_server_readspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+ target_link_libraries(check_server_readspeed ${LIBS})
+ add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed)
diff --git a/dev-libs/open62541/open62541-1.2.4.ebuild b/dev-libs/open62541/open62541-1.2.4.ebuild
new file mode 100644
index 000000000..971777330
--- /dev/null
+++ b/dev-libs/open62541/open62541-1.2.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Open source C implementation of OPC UA"
+HOMEPAGE="https://open62541.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ encryption? ( || ( mbedtls openssl ) )
+ etf? ( pubsub )
+ xdp? ( pubsub )
+"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ doc? (
+ media-gfx/graphviz
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ ')
+ )
+ test? (
+ dev-libs/check
+ dev-util/valgrind
+ $(python_gen_cond_dep '
+ dev-python/subunit[${PYTHON_USEDEP}]
+ ')
+ )
+"
+DEPEND="
+ mbedtls? ( net-libs/mbedtls:= )
+ openssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${DEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-headers.patch"
+ "${FILESDIR}/${P}-tests.patch"
+)
+
+src_prepare() {
+ # bug 780912
+ sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DOPEN62541_VERSION=v${PV}
+ -DUA_BUILD_EXAMPLES=OFF
+ -DUA_BUILD_TOOLS=$(usex tools)
+ -DUA_BUILD_UNIT_TESTS=$(usex test)
+ -DUA_ENABLE_ENCRYPTION=$(usex encryption)
+ -DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls)
+ -DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl)
+ -DUA_ENABLE_PUBSUB=$(usex pubsub)
+ -DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
+ -DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf)
+ -DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_build doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. )
+ cmake_src_install
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples/
+ fi
+
+ python_fix_shebang "${ED}"
+}
+
+src_test() {
+ cmake_src_test -j1
+}
next reply other threads:[~2022-02-26 18:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-26 18:16 Florian Schmaus [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-16 10:19 [gentoo-commits] repo/proj/guru:master commit in: dev-libs/open62541/, dev-libs/open62541/files/ Florian Schmaus
2021-01-23 11:49 Michał Górny
2021-01-23 11:49 Michał Górny
2021-01-23 11:49 Michał Górny
2020-12-11 8:36 Andrew Ammerlaan
2020-08-17 10:17 Andrew Ammerlaan
2020-08-17 10:17 Andrew Ammerlaan
2020-07-12 11:57 Andrew Ammerlaan
2020-06-21 19:11 Andrew Ammerlaan
2020-06-21 19:11 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1645822051.36e42377c96008cd4bc4b200f98ec2348ba4b2a9.flow@gentoo \
--to=flow@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox