From 2f7f8f381394207bfb029ec395f5ced5695a0a2e Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Tue, 8 Feb 2022 13:19:28 +0100 Subject: [PATCH 01/18] package/liquid-dsp: bump version to 1.4.0 Signed-off-by: Guillaume W. Bres Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/liquid-dsp/liquid-dsp.hash | 4 ++-- package/liquid-dsp/liquid-dsp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 31bcd68767..7e5de6b259 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 9745893b7c..fcdf572532 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_VERSION = 1.4.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE From 948050c0f9096953555ed7f84835c5297a415a6d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 8 Feb 2022 23:20:24 +0100 Subject: [PATCH 02/18] package/libxkbcommon: bump version to 1.4.0 - bump version to 1.4.0 - add new option to select some tools for the target (xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, xkbcli-interactive-evdev, xkbcli-interactive-x11, xkbcli-interactive-wayland For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libxkbcommon/Config.in | 11 +++++++++++ package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb..e9f61227a0 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe706..fff2b7a943 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99..f2c49cc700 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 @@ -23,4 +23,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) From 0fc614345f1b8389df46b8f2d64cb3ae5a209b6d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 9 Feb 2022 01:23:08 +0100 Subject: [PATCH 03/18] package/poke: bump to version 2.1 Tested locally with poke testsuite on aarch64 with Qemu: === poke Summary === # of expected passes 6320 # of unsupported tests 7 Build tested with test-pkg: https://gitlab.com/kubu93/buildroot/-/pipelines/466516470 See: http://www.jemarch.net/poke-2.0-relnotes.html http://www.jemarch.net/poke-2.1-relnotes.html Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...P2MAN-replace-by-true-when-cross-com.patch | 6 +- ...andom.c-fix-build-with-uclibc-1.0.35.patch | 60 +++++++++---------- package/poke/poke.hash | 2 +- package/poke/poke.mk | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index c169516153..85a76e068e 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From b35dadae6371c3727cac46ae5bd348b66aa411fc Mon Sep 17 00:00:00 2001 +From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -17,10 +17,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2c6f1aef..9c4c9be2 100644 +index a1943b57..c633f719 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index 757dc3f760..bd20b5d2c6 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -15,7 +15,7 @@ In file included from ./sys/random.h:40, /tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 7 | #include +++ |+#include - 8 | + 8 | This patch is not upstreamable as it is only a workaround for uclibc < 1.0.35, upstream uclibc has been patched with @@ -26,47 +26,47 @@ Fixes: Signed-off-by: Fabrice Fontaine --- - jitter/gnulib-local/getrandom.c | 1 + - gl/getrandom.c | 1 + gl-libpoke/getrandom.c | 1 + + gl/getrandom.c | 1 + + jitter/gnulib-local/getrandom.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/jitter/gnulib-local/getrandom.c -+++ b/jitter/gnulib-local/getrandom.c -@@ -19,6 +19,7 @@ - - #include - -+#include - #include - - #include -diff --git a/gl/getrandom.c b/gl/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/gl/getrandom.c -+++ b/gl/getrandom.c -@@ -19,6 +19,7 @@ - - #include - -+#include - #include - - #include diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index 41212fb32..0ad3f9648 100644 +index e146873..3948d8d 100644 --- a/gl-libpoke/getrandom.c +++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ #include ++#include + #include + + #include +diff --git a/gl/getrandom.c b/gl/getrandom.c +index e146873..3948d8d 100644 +--- a/gl/getrandom.c ++++ b/gl/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index e146873..3948d8d 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c +@@ -19,6 +19,7 @@ + + #include + +#include #include #include -- -2.30.2 +2.31.1 diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 1367262f54..c30713b91c 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24 poke-1.4.tar.gz +sha256 cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670 poke-2.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b0..2852673548 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 2.1 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) From 91cc129d72cf972c906829b1085c96797e41efd0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 9 Feb 2022 20:24:36 +0100 Subject: [PATCH 04/18] package/rng-tools: bump to version 6.15 Drop patches (already in version) https://github.com/nhorman/rng-tools/releases/tag/v6.15 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ct-non-posix-extensions-for-pthreads.patch | 43 ---------------- ...-either-pthread-affinity-set-methods.patch | 49 ------------------- package/rng-tools/rng-tools.hash | 2 +- package/rng-tools/rng-tools.mk | 2 +- 4 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch delete mode 100644 package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch diff --git a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch deleted file mode 100644 index ba6cf63d7c..0000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:43:01 -0400 -Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads - -Theres a desire to build rngd with musl, which doesn't have all the gnu -extensions (but it has some). So test for those. Note, this requires -the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0fe06fc..de7dca3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD - AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS([rng-tools-config.h]) - AC_CONFIG_MACRO_DIRS([m4]) -+AC_USE_SYSTEM_EXTENSIONS - - dnl Parse options - -@@ -100,6 +101,12 @@ AS_IF( - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) - -+AC_CHECK_DECL(pthread_attr_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], -+ [ AC_CHECK_DECL(pthread_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include ]]) -+ ], [[#include ]]) -+ - AS_IF( - [ test "x$with_nistbeacon" != "xno"], - [ diff --git a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch deleted file mode 100644 index 17285baa6a..0000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:48:10 -0400 -Subject: [PATCH] Allow for use of either pthread affinity set methods - -musl has support for pthread_setaffinity_np, but not -pthread_attr_setaffinity_np. so check for hte existence of either -function in configure, and use the appropriate one. - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893] -Signed-off-by: Fabrice Fontaine ---- - rngd_jitter.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index ea29436..5c7e09e 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, - for(i=i-1;i>=0;i--) { - CPU_SET(i,cpus); - } -- pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); - -+ /* -+ * Note that only one of: -+ * HAVE_PTHREAD_ATTR_SETAFFINITY -+ * and -+ * HAVE_PTHREAD_SETAFFINITY -+ * Will ever be set, as per the configure.ac logic -+ */ -+#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY -+ pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); -+#endif - ret = -pthread_create(&thread_ctx->notime_thread_id, - &thread_ctx->notime_pthread_attr, - start_routine, arg); - -+#ifdef HAVE_PTHREAD_SETAFFINITY -+ pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); -+#endif -+ - CPU_FREE(cpus); - return ret; - } diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc6..be2ee13969 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 bff0c58dff90ec10bd61f672e48618e045155eabd60b32d63a9c4ffbdad05f3a rng-tools-6.15.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4..8b195ea875 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.15 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING From 80f480381b3b307079c761f14508458782772111 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Wed, 2 Feb 2022 09:33:38 +0200 Subject: [PATCH 05/18] package/{libuv, uvw}: bump to versions 1.43.0, 2.11.0_libuv_v1.43 Signed-off-by: Asaf Kahlon Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 2 +- package/uvw/uvw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f168..1874aa344c 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz +sha256 9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d libuv-1.43.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951d..ed51fc92f9 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.42.0 +LIBUV_VERSION = 1.43.0 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b3..564c0980f3 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz +sha256 3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514 uvw-2.11.0_libuv_v1.43.tar.gz sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cb..161c40849d 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.11.0_libuv_v1.43 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO From 7b969c8c8cd30a97a47f7197c114e37c9d12d80b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 12 Feb 2022 07:22:20 +0100 Subject: [PATCH 06/18] package/xmrig: bump version to 6.16.4 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 36b0c8c8a1..ff5f80a67b 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 245ba47a6b8ae8e9a9df1c055e90f22f944a7d1219416cb30268881d0c0d377b xmrig-6.16.4.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54c..1feab499fc 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.16.4 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 795c473cfdedc71b6dcf5b691cec729d2845da0b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 12 Feb 2022 04:18:43 -0700 Subject: [PATCH 07/18] package/python-setuptools: bump to version 60.8.2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4c..e04235e041 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 f47a5750f6084cce3418f213a9d97785 setuptools-60.8.2.tar.gz +sha256 66b8598da112b8dc8cd941d54cf63ef91d3b50657b374457eda5851f3ff6a899 setuptools-60.8.2.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0..8653c42259 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 60.8.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ae/0b/e458b0d07dced3d7fa2d21d828e708f374ef82040f2012c05d35f47f9af3 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From 6aca97d6e51a006187bcd3319cb7ff1a92380c66 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 13 Feb 2022 10:15:32 +0100 Subject: [PATCH 08/18] package/{mesa3d, mesa3d-headers}: bump version to 21.3.6 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 871cf2f495..c8573fafad 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.5 +MESA3D_HEADERS_VERSION = 21.3.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e36d798e21..d64b833100 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2022-February/000663.html +sha256 96bb761fd546e9aa41d025fcc025225c5668443839dae21e3731959beb096736 mesa-21.3.6.tar.xz +sha512 8c930e04eade29f689384ee7d6e2f178acbbf30fa6c9fdf132281279658c3c221ec7f9b1318e3c0a654c6136f925a5c0a35eaf849b65db7674641127c71e8a4f mesa-21.3.6.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fc..95618b2072 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.5 +MESA3D_VERSION = 21.3.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 9a2beaf778d3649ab395c2a931a3935f69191585 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Sun, 13 Feb 2022 13:02:58 +0100 Subject: [PATCH 09/18] boot/barebox: bump version to 2022.01.0 Signed-off-by: Bartosz Bilas Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8a..c16fea3cea 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b5..3d52d40beb 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ # From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +md5 753ba533ced54f4113f9e97846c13fc1 barebox-2022.01.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 ddf7898075bec05e4865ce0f7a2ac19c2b1efaaa0d066eba1939494e25711d28 barebox-2022.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From fad0f7a096ce29b3626e4ac41e5dbea0ff3e7ae0 Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Sun, 13 Feb 2022 08:55:40 -0500 Subject: [PATCH 10/18] package/unbound: bump version to 1.15.0 Signed-off-by: Kyle Harding Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0..99caf7dd3d 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.15.0.tar.gz.sha256 +sha256 a480dc6c8937447b98d161fe911ffc76cfaffa2da18788781314e81339f1126f unbound-1.15.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b..1e6e0d99d7 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.15.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause From 16ff948444c3978d63f483344a3d92d994c64312 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 13 Feb 2022 17:11:07 +0100 Subject: [PATCH 11/18] package/ola: reintroduce package at version 0.10.8 The ola package (Open Lighting Architecture) version 0.10.2 was removed in commit e692e1f2b2285c18057e2c70cc1d9d0cfdb15d5e due to an incompatibility with the protobuf version 3.2.0 present in Buildroot at that time. ola was fixed to support newer protobuf version in: https://github.com/OpenLightingProject/ola/pull/1630 This commit reintroduce this package at version 0.10.8. For changelogs since its removal at 0.10.2, see: - https://github.com/OpenLightingProject/ola/releases/tag/0.10.3 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.4 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.5 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.6 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.7 - https://github.com/OpenLightingProject/ola/releases/tag/0.10.8 This commit is based on the previously removed ola package, with the following rework: - Remove the dependency on BR2_HOST_GCC_AT_LEAST_4_5 as host gcc is now guaranteed to be at least 4.8. - Update target gcc dependency to >= 4.8 to reflect protobuf requirement. - Remove the BR2_PACKAGE_OLA_SLP option, which was removed in ola 0.9.4. - Change the "DMX4Linux" plugin option name to "Open DMX" to better reflect the ola option (DMX4Linux is a legacy plugin for 2.6 Kernels). - Update Python support to version 3.x only - Remove patches, as they are no longer needed - Add options for ola plugins: ftdidmx, gpio, karate, openpixelcontrol, renard, spi, uartdmx, usbdmx - Reorder options alphabetically - Update project URL - Add license hashes Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/ola/Config.in | 171 ++++++++++++++++++++++++++++++++ package/ola/ola.hash | 8 ++ package/ola/ola.mk | 223 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 404 insertions(+) create mode 100644 package/ola/Config.in create mode 100644 package/ola/ola.hash create mode 100644 package/ola/ola.mk diff --git a/DEVELOPERS b/DEVELOPERS index ac702d8d0f..91e9060ac5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1610,6 +1610,7 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/ola/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ diff --git a/package/Config.in b/package/Config.in index 10209d84d7..9a8196efe2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -535,6 +535,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" diff --git a/package/ola/Config.in b/package/ola/Config.in new file mode 100644 index 0000000000..36b175138f --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,171 @@ +comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + +menuconfig BR2_PACKAGE_OLA + bool "ola (open lighting architecture)" + depends on BR2_INSTALL_LIBSTDCPP # protobuf + depends on !BR2_STATIC_LIBS # protobuf + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Open Lighting Architecture provides applications + with a mechanism to send and receive DMX512 & RDM + commands using hardware devices and DMX over IP protocols. + + https://www.openlighting.org/ola/ + +if BR2_PACKAGE_OLA + +comment "bindings and interface" + +config BR2_PACKAGE_OLA_WEB + bool "http interface" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd + select BR2_PACKAGE_LIBMICROHTTPD + help + Build OLA with browser interface. + +config BR2_PACKAGE_OLA_PYTHON_BINDINGS + bool "python bindings" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PROTOBUF + help + Build OLA with support for the Python language. + +comment "tests and examples" + +config BR2_PACKAGE_OLA_EXAMPLES + bool "examples" + select BR2_PACKAGE_NCURSES + help + Build OLA examples. + +config BR2_PACKAGE_OLA_RDM_TESTS + bool "rdm tests" + depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "plugin selections" + +config BR2_PACKAGE_OLA_PLUGIN_ARTNET + bool "artnet" + help + Build Artnet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_DUMMY + bool "dummy" + help + Build Dummy plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_E131 + bool "acn E131" + help + Build ACN E131 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_ESPNET + bool "espnet" + help + Build EspNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_FTDIDMX + bool "ftdidmx" + select BR2_PACKAGE_LIBFTDI1 + help + Build FTDI USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_GPIO + bool "GPIO" + help + Build GPIO plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KARATE + bool "karate" + help + Build Karate plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_KINET + bool "kinet" + help + Build KiNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_MILINT + bool "Milford Instruments" + help + Build Milford Instruments 1-463 plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENDMX + bool "Enttec Open DMX" + help + Build Enttec Open DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL + bool "Open Pixel Control" + help + Build Open Pixel Control (OPC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_OSC + bool "osc" + select BR2_PACKAGE_LIBLO + help + Build Open Sound Control (OSC) plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_PATHPORT + bool "pathport" + help + Build Pathport plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_RENARD + bool "renard" + help + Build Renard plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SANDNET + bool "sandnet" + help + Build SandNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SHOWNET + bool "shownet" + help + Build ShowNet plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_SPI + bool "spi" + help + Build SPI plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI + bool "stageprofi" + select BR2_PACKAGE_LIBUSB + help + Build StageProfi plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_UARTDMX + bool "uartdmx" + help + Build UART Native DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBDMX + bool "usbdmx" + select BR2_PACKAGE_LIBUSB + help + Build USB DMX plugin for OLA. + +config BR2_PACKAGE_OLA_PLUGIN_USBPRO + bool "usbpro" + select BR2_PACKAGE_LIBUSB + help + Build UsbPro plugin for OLA. + +endif diff --git a/package/ola/ola.hash b/package/ola/ola.hash new file mode 100644 index 0000000000..7565adabde --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz + +# License files (locally computed) +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING +sha256 1480a883c87789075ccdead38b8ad9e2d740d6f7eefaaf183f894b50bebd8a25 GPL +sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 LGPL +sha256 685ceaf368d37250f69f2861e91a4cbbab069e81af8bf50adce8a498936e02fc LICENCE diff --git a/package/ola/ola.mk b/package/ola/ola.mk new file mode 100644 index 0000000000..5090076175 --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,223 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) +OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) +OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE +OLA_INSTALL_STAGING = YES +OLA_AUTORECONF = YES + +# util-linux provides uuid lib +OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola + +OLA_CONF_OPTS = \ + ac_cv_have_pymod_google_protobuf=yes \ + --disable-fatal-warnings \ + --disable-gcov \ + --disable-ja-rule \ + --disable-java-libs \ + --disable-root-check \ + --disable-tcmalloc \ + --disable-unittests \ + --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin + +HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf + +# When building the host part, disable as much as possible to speed up +# the configure step and avoid missing host dependencies. +HOST_OLA_CONF_OPTS = \ + --disable-all-plugins \ + --disable-osc \ + --disable-uart \ + --disable-libusb \ + --disable-libftdi \ + --disable-http \ + --disable-examples \ + --disable-unittests \ + --disable-doxygen-html \ + --disable-doxygen-doc \ + --disable-fatal-warnings + +# On the host side, we only need ola_protoc_plugin, so build and install this +# only. +HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin +define HOST_OLA_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin +endef + +# sets where to find python libs built for target and required by ola +OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages +OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +## OLA Bindings and Interface selections + +ifeq ($(BR2_PACKAGE_OLA_WEB),y) +OLA_CONF_OPTS += --enable-http +OLA_DEPENDENCIES += libmicrohttpd +else +OLA_CONF_OPTS += --disable-http +endif + +ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +OLA_CONF_OPTS += --enable-python-libs +OLA_DEPENDENCIES += python3 python-protobuf +else +OLA_CONF_OPTS += --disable-python-libs +endif + +## OLA Examples and Tests + +ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) +OLA_CONF_OPTS += --enable-examples +OLA_DEPENDENCIES += ncurses +else +OLA_CONF_OPTS += --disable-examples +endif + +ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) +OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV += ac_cv_have_pymod_numpy=yes +else +OLA_CONF_OPTS += --disable-rdm-tests +endif + +## OLA Plugin selections + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) +OLA_CONF_OPTS += --enable-artnet +else +OLA_CONF_OPTS += --disable-artnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) +OLA_CONF_OPTS += --enable-dummy +else +OLA_CONF_OPTS += --disable-dummy +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) +OLA_CONF_OPTS += --enable-e131 +else +OLA_CONF_OPTS += --disable-e131 +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) +OLA_CONF_OPTS += --enable-espnet +else +OLA_CONF_OPTS += --disable-espnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_FTDIDMX),y) +OLA_CONF_OPTS += --enable-ftdidmx +OLA_DEPENDENCIES += libftdi1 +else +OLA_CONF_OPTS += --disable-ftdidmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_GPIO),y) +OLA_CONF_OPTS += --enable-gpio +else +OLA_CONF_OPTS += --disable-gpio +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KARATE),y) +OLA_CONF_OPTS += --enable-karate +else +OLA_CONF_OPTS += --disable-karate +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) +OLA_CONF_OPTS += --enable-kinet +else +OLA_CONF_OPTS += --disable-kinet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) +OLA_CONF_OPTS += --enable-milinst +else +OLA_CONF_OPTS += --disable-milinst +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) +OLA_CONF_OPTS += --enable-opendmx +else +OLA_CONF_OPTS += --disable-opendmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENPIXELCONTROL),y) +OLA_CONF_OPTS += --enable-openpixelcontrol +else +OLA_CONF_OPTS += --disable-openpixelcontrol +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) +OLA_CONF_OPTS += --enable-osc +OLA_DEPENDENCIES += liblo +else +OLA_CONF_OPTS += --disable-osc +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) +OLA_CONF_OPTS += --enable-pathport +else +OLA_CONF_OPTS += --disable-pathport +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_RENARD),y) +OLA_CONF_OPTS += --enable-renard +else +OLA_CONF_OPTS += --disable-renard +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) +OLA_CONF_OPTS += --enable-sandnet +else +OLA_CONF_OPTS += --disable-sandnet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) +OLA_CONF_OPTS += --enable-shownet +else +OLA_CONF_OPTS += --disable-shownet +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SPI),y) +OLA_CONF_OPTS += --enable-spi +else +OLA_CONF_OPTS += --disable-spi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) +OLA_CONF_OPTS += --enable-stageprofi --enable-libusb +else +OLA_CONF_OPTS += --disable-stageprofi +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_UARTDMX),y) +OLA_CONF_OPTS += --enable-uartdmx +else +OLA_CONF_OPTS += --disable-uartdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBDMX),y) +OLA_CONF_OPTS += --enable-usbdmx --enable-libusb +else +OLA_CONF_OPTS += --disable-usbdmx +endif + +ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) +OLA_CONF_OPTS += --enable-usbpro --enable-libusb +else +OLA_CONF_OPTS += --disable-usbpro +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From f5a8485963dc0112c0201e712d599d31f0081035 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 13 Feb 2022 22:34:30 +0100 Subject: [PATCH 12/18] package/opentracing-cpp: bump to version 1.6.0 Update indentation in hash file (two spaces) https://github.com/opentracing/opentracing-cpp/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/opentracing-cpp/opentracing-cpp.hash | 4 ++-- package/opentracing-cpp/opentracing-cpp.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a..8cfaf5fd47 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96..12ce40fbed 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE From d1ca33e81230eaa5fe41c4945075c62821128a8b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 13 Feb 2022 22:51:59 +0100 Subject: [PATCH 13/18] package/mutt: bump to version 2.2.0 libgsasl is an optional dependency since https://gitlab.com/muttmua/mutt/-/commit/68caf9140c8217ecf6c848460c4b4d27996b2922 http://www.mutt.org/relnotes/2.2/ https://gitlab.com/muttmua/mutt/-/blob/mutt-2-2-rel/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa3..bbc9d459b0 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 e84597f06d03ca82f8ca3b5ec8bc294c150709b43ed2a0177bf479c3e3345314 mutt-2.2.0.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a..51178ef03d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -53,8 +53,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +79,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif From c3810c131761922ae8c046840c78430c4125f16e Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Wed, 16 Feb 2022 21:32:58 +0100 Subject: [PATCH 14/18] package/pkg-python.mk: refactor build/install opts The python package infrastructure defines a number of helper variables that are used to construct the build and install commands. However, there are still a few parts (setup.py and its argument) that are set explicitly in _BUILD_CMDS and _INSTALL_CMDS. This creates problems if we want to add another setup type that does not use setup.py. Therefore, move the setup.py part into the helper variables as well. Since this means that the variable becomes a full command rather than just options, rename them to _BUILD_CMD and _INSTALL_CMD. While we're at it, also clean up the whitespace in the definition of these variables. They were aligned on = at some point, but that alignment was already broken. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 02df061a19..61f0dd6ec2 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -130,27 +130,27 @@ endif # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") @@ -186,8 +186,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif @@ -200,8 +200,9 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) endef endif @@ -213,8 +214,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -227,8 +228,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif From 29a12eb86aee706082f344a25d2e563984b9aa1a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 12 Feb 2022 04:34:06 -0700 Subject: [PATCH 15/18] package/python-flit-core: new package/infrastructure This adds pep517(needed for flit-core to build itself) and flit python package types. We need to add an installer script and pass it appropriate options for installing pep517 wheels generated by python-pypa-build during the build stage. Unfortunately it seems pep517 does not support builds without using the wheel format. We also need to add a patch fixing the version parser in flit-core. Signed-off-by: James Hilliard [Arnout: - fix indentation in pkg-python.mk (tabs, not spaces); - use the new _CMD variables instead of duplicating the entire _CMDS definitions; - no need to filter dependencies (they're not self-referencing); - _NEEDS_HOST_PYTHON no longer exists; - host-python-pypa-build gets added to DEPENDENCIES automatically. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 59 +++++++++++++- ...sion-parser-for-multiple-assignments.patch | 80 +++++++++++++++++++ .../python-flit-core/python-flit-core.hash | 3 + package/python-flit-core/python-flit-core.mk | 13 +++ support/scripts/pyinstaller.py | 69 ++++++++++++++++ 5 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch create mode 100644 package/python-flit-core/python-flit-core.hash create mode 100644 package/python-flit-core/python-flit-core.mk create mode 100755 support/scripts/pyinstaller.py diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 61f0dd6ec2..0c5577362f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -103,6 +103,47 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PATH=$(BR_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ + PYTHONPATH="$(PYTHON3_PATH)" \ + PYTHONNOUSERSITE=1 \ + _python_sysroot=$(STAGING_DIR) \ + _python_prefix=/usr \ + _python_exec_prefix=/usr + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/usr/bin \ + --data=$(HOST_DIR)/usr + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -152,8 +193,19 @@ $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_CMD = setup.py build $(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +ifeq ($(4),target) +$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif +else +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for @@ -172,6 +224,11 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += host-python-flit-core +endif endif # SETUP_TYPE # Python interpreter to use for building the package. diff --git a/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch new file mode 100644 index 0000000000..5a94e1dcab --- /dev/null +++ b/package/python-flit-core/0001-Fix-ast-version-parser-for-multiple-assignments.patch @@ -0,0 +1,80 @@ +From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 27 Nov 2021 02:36:15 -0700 +Subject: [PATCH] Fix ast version parser for multiple assignments + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/takluyver/flit/pull/474] +--- + flit_core/common.py | 21 +++++++++++-------- + .../tests/samples/moduleunimportabledouble.py | 8 +++++++ + flit_core/tests/test_common.py | 5 +++++ + 3 files changed, 25 insertions(+), 9 deletions(-) + create mode 100644 flit_core/tests/samples/moduleunimportabledouble.py + +diff --git a/flit_core/common.py b/flit_core/common.py +index f1f378f..86bcf4b 100644 +--- a/flit_core/common.py ++++ b/flit_core/common.py +@@ -132,15 +132,18 @@ def get_docstring_and_version_via_ast(target): + for child in node.body: + # Only use the version from the given module if it's a simple + # string assignment to __version__ +- is_version_str = ( +- isinstance(child, ast.Assign) +- and len(child.targets) == 1 +- and isinstance(child.targets[0], ast.Name) +- and child.targets[0].id == "__version__" +- and isinstance(child.value, ast.Str) +- ) +- if is_version_str: +- version = child.value.s ++ if isinstance(child, ast.Assign): ++ for target in child.targets: ++ is_version_str = ( ++ isinstance(target, ast.Name) ++ and target.id == "__version__" ++ and isinstance(child.value, ast.Str) ++ ) ++ if is_version_str: ++ version = child.value.s ++ break ++ else: ++ continue + break + else: + version = None +diff --git a/flit_core/tests/samples/moduleunimportabledouble.py b/flit_core/tests/samples/moduleunimportabledouble.py +new file mode 100644 +index 0000000..42d51f3 +--- /dev/null ++++ b/flit_core/tests/samples/moduleunimportabledouble.py +@@ -0,0 +1,8 @@ ++ ++""" ++A sample unimportable module with double assignment ++""" ++ ++raise ImportError() ++ ++VERSION = __version__ = "0.1" +diff --git a/flit_core/tests/test_common.py b/flit_core/tests/test_common.py +index 02cfab7..42e230b 100644 +--- a/flit_core/tests/test_common.py ++++ b/flit_core/tests/test_common.py +@@ -70,6 +70,11 @@ class ModuleTests(TestCase): + 'version': '0.1'} + ) + ++ info = get_info_from_module(Module('moduleunimportabledouble', samples_dir)) ++ self.assertEqual(info, {'summary': 'A sample unimportable module with double assignment', ++ 'version': '0.1'} ++ ) ++ + info = get_info_from_module(Module('module1', samples_dir / 'constructed_version')) + self.assertEqual(info, {'summary': 'This module has a __version__ that requires runtime interpretation', + 'version': '1.2.3'} +-- +2.33.1 + diff --git a/package/python-flit-core/python-flit-core.hash b/package/python-flit-core/python-flit-core.hash new file mode 100644 index 0000000000..bd47fd4f6b --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 82143536b81f148851a0213305838e53 flit_core-3.6.0.tar.gz +sha256 5892962ab8b8ea945835b3a288fe9dd69316f1903d5288c3f5cafdcdd04756ad flit_core-3.6.0.tar.gz diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 0000000000..8971223d1f --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.6.0 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/08/e9/0653f7783ba2ec2f954f19442878427f1d5bfccb01842d354453c2809b22 +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_SETUP_TYPE = pep517 + +$(eval $(host-python-package)) diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py new file mode 100755 index 0000000000..6dd9242327 --- /dev/null +++ b/support/scripts/pyinstaller.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import argparse +import glob + +from installer import install +from installer.destinations import SchemeDictionaryDestination +from installer.sources import WheelFile + + +def main(): + """Entry point for CLI.""" + ap = argparse.ArgumentParser("python pyinstaller.py") + ap.add_argument("wheel_file", help="Path to a .whl file to install") + + ap.add_argument( + "--interpreter", required=True, help="Interpreter path to be used in scripts" + ) + ap.add_argument( + "--script-kind", + required=True, + choices=["posix", "win-ia32", "win-amd64", "win-arm", "win-arm64"], + help="Kind of launcher to create for each script", + ) + + dest_args = ap.add_argument_group("Destination directories") + dest_args.add_argument( + "--purelib", + required=True, + help="Directory for platform-independent Python modules", + ) + dest_args.add_argument( + "--platlib", + help="Directory for platform-dependent Python modules (same as purelib " + "if not specified)", + ) + dest_args.add_argument( + "--headers", required=True, help="Directory for C header files" + ) + dest_args.add_argument( + "--scripts", required=True, help="Directory for executable scripts" + ) + dest_args.add_argument( + "--data", required=True, help="Directory for external data files" + ) + args = ap.parse_args() + + destination = SchemeDictionaryDestination( + { + "purelib": args.purelib, + "platlib": args.platlib if args.platlib is not None else args.purelib, + "headers": args.headers, + "scripts": args.scripts, + "data": args.data, + }, + interpreter=args.interpreter, + script_kind=args.script_kind, + ) + + with WheelFile.open(glob.glob(args.wheel_file)[0]) as source: + install( + source=source, + destination=destination, + additional_metadata={}, + ) + + +if __name__ == "__main__": + main() From cc60c732a19548cfbd3543d3521324ef5faaa116 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 12 Feb 2022 04:34:07 -0700 Subject: [PATCH 16/18] package/python-tinycss2: bump to version 1.1.1 This update drops distutils support and requires flit package infrastructure. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-tinycss2/Config.in | 2 ++ package/python-tinycss2/python-tinycss2.hash | 4 ++-- package/python-tinycss2/python-tinycss2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index a34717e002..4d6dcca663 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -3,3 +3,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb3754752..e8e1d93f83 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 60272f58f8d5834b2e09ffbc9bd5de53 tinycss2-1.1.1.tar.gz +sha256 b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf tinycss2-1.1.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b97766..e4fc5dc9c5 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.1.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/1e/5a/576828164b5486f319c4323915b915a8af3fa4a654bbb6f8fc8e87b5cb17 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE From 0ce909afa98223bbd6bb1b2c65dec6cc8982ad31 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 13 Feb 2022 22:29:09 +0100 Subject: [PATCH 17/18] package/cryptsetup: openssl is the default crypto backend openssl is the default crypto backend since version 2.1.0 and https://github.com/mbroz/cryptsetup/commit/bc3d0feb5cd33f9181102b418cc7bf44fe112e82 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 2e06047c56..bad31cec8a 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -20,15 +20,15 @@ CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt # or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif From 1868f372c02760e324f91ebcf5685323855351f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 16 Feb 2022 21:45:38 +0100 Subject: [PATCH 18/18] package/dialog: bump to version 1.3-20220117 https://invisible-mirror.net/dialog/CHANGES.html#index-t20220117 Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14596 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/dialog/dialog.hash | 2 +- package/dialog/dialog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b66..3136d18b2b 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e3..681f8ec9fe 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \