Merge branch 'next'

This commit is contained in:
Peter Korsgaard 2022-03-09 14:23:07 +01:00
commit d0064df6bd
48 changed files with 762 additions and 199 deletions

View File

@ -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/

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -24,15 +24,15 @@ CRYPTSETUP_AUTORECONF = 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

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

171
package/ola/Config.in Normal file
View File

@ -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

8
package/ola/ola.hash Normal file
View File

@ -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

223
package/ola/ola.mk Normal file
View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -111,6 +111,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
@ -138,30 +179,41 @@ 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 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
$(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' or 'setuptools'")
$$(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
@ -180,6 +232,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.
@ -194,8 +251,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
@ -208,8 +265,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
@ -221,8 +279,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
@ -235,8 +293,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

View File

@ -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 <romain.naour@gmail.com>
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 <romain.naour@gmail.com>
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

View File

@ -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 <fontaine.fabrice@gmail.com>
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 '<stddef.h>'; did you forget to '#include <stddef.h>'?
7 | #include <features.h>
+++ |+#include <stddef.h>
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 <fontaine.fabrice@gmail.com>
---
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 <config.h>
+#include <stddef.h>
#include <sys/random.h>
#include <errno.h>
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 <config.h>
+#include <stddef.h>
#include <sys/random.h>
#include <errno.h>
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 <config.h>
+#include <stddef.h>
#include <sys/random.h>
#include <errno.h>
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 <config.h>
+#include <stddef.h>
#include <sys/random.h>
#include <errno.h>
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 <config.h>
+#include <stddef.h>
#include <sys/random.h>
#include <errno.h>
--
2.30.2
2.31.1

View File

@ -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

View File

@ -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)

View File

@ -0,0 +1,80 @@
From 2cd8b5708be88b90ea2fa0fb35407a5ec2038c8e Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Sat, 27 Nov 2021 02:36:15 -0700
Subject: [PATCH] Fix ast version parser for multiple assignments
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
[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

View File

@ -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

View File

@ -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))

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1,43 +0,0 @@
From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@gmail.com>
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 <nhorman@tuxdriver.com>
[Retrieved from:
https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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 <pthread.h>]])
+ ], [[#include <pthread.h>]])
+
AS_IF(
[ test "x$with_nistbeacon" != "xno"],
[

View File

@ -1,49 +0,0 @@
From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@gmail.com>
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 <nhorman@tuxdriver.com>
[Retrieved from:
https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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;
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

69
support/scripts/pyinstaller.py Executable file
View File

@ -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()