From 513031fe522e69f041569fe1ef5614ce9232dd80 Mon Sep 17 00:00:00 2001 From: Daniel Novomesky Date: Thu, 16 Jul 2020 17:48:36 +0200 Subject: [PATCH 1/4] media-libs/libavif: version 0.8.0 bump New use flag gdk-pixbuf Added ~amd64 keyword Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Daniel Novomesky --- media-libs/libavif/Manifest | 1 + media-libs/libavif/libavif-0.8.0.ebuild | 53 +++++++++++++++++++++++++ media-libs/libavif/libavif-9999.ebuild | 8 ++-- media-libs/libavif/metadata.xml | 2 +- 4 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 media-libs/libavif/libavif-0.8.0.ebuild diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest index c7dddc5c20..dee7b8f0f3 100644 --- a/media-libs/libavif/Manifest +++ b/media-libs/libavif/Manifest @@ -1,3 +1,4 @@ DIST libavif-0.6.4.tar.gz 2880753 BLAKE2B d42e106a67aa82e4e9cd28488e6393e100e78bf381f8db6f9563c8563eec8c8afe64dedd4b3cdcadc296f15472995cee979469230085aa27a19a48f2d01f5e6a SHA512 ccd9ef462b9a235914f08a75f7acefc1592037e14967089bbc118838ba3603aa527f20b842c658b357f159de28dede15ab80e27f08a19ad3456247970c0ad822 DIST libavif-0.7.2.tar.gz 2892316 BLAKE2B 24f2a25744fda5f6847506ab4c7a326635fe417dd4385960322f8302b1b60c1ef96ed9ebf453fddb8eba6e7f58506e15ec6934eca76b33ccd803f324432c0340 SHA512 543aae3dde2ed19a8d2d22425260d09f577fbddbd5bc293cc9ec97e427f3854e7a957b4975130b1129a0c73847398ce88ab22de48bec500b83bc56fde671e6b7 DIST libavif-0.7.3.tar.gz 2893675 BLAKE2B 9cbfac039859f2b7fed975c8088698c8ab792773dd8a6512d5b2cf5827cb58d23a6aec6ca077da088af0dc4fb40a7d065ad5e5a8e0f4e8d11391acedb95ac31b SHA512 b8928755ee39964fd9d9575fdb393ffee0ac3597c1d6f6048e049e6c328d1e82febdb32bfa0b22e16a2fb73ff6cd1ad4af7f63fc9baccea22716d941385c028d +DIST libavif-0.8.0.tar.gz 2914015 BLAKE2B c74381ae1aa1c9b82d2fec77e6bff9ec34ea6628e6985dbdd1a01a36cfceb64ee7eddaab29611ea4dc594125d301fc1818588c706171b7d288b58f24391cfeaf SHA512 362f3c3f8005ad0bce3026282722b26685ba09986def1f410aef25a8fb2b2035b91d1465a26cc1e9ad1cee0ee88b4110e7c92eddbe09a9e39c6ed05ab04d2b9e diff --git a/media-libs/libavif/libavif-0.8.0.ebuild b/media-libs/libavif/libavif-0.8.0.ebuild new file mode 100644 index 0000000000..7e7a212558 --- /dev/null +++ b/media-libs/libavif/libavif-0.8.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake + +DESCRIPTION="Library for encoding and decoding .avif files" +HOMEPAGE="https://github.com/AOMediaCodec/libavif" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git" +else + SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="dav1d gdk-pixbuf +libaom rav1e" + +REQUIRED_USE="|| ( dav1d libaom )" + +DEPEND="dav1d? ( media-libs/dav1d ) + libaom? ( >=media-libs/libaom-2.0.0:= ) + rav1e? ( media-video/rav1e:=[capi] ) + media-libs/libpng + virtual/jpeg + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) +" +RDEPEND="${DEPEND}" +BDEPEND="" + +src_configure() { + local mycmakeargs=( + -DAVIF_BUILD_APPS=ON + -DAVIF_CODEC_AOM=$(usex libaom ON OFF) + -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF) + -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) + -DBUILD_SHARED_LIBS=ON + -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) + ) + cmake_src_configure +} + +pkg_postinst() { + if ! use libaom && ! use rav1e ; then + ewarn "libaom and rav1e flags are not set," + ewarn "libavif will work in read-only mode." + ewarn "Enable libaom or rav1e flag if you want to save .AVIF files." + fi +} diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild index 15be7ff540..7e7a212558 100644 --- a/media-libs/libavif/libavif-9999.ebuild +++ b/media-libs/libavif/libavif-9999.ebuild @@ -13,20 +13,21 @@ if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git" else SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="" + KEYWORDS="~amd64" fi LICENSE="BSD-2" SLOT="0" -IUSE="dav1d +libaom rav1e" +IUSE="dav1d gdk-pixbuf +libaom rav1e" REQUIRED_USE="|| ( dav1d libaom )" DEPEND="dav1d? ( media-libs/dav1d ) - libaom? ( >=media-libs/libaom-1.1:= ) + libaom? ( >=media-libs/libaom-2.0.0:= ) rav1e? ( media-video/rav1e:=[capi] ) media-libs/libpng virtual/jpeg + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) " RDEPEND="${DEPEND}" BDEPEND="" @@ -38,6 +39,7 @@ src_configure() { -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF) -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) -DBUILD_SHARED_LIBS=ON + -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) ) cmake_src_configure } diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml index 4bfda36a7c..35997ab114 100644 --- a/media-libs/libavif/metadata.xml +++ b/media-libs/libavif/metadata.xml @@ -4,11 +4,11 @@ dnovomesky@gmail.com Daniel Novomesky - Library for encoding and decoding .avif files Enable faster decoding via dav1d Use encoding/decoding via libaom Allow encoding via rav1e + Build a gdk-pixbuf loader From 4e77177d9990f6598d2d3471139100ba9898cb31 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Thu, 16 Jul 2020 19:12:29 +0200 Subject: [PATCH 2/4] dev-libs/open62541: Add version v1.1.1 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + .../open62541/files/open62541-1.1.1-etf.patch | 43 ++++++++ .../files/open62541-1.1.1-headers.patch | 36 ++++++ .../files/open62541-1.1.1-tests.patch | 104 ++++++++++++++++++ dev-libs/open62541/open62541-1.1.1.ebuild | 98 +++++++++++++++++ 5 files changed, 282 insertions(+) create mode 100644 dev-libs/open62541/files/open62541-1.1.1-etf.patch create mode 100644 dev-libs/open62541/files/open62541-1.1.1-headers.patch create mode 100644 dev-libs/open62541/files/open62541-1.1.1-tests.patch create mode 100644 dev-libs/open62541/open62541-1.1.1.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 1291050a05..4415d55ac4 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1,3 @@ DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031 +DIST open62541-1.1.1.tar.gz 2916122 BLAKE2B a3230911bfeaf54282b687293afc82e9d66f93250707cbdf2e2fc2141b8737153d182a7199a7fc677e5e625c17454d16f434923837554a4f79ba7c4d5013312d SHA512 5b4dacf25de6c20311de52feb0ea791779b8a9ccb894341786e63e740367ec1e8d91b984b670b1a58d62ea160d7384fedb3ff50cabbc93d76c95c330507afc57 DIST open62541-1.1.tar.gz 2931184 BLAKE2B 817caad357e25bb70c548e7367ee75c358f40c27e5fde6b2edf6fe935289f58c40aa232565f0da5ba8ba6bcaf7138ce835232b649f10c2c9dee9618421eca6d8 SHA512 cf4d28de9534069600cdd3b20e837cdfbdeb46d4da59ad70fa8ad60fa1cd7fd02216cd0b818e8ece8dedb77de1986608817ab5f015e2ac0a806d5d8ba20a1765 diff --git a/dev-libs/open62541/files/open62541-1.1.1-etf.patch b/dev-libs/open62541/files/open62541-1.1.1-etf.patch new file mode 100644 index 0000000000..cce618e63d --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1.1-etf.patch @@ -0,0 +1,43 @@ +From 8cac173827297e936a24b4bdfe73f2498dfe483a Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sun, 12 Jul 2020 10:57:08 +0200 +Subject: [PATCH 3/3] etf: Fix compiler warning/build error in etf plugin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the following warning/error: + +|In function ‘snprintf’, +| inlined from ‘UA_PubSubChannelEthernetETF_open’ at /var/tmp/portage/dev-libs/open62541-1.1/work/open62541-1.1/plugins/ua_pubsub_ethernet_etf.c:189:5, +| inlined from ‘TransportLayerEthernetETF_addChannel’ at /var/tmp/portage/dev-libs/open62541-1.1/work/open62541-1.1/plugins/ua_pubsub_ethernet_etf.c:563:40: +|/usr/include/bits/stdio2.h:67:10: error: ‘__builtin___snprintf_chk’ specified bound 40 exceeds destination size 16 [-Werror=stringop-overflow=] +| 67 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| 68 | __bos (__s), __fmt, __va_arg_pack ()); +| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| + +By using the correct size. + +Signed-off-by: Kurt Kanzenbach +--- + plugins/ua_pubsub_ethernet_etf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/ua_pubsub_ethernet_etf.c b/plugins/ua_pubsub_ethernet_etf.c +index 416b5857945a..d55eb363e3b5 100644 +--- a/plugins/ua_pubsub_ethernet_etf.c ++++ b/plugins/ua_pubsub_ethernet_etf.c +@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const UA_PubSubConnectionConfig *connectionConf + struct ifreq ifreq; + memset(&ifreq, 0, sizeof(struct ifreq)); + UA_UInt64 len = UA_MIN(address->networkInterface.length, sizeof(ifreq.ifr_name)-1); +- UA_snprintf(ifreq.ifr_name, sizeof(struct ifreq), ++ UA_snprintf(ifreq.ifr_name, sizeof(ifreq.ifr_name), + "%.*s", (int)len, + (char*)address->networkInterface.data); + +-- +2.26.2 + diff --git a/dev-libs/open62541/files/open62541-1.1.1-headers.patch b/dev-libs/open62541/files/open62541-1.1.1-headers.patch new file mode 100644 index 0000000000..97e225b013 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1.1-headers.patch @@ -0,0 +1,36 @@ +From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +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 +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7417c88088b..8f87c5d998c6 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -861,6 +861,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) +@@ -870,6 +871,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") +-- +2.26.2 + diff --git a/dev-libs/open62541/files/open62541-1.1.1-tests.patch b/dev-libs/open62541/files/open62541-1.1.1-tests.patch new file mode 100644 index 0000000000..ad96717fc5 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1.1-tests.patch @@ -0,0 +1,104 @@ +From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +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 +--- + tests/CMakeLists.txt | 78 -------------------------------------------- + 1 file changed, 78 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index c73b2b04520b..fb21fb856ba4 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -331,84 +331,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_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_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_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_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_link_libraries(check_pubsub_publish_uadp ${LIBS}) +- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp) +- +- #Link libraries for executing subscriber unit test +- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $ $) +- target_link_libraries(check_pubsub_subscribe ${LIBS}) +- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $) +- 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_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_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_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $) +- 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_ETH_UADP) +- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF) +- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $) +- 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_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_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_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_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_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_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_link_libraries(check_pubsub_connection_mqtt ${LIBS}) +- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt) +- endif() +- endif() +-endif() +- + add_executable(check_server_readspeed server/check_server_readspeed.c $ $) + target_link_libraries(check_server_readspeed ${LIBS}) + add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed) +-- +2.26.2 + diff --git a/dev-libs/open62541/open62541-1.1.1.ebuild b/dev-libs/open62541/open62541-1.1.1.ebuild new file mode 100644 index 0000000000..b6b0d4555b --- /dev/null +++ b/dev-libs/open62541/open62541-1.1.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..8} ) + +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_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( + dev-libs/check + dev-util/valgrind + $(python_gen_cond_dep ' + dev-python/subunit[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND=" + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}/${P}-etf.patch" + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-tests.patch" +) + +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 +} From 85166566c23aed1a47aa75481a88f97dc4dcec2c Mon Sep 17 00:00:00 2001 From: Matthias Coppens Date: Fri, 17 Jul 2020 09:26:22 +0200 Subject: [PATCH 3/4] gui-wm/cage: New package Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Matthias Coppens --- gui-wm/cage/Manifest | 1 + gui-wm/cage/cage-0.1.2.1.ebuild | 37 +++++++++++++++++++++++++++++++++ gui-wm/cage/cage-9999.ebuild | 35 +++++++++++++++++++++++++++++++ gui-wm/cage/metadata.xml | 15 +++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 gui-wm/cage/Manifest create mode 100644 gui-wm/cage/cage-0.1.2.1.ebuild create mode 100644 gui-wm/cage/cage-9999.ebuild create mode 100644 gui-wm/cage/metadata.xml diff --git a/gui-wm/cage/Manifest b/gui-wm/cage/Manifest new file mode 100644 index 0000000000..3b647602b3 --- /dev/null +++ b/gui-wm/cage/Manifest @@ -0,0 +1 @@ +DIST cage-0.1.2.1.tar.gz 24600 BLAKE2B 593093afd072664d1067c1df662880dcb11e00bcbcb55b46a16021e0125aff033e578d500d9aa2f9ac7e5766560c131d0a56a9245518d66caaedde572dbbaf0f SHA512 ae332d747da7b59fd8b53b50ed3033959601db0eade435aff953a2789505eb0cbf4839cb41fe537457158327685c60e4367bfb664d2d524a270a22b1f8707d5e diff --git a/gui-wm/cage/cage-0.1.2.1.ebuild b/gui-wm/cage/cage-0.1.2.1.ebuild new file mode 100644 index 0000000000..6277f05d3b --- /dev/null +++ b/gui-wm/cage/cage-0.1.2.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/Hjdskes/${PN}" +case "${PV}" in + 9999) + inherit git-r3 + ;; + *) + SRC_URI="${EGIT_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +esac +inherit meson + +DESCRIPTION="A Wayland kiosk" +HOMEPAGE="https://www.hjdskes.nl/projects/${PN}" +LICENSE="MIT" +SLOT="0" + +IUSE="-X" + +RDEPEND=" + >=gui-libs/wlroots-0.11 + x11-libs/libxkbcommon + X? ( + gui-libs/wlroots[X] + x11-libs/libxkbcommon[X] + ) +" +DEPEND="${RDEPEND}" + +KEYWORDS="-amd64 -x86" + +src_configure() { + meson_src_configure $(meson_use X xwayland) +} diff --git a/gui-wm/cage/cage-9999.ebuild b/gui-wm/cage/cage-9999.ebuild new file mode 100644 index 0000000000..e5f791883d --- /dev/null +++ b/gui-wm/cage/cage-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/Hjdskes/${PN}" +case "${PV}" in + 9999) + inherit git-r3 + ;; + *) + SRC_URI="${EGIT_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +esac +inherit meson + +DESCRIPTION="A Wayland kiosk" +HOMEPAGE="https://www.hjdskes.nl/projects/${PN}" +LICENSE="MIT" +SLOT="0" + +IUSE="-X" + +RDEPEND=" + >=gui-libs/wlroots-0.11 + x11-libs/libxkbcommon + X? ( + gui-libs/wlroots[X] + x11-libs/libxkbcommon[X] + ) +" +DEPEND="${RDEPEND}" + +src_configure() { + meson_src_configure $(meson_use X xwayland) +} diff --git a/gui-wm/cage/metadata.xml b/gui-wm/cage/metadata.xml new file mode 100644 index 0000000000..7e42ac237b --- /dev/null +++ b/gui-wm/cage/metadata.xml @@ -0,0 +1,15 @@ + + + + + coppens.matthias.abc@gmail.com + Matthias Coppens + + + This is Cage, a Wayland kiosk. + A kiosk runs a single, maximized application. + + + Enable support for X11 applications (XWayland) + + From ad04c41e497c247a4337e59dcf164ad0ae3f3af5 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 17 Jul 2020 11:43:15 +0200 Subject: [PATCH 4/4] gui-wm/cage: fix KEYWORDS Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- gui-wm/cage/cage-0.1.2.1.ebuild | 3 +-- gui-wm/cage/cage-9999.ebuild | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-wm/cage/cage-0.1.2.1.ebuild b/gui-wm/cage/cage-0.1.2.1.ebuild index 6277f05d3b..b52edd018c 100644 --- a/gui-wm/cage/cage-0.1.2.1.ebuild +++ b/gui-wm/cage/cage-0.1.2.1.ebuild @@ -10,6 +10,7 @@ case "${PV}" in ;; *) SRC_URI="${EGIT_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" esac inherit meson @@ -30,8 +31,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -KEYWORDS="-amd64 -x86" - src_configure() { meson_src_configure $(meson_use X xwayland) } diff --git a/gui-wm/cage/cage-9999.ebuild b/gui-wm/cage/cage-9999.ebuild index e5f791883d..b52edd018c 100644 --- a/gui-wm/cage/cage-9999.ebuild +++ b/gui-wm/cage/cage-9999.ebuild @@ -10,6 +10,7 @@ case "${PV}" in ;; *) SRC_URI="${EGIT_REPO_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" esac inherit meson