rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-02-18 21:00:46 +01:00
Code Issues Releases Wiki Activity

[WIP] MycroftOS: Buildroot: Bump buildroot+kernel+drivers

Browse Source 
- temp commit to be rebased when fully finished
This commit is contained in:
Peter Steenbergen 2020-03-20 11:04:38 +01:00
parent a1ce4bebab
commit e54d587f56
51 changed files with 538 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -6,9 +6,9 @@ More information about the development, process, ideas etc. at https://www.j1nx.
More information about the Mycroft A.I. software stack at https://mycroft.ai
## System.
- Linux kernel 4.19.89
- Buildroot 2019.08.3
- Mycroft 19.8.5
- Linux kernel 4.19.106
- Buildroot 2020.02.0
- Mycroft 20.02.1
- Raspberry Pi 3|3b|3b+ (Initial development hardware = 3b)
- Raspberry Pi 4

3
buildroot-external/Config.in
View File

@ -27,7 +27,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-fann2/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-fasteners/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-feedparser/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gitdb2/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gitpython/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-google-api-python-client/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-google-auth-httplib2/Config.in"
@ -37,6 +36,7 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts_token/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-humanhash3/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-lazy/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-lingua-franca/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-monotonic/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-msk/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-msm/Config.in"
@ -58,7 +58,6 @@ menu "Additional external python modules"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-requests-futures/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-rsa/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-sgmllib3k/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-smmap2/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-source/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-speechrecognition/Config.in"
source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-uritemplate/Config.in"

110
buildroot-external/configs/rpi4_defconfig
View File

@ -4,10 +4,12 @@ BR2_ARM_FPU_NEON_VFPV4=y
BR2_DL_DIR="../downloads"
BR2_CCACHE=y
BR2_CCACHE_DIR="../ccache"
BR2_SHARED_STATIC_LIBS=y
BR2_GLOBAL_PATCH_DIR="../buildroot-patches"
BR2_FORCE_HOST_BUILD=y
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
BR2_BINUTILS_VERSION_2_32_X=y
BR2_PACKAGE_GLIBC_UTILS=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
@ -29,15 +31,17 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b85f76a63d5f1b13220c61244469d55487db84f1"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ecb440abef61d198478b6e598b3510ff6680090a"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b"
BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/busybox.config"
BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
BR2_PACKAGE_BUSYBOX_WATCHDOG=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
BR2_PACKAGE_ALSA_UTILS_ACONNECT=y
@ -58,10 +62,13 @@ BR2_PACKAGE_FFMPEG_GPL=y
BR2_PACKAGE_FFMPEG_NONFREE=y
BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_FFMPEG_FFPROBE=y
BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
BR2_PACKAGE_FFMPEG_POSTPROC=y
BR2_PACKAGE_LAME=y
BR2_PACKAGE_MIMIC=y
BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA=y
BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO=y
BR2_PACKAGE_MIRACLECAST=y
BR2_PACKAGE_MJPEGTOOLS=y
BR2_PACKAGE_MOTION=y
BR2_PACKAGE_MPD_FFMPEG=y
BR2_PACKAGE_MPD_LIBSNDFILE=y
BR2_PACKAGE_MPD_MPG123=y
@ -71,11 +78,19 @@ BR2_PACKAGE_MPD_AO=y
BR2_PACKAGE_MPD_PULSEAUDIO=y
BR2_PACKAGE_MPD_LIBMPDCLIENT=y
BR2_PACKAGE_MPD_MPC=y
BR2_PACKAGE_MPV=y
BR2_PACKAGE_OMXPLAYER=y
BR2_PACKAGE_OPUS_TOOLS=y
BR2_PACKAGE_PULSEAUDIO_DAEMON=y
BR2_PACKAGE_SQUEEZELITE=y
BR2_PACKAGE_SQUEEZELITE_RESAMPLE=y
BR2_PACKAGE_V4L2GRAB=y
BR2_PACKAGE_V4L2LOOPBACK=y
BR2_PACKAGE_V4L2LOOPBACK_UTILS=y
BR2_PACKAGE_VLC=y
BR2_PACKAGE_VORBIS_TOOLS=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_LZ4=y
BR2_PACKAGE_LZIP=y
BR2_PACKAGE_LZOP=y
BR2_PACKAGE_P7ZIP=y
BR2_PACKAGE_UNRAR=y
@ -88,22 +103,42 @@ BR2_PACKAGE_DIFFUTILS=y
BR2_PACKAGE_FINDUTILS=y
BR2_PACKAGE_GIT_CRYPT=y
BR2_PACKAGE_GREP=y
BR2_PACKAGE_JO=y
BR2_PACKAGE_JQ=y
BR2_PACKAGE_MAKE=y
BR2_PACKAGE_PATCH=y
BR2_PACKAGE_PKGCONF=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_NFS_UTILS=y
BR2_PACKAGE_NTFS_3G=y
BR2_PACKAGE_DIRECTFB=y
BR2_PACKAGE_DIRECTFB_TIFF=y
BR2_PACKAGE_DIRECTFB_IMLIB2=y
BR2_PACKAGE_FBDUMP=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
BR2_PACKAGE_FREERDP=y
BR2_PACKAGE_SDL2_DIRECTFB=y
BR2_PACKAGE_SDL2_OPENGLES=y
BR2_PACKAGE_SDL2_GFX=y
BR2_PACKAGE_SDL2_IMAGE=y
BR2_PACKAGE_SDL2_MIXER=y
BR2_PACKAGE_SDL2_NET=y
BR2_PACKAGE_SDL2_TTF=y
BR2_PACKAGE_ARMBIAN_FIRMWARE=y
BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y
BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650=y
BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
BR2_PACKAGE_LINUX_FIRMWARE_AR3011=y
BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y
BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y
BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y
@ -156,16 +191,23 @@ BR2_PACKAGE_RPI_BT_FIRMWARE=y
BR2_PACKAGE_RPI_FIRMWARE=y
BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
BR2_PACKAGE_RPI_FIRMWARE_X=y
BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y
BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
BR2_PACKAGE_UX500_FIRMWARE=y
BR2_PACKAGE_WILC1000_FIRMWARE=y
BR2_PACKAGE_WILINK_BT_FIRMWARE=y
BR2_PACKAGE_ZD1211_FIRMWARE=y
BR2_PACKAGE_DBUS_CPP=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_OFONO=y
BR2_PACKAGE_PARTED=y
BR2_PACKAGE_RASPI_GPIO=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_PYTHON3_PY_ONLY=y
BR2_PACKAGE_USBMOUNT=y
BR2_PACKAGE_USBUTILS=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_PYC=y
BR2_PACKAGE_PYTHON3_BZIP2=y
BR2_PACKAGE_PYTHON3_CODECSCJK=y
BR2_PACKAGE_PYTHON3_CURSES=y
@ -175,35 +217,46 @@ BR2_PACKAGE_PYTHON3_SQLITE=y
BR2_PACKAGE_PYTHON3_XZ=y
BR2_PACKAGE_PYTHON_ALSAAUDIO=y
BR2_PACKAGE_PYTHON_ARROW=y
BR2_PACKAGE_PYTHON_CHERRYPY=y
BR2_PACKAGE_PYTHON_COLORAMA=y
BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y
BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y
BR2_PACKAGE_PYTHON_DAEMONIZE=y
BR2_PACKAGE_PYTHON_FLASK=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_FLASK_BABEL=y
BR2_PACKAGE_PYTHON_FLASK_CORS=y
BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y
BR2_PACKAGE_PYTHON_FLASK_LOGIN=y
BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y
BR2_PACKAGE_PYTHON_HUMANIZE=y
BR2_PACKAGE_PYTHON_INFLECTION=y
BR2_PACKAGE_PYTHON_IPADDRESS=y
BR2_PACKAGE_PYTHON_LXML=y
BR2_PACKAGE_PYTHON_NETADDR=y
BR2_PACKAGE_PYTHON_NETIFACES=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_OAUTHLIB=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
BR2_PACKAGE_PYTHON_PILLOW=y
BR2_PACKAGE_PYTHON_PIP=y
BR2_PACKAGE_PYTHON_PSUTIL=y
BR2_PACKAGE_PYTHON_PYCLI=y
BR2_PACKAGE_PYTHON_PYCRYPTO=y
BR2_PACKAGE_PYTHON_PYJWT=y
BR2_PACKAGE_PYTHON_PYTZ=y
BR2_PACKAGE_PYTHON_PYOPENSSL=y
BR2_PACKAGE_PYTHON_PYUDEV=y
BR2_PACKAGE_PYTHON_PYUSB=y
BR2_PACKAGE_PYTHON_PYYAML=y
BR2_PACKAGE_PYTHON_RPI_GPIO=y
BR2_PACKAGE_PYTHON_SDNOTIFY=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SPIDEV=y
BR2_PACKAGE_PYTHON_SYSTEMD=y
BR2_PACKAGE_PYTHON_TEXTTABLE=y
BR2_PACKAGE_PYTHON_TORNADO=y
BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y
BR2_PACKAGE_PYTHON_WRAPT=y
BR2_PACKAGE_LIBCDDB=y
BR2_PACKAGE_LIBMPD=y
BR2_PACKAGE_LIBSIDPLAY2=y
BR2_PACKAGE_OPUSFILE=y
BR2_PACKAGE_OPUS_FIXED_POINT=y
BR2_PACKAGE_PORTAUDIO=y
BR2_PACKAGE_PORTAUDIO_OSS=y
BR2_PACKAGE_SBC=y
@ -215,15 +268,19 @@ BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y
BR2_PACKAGE_LIBARCHIVE_BSDCAT=y
BR2_PACKAGE_LIBZIP=y
BR2_PACKAGE_CA_CERTIFICATES=y
BR2_PACKAGE_GNUTLS=y
BR2_PACKAGE_GNUTLS_OPENSSL=y
BR2_PACKAGE_GNUTLS_TOOLS=y
BR2_PACKAGE_LIBSSH2=y
BR2_PACKAGE_LIBOPENSSL_BIN=y
BR2_PACKAGE_LIBOPENSSL_ENGINES=y
BR2_PACKAGE_LIBRSVG=y
BR2_PACKAGE_LIBCEC=y
BR2_PACKAGE_LIBGUDEV=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_MRAA=y
BR2_PACKAGE_WIRINGPI=y
BR2_PACKAGE_LIBFASTJSON=y
BR2_PACKAGE_LIBLOGGING=y
BR2_PACKAGE_LIBASS=y
BR2_PACKAGE_LIBBLURAY=y
BR2_PACKAGE_LIBDVBPSI=y
@ -231,18 +288,18 @@ BR2_PACKAGE_LIBMATROSKA=y
BR2_PACKAGE_LIBMPEG2=y
BR2_PACKAGE_LIBMPEG2_BINS=y
BR2_PACKAGE_LIBOPENH264=y
BR2_PACKAGE_LIBOPUSENC=y
BR2_PACKAGE_LIBTHEORA=y
BR2_PACKAGE_X264=y
BR2_PACKAGE_X265=y
BR2_PACKAGE_C_ARES=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_LIBHTTPPARSER=y
BR2_PACKAGE_LIBMICROHTTPD=y
BR2_PACKAGE_LIBNDP=y
BR2_PACKAGE_LIBTIRPC=y
BR2_PACKAGE_LIBSHAIRPLAY=y
BR2_PACKAGE_NGHTTP2=y
BR2_PACKAGE_LIBUV=y
BR2_PACKAGE_PROTOBUF=y
BR2_PACKAGE_LIBESTR=y
BR2_PACKAGE_LIBUNISTRING=y
BR2_PACKAGE_NCURSES_WCHAR=y
BR2_PACKAGE_NCURSES_TARGET_PROGS=y
@ -268,28 +325,33 @@ BR2_PACKAGE_NTP_NTPDATE=y
BR2_PACKAGE_NTP_NTPTIME=y
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_SHAIRPORT_SYNC=y
BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION=y
BR2_PACKAGE_SHAIRPORT_SYNC_DBUS=y
BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR=y
BR2_PACKAGE_SHAIRPORT_SYNC_MQTT=y
BR2_PACKAGE_WGET=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
BR2_PACKAGE_BASH_COMPLETION=y
BR2_PACKAGE_FILE=y
BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_SUDO=y
BR2_PACKAGE_TIME=y
BR2_PACKAGE_WHICH=y
BR2_PACKAGE_HTOP=y
BR2_PACKAGE_RSYSLOG=y
BR2_PACKAGE_START_STOP_DAEMON=y
BR2_PACKAGE_SYSKLOGD=y
BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y
BR2_PACKAGE_SYSTEMD_HIBERNATE=y
BR2_PACKAGE_SYSTEMD_LOCALED=y
BR2_PACKAGE_SYSTEMD_LOGIND=y
BR2_PACKAGE_SYSTEMD_RFKILL=y
BR2_PACKAGE_TAR=y
BR2_PACKAGE_UTIL_LINUX_HWCLOCK=y
@ -302,13 +364,19 @@ BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="1536M"
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_HOST_CMAKE=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_PKGCONF=y
BR2_PACKAGE_HOST_PYTHON=y
BR2_PACKAGE_HOST_PYTHON_SSL=y
BR2_PACKAGE_HOST_PYTHON_CYTHON=y
BR2_PACKAGE_HOST_PYTHON_LXML=y
BR2_PACKAGE_HOST_PYTHON_SIX=y
BR2_PACKAGE_HOST_PYTHON_XLRD=y
BR2_PACKAGE_HOST_PYTHON3=y
BR2_PACKAGE_HOST_PYTHON3_SSL=y
BR2_PACKAGE_FIRSTBOOT_SERVICE=y
BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y
BR2_PACKAGE_PYTHON_MYCROFT=y
@ -334,6 +402,7 @@ BR2_PACKAGE_PYTHON_GPIOZERO=y
BR2_PACKAGE_PYTHON_GTTS=y
BR2_PACKAGE_PYTHON_HUMANHASH3=y
BR2_PACKAGE_PYTHON_LAZY=y
BR2_PACKAGE_PYTHON_LINGUA_FRANCA=y
BR2_PACKAGE_PYTHON_MSK=y
BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y
BR2_PACKAGE_PYTHON_OLEFILE=y
@ -343,7 +412,6 @@ BR2_PACKAGE_PYTHON_PEP8=y
BR2_PACKAGE_PYTHON_PETACT=y
BR2_PACKAGE_PYTHON_POCKETSPHINX=y
BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y
BR2_PACKAGE_PYTHON_PULSECTL=y
BR2_PACKAGE_PYTHON_PYCHROMECAST=y
BR2_PACKAGE_PYTHON_PYMPLAYER=y
BR2_PACKAGE_PYTHON_REQUESTS_FUTURES=y

7
buildroot-external/package/python-gitdb2/Config.in
View File

@ -1,7 +0,0 @@
config BR2_PACKAGE_PYTHON_GITDB2
bool "python-gitdb2"
select BR2_PACKAGE_PYTHON_SMMAP2 # runtime
help
Git Object Database.
https://github.com/gitpython-developers/gitdb

5
buildroot-external/package/python-gitdb2/python-gitdb2.hash
View File

@ -1,5 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/gitdb2/json
md5 6e21f5795a204f7afecb0a72fff66932 gitdb2-2.0.4.tar.gz
sha256 bb4c85b8a58531c51373c89f92163b92f30f81369605a67cd52d1fc21246c044 gitdb2-2.0.4.tar.gz
# Locally computed sha256 checksums
sha256 efd29f596a08e8857e68e7694a50bcda72839792da7c3f041bcbff5f18009239 LICENSE

13
buildroot-external/package/python-gitdb2/python-gitdb2.mk
View File

@ -1,13 +0,0 @@
################################################################################
#
# python-gitdb2
#
################################################################################
PYTHON_GITDB2_VERSION = 2.0.4
PYTHON_GITDB2_SOURCE = gitdb2-$(PYTHON_GITDB2_VERSION).tar.gz
PYTHON_GITDB2_SITE = https://files.pythonhosted.org/packages/b9/36/4bdb753087a9232899ac482ee2d5da25f50b63998d661aa4e8170acd95b5
PYTHON_GITDB2_SETUP_TYPE = setuptools
PYTHON_GITDB2_LICENSE_FILES = LICENSE
$(eval $(python-package))

46
buildroot-external/package/python-lingua-franca/0001-Patch-setup.py-to-be-compatible.patch Normal file
View File

@ -0,0 +1,46 @@
From 78295577729b988c7414669897ae781462c92962 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Thu, 19 Mar 2020 19:56:31 +0100
Subject: [PATCH 1/1] Patch setup.py to be compatible
---
setup.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/setup.py b/setup.py
index ce0be2f..1c5b14f 100644
--- a/setup.py
+++ b/setup.py
@@ -22,9 +22,6 @@ def required(requirements_file):
extra_files = package_files('lingua_franca')
-with open("readme.md", "r") as fh:
- long_description = fh.read()
-
setup(
name='lingua_franca',
version='0.2.0',
@@ -33,12 +30,9 @@ setup(
license='Apache2.0',
package_data={'': extra_files},
include_package_data=True,
- install_requires=required('requirements.txt'),
author='Mycroft AI',
author_email='dev@mycroft.ai',
description='Mycroft\'s multilingual text parsing and formatting library',
- long_description=long_description,
- long_description_content_type="text/markdown",
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
@@ -49,5 +43,6 @@ setup(
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
],
)
--
2.25.0

7
buildroot-external/package/python-lingua-franca/Config.in Normal file
View File

@ -0,0 +1,7 @@
config BR2_PACKAGE_PYTHON_LINGUA_FRANCA
bool "python-lingua-franca"
select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
help
Mycroft's multilingual text parsing and formatting library.
https://github.com/MycroftAI/lingua-franca

1
buildroot-external/package/python-lingua-franca/python-lingua-franca.hash Normal file
View File

@ -0,0 +1 @@
sha256 9acadc14c7198030cd353a7e0fd0b1a915fb298a601b8c1592e103b48c92a440 lingua_franca-0.2.0.tar.gz

14
buildroot-external/package/python-lingua-franca/python-lingua-franca.mk Normal file
View File

@ -0,0 +1,14 @@
################################################################################
#
# python-lingua-franca
#
################################################################################
PYTHON_LINGUA_FRANCA_VERSION = 0.2.0
PYTHON_LINGUA_FRANCA_SOURCE = lingua_franca-$(PYTHON_LINGUA_FRANCA_VERSION).tar.gz
PYTHON_LINGUA_FRANCA_SITE = https://files.pythonhosted.org/packages/9f/04/54b9cfd14011f61e3d91592354e2460a5d85506c8996f802c1b4c1f9c9ff
PYTHON_LINGUA_FRANCA_SETUP_TYPE = setuptools
PYTHON_LINGUA_FRANCA_LICENSE = Apache-2.0
PYTHON_LINGUA_FRANCA_LICENSE_FILES = LICENSE
$(eval $(python-package))

2
buildroot-external/package/python-msm/python-msm.hash
View File

@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/msm/json
md5 fe54a2aecd6751bef66fdcd27ffd3cdc msm-0.5.19.tar.gz
sha256 c314fe673c9eeac4256e169968659b8d867c1ba85976ed7cc0ea4f0e431e66a3 msm-0.8.5.tar.gz
sha256 9878eecbf7255d4907637700ecfeeacb9fe586409ee3ae05d406683ad18d7e5e msm-0.8.7.tar.gz
# Locally computed sha256 checksums
sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE

4
buildroot-external/package/python-msm/python-msm.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_MSM_VERSION = 0.8.5
PYTHON_MSM_VERSION = 0.8.7
PYTHON_MSM_SOURCE = msm-$(PYTHON_MSM_VERSION).tar.gz
PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/91/a0/98d07b9c5b45fd2ec42fe202722f76bc3cab902ca371474eb3d9a82758e5
PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/f3/51/f0be5edba5d9e7a31b0b11857bff1324916bd2dd209314b97e1eacbed766
PYTHON_MSM_SETUP_TYPE = setuptools
PYTHON_MSM_LICENSE = Apache-2.0
PYTHON_MSM_LICENSE_FILES = LICENSE

25
buildroot-external/package/python-mycroft/0001-Bump-python-dateutil-requirement-to-2.7.5.patch
View File

@ -1,25 +0,0 @@
From 840f9594d7876fbcb3a4b446a4b78618a032e774 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 6 Dec 2019 09:25:01 +0100
Subject: [PATCH 1/1] Bump python-dateutil requirement to 2.7.5
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 5d89f9fb11..f1be1a6724 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ psutil==5.2.1
pocketsphinx==0.1.0
inflection==0.3.1
pillow==6.2.1
-python-dateutil==2.6.0
+python-dateutil==2.7.5
pychromecast==3.2.2
python-vlc==1.1.2
google-api-python-client==1.6.4
--
2.24.0.rc1

2
buildroot-external/package/python-mycroft/python-mycroft.hash
View File

@ -1 +1 @@
sha256 f7a6d899b81c10414b71df982528724068d0a45f5470135332802ccdee2ee458 python-mycroft-aa86e10ca341143a9a5830531cc9090aa72de307.tar.gz
sha256 7a34207ca9ad8071d57403cb082d34c5021842f1efe1bd87f44bfc0bf0ef4c36 python-mycroft-8a3cf544cd26e1e5ff6ea46b55fc093fc04ab246.tar.gz

2
buildroot-external/package/python-mycroft/python-mycroft.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
PYTHON_MYCROFT_VERSION = aa86e10ca341143a9a5830531cc9090aa72de307
PYTHON_MYCROFT_VERSION = 8a3cf544cd26e1e5ff6ea46b55fc093fc04ab246
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES = LICENSE

7
buildroot-external/package/python-smmap2/Config.in
View File

@ -1,7 +0,0 @@
config BR2_PACKAGE_PYTHON_SMMAP2
bool "python-smmap2"
help
A pure python implementation of a sliding window memory map
manager.
https://github.com/gitpython-developers/smmap

5
buildroot-external/package/python-smmap2/python-smmap2.hash
View File

@ -1,5 +0,0 @@
# md5, sha256 from https://pypi.org/pypi/smmap2/json
md5 886ecac014a09cfe2259bc235cf31e2e smmap2-2.0.4.tar.gz
sha256 dc216005e529d57007ace27048eb336dcecb7fc413cfb3b2f402bb25972b69c6 smmap2-2.0.4.tar.gz
# Locally computed sha256 checksums
sha256 88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235 LICENSE

14
buildroot-external/package/python-smmap2/python-smmap2.mk
View File

@ -1,14 +0,0 @@
################################################################################
#
# python-smmap2
#
################################################################################
PYTHON_SMMAP2_VERSION = 2.0.4
PYTHON_SMMAP2_SOURCE = smmap2-$(PYTHON_SMMAP2_VERSION).tar.gz
PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/ad/e9/0fb974b182ff41d28ad267d0b4201b35159619eb610ea9a2e036817cb0b8
PYTHON_SMMAP2_SETUP_TYPE = setuptools
PYTHON_SMMAP2_LICENSE = BSD-3-Clause
PYTHON_SMMAP2_LICENSE_FILES = LICENSE
$(eval $(python-package))

0
buildroot-patches/0029-Downgrade-python-idna-to-2.7.patch → buildroot-patches/0001-Downgrade-python-idna-to-2.7.patch
View File

105
buildroot-patches/0001-Update-mimic-to-latest-version.patch
View File

@ -1,105 +0,0 @@
From 1c090605bbec847ec5000ded4fca28c78e0d73f3 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 24 Sep 2019 15:49:52 +0200
Subject: [PATCH 1/1] Update mimic to latest dev version
---
package/mimic/0001-disable-werror.patch | 25 +++++++++++++++++++++++++
package/mimic/Config.in | 2 ++
package/mimic/mimic.hash | 2 ++
package/mimic/mimic.mk | 17 ++++++++++++-----
4 files changed, 41 insertions(+), 5 deletions(-)
create mode 100644 package/mimic/0001-disable-werror.patch
diff --git a/package/mimic/0001-disable-werror.patch b/package/mimic/0001-disable-werror.patch
new file mode 100644
index 0000000000..0f8d59a467
--- /dev/null
+++ b/package/mimic/0001-disable-werror.patch
@@ -0,0 +1,25 @@
+From c393e191f841707718096264e479f3b3d95b7a60 Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Mon, 23 Sep 2019 12:03:30 +0200
+Subject: [PATCH 1/1] Disable Werror
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 34d367f..b238245 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(PCRE2_CFLAGS)
++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(PCRE2_CFLAGS)
+
+ SUBDIRS = .
+
+--
+2.17.1
+
+
diff --git a/package/mimic/Config.in b/package/mimic/Config.in
index 79641d3790..f8c33e8697 100644
--- a/package/mimic/Config.in
+++ b/package/mimic/Config.in
@@ -4,6 +4,8 @@ comment "mimic needs a toolchain w/ wchar"
config BR2_PACKAGE_MIMIC
bool "mimic"
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_ICU
+ select BR2_PACKAGE_PCRE2
help
Mimic is a fast, lightweight Text-to-speech engine developed
by Mycroft A.I. and VocaliD, based on Carnegie Mellon
diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash
index 39d016548a..2eea00ba64 100644
--- a/package/mimic/mimic.hash
+++ b/package/mimic/mimic.hash
@@ -1,2 +1,4 @@
# Locally calculated
sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz
+sha256 6adcc9911b09d6e9513add41ad9dfc0893ece277f556419869520a0f0708c102 mimic-1.2.0.2.tar.gz
+sha256 3483b3dc0771c7ac4dd995127f4ce5533378f623eb7f5ff85dbb96148267ea05 mimic-f7c10fad5758dae477f4d77cb21d9c40d3c98705.tar.gz
diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk
index 2d246561c9..0c60e0874e 100644
--- a/package/mimic/mimic.mk
+++ b/package/mimic/mimic.mk
@@ -4,12 +4,12 @@
#
################################################################################
-MIMIC_VERSION = 1.1.0
-MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION))
+MIMIC_VERSION = f7c10fad5758dae477f4d77cb21d9c40d3c98705
+MIMIC_SITE = $(call github,MycroftAI,mimic1,$(MIMIC_VERSION))
MIMIC_LICENSE = MIT
MIMIC_LICENSE_FILES = COPYING
-
-MIMIC_DEPENDENCIES = host-pkgconf
+MIMIC_AUTORECONF = YES
+MIMIC_DEPENDENCIES = host-pkgconf host-automake host-autoconf host-libtool
ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y)
MIMIC_AUDIO_BACKEND = alsa
@@ -24,6 +24,13 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y)
MIMIC_AUDIO_BACKEND = none
endif
-MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND)
+define MIMIC_RUN_AUTOGEN
+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+
+MIMIC_CONF_OPTS += --prefix="/usr/local" --with-audio=$(MIMIC_AUDIO_BACKEND)
+
+MIMIC_PRE_CONFIGURE_HOOKS += MIMIC_RUN_AUTOGEN
$(eval $(autotools-package))
+
--
2.11.0

39
buildroot-patches/0002-Downgrade-python-pillow-to-6.2.1.patch Normal file
View File

@ -0,0 +1,39 @@
From 46d16b74aa2d8b0f093cb7c954b778a3f7e7e806 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 08:39:23 +0100
Subject: [PATCH 1/1] Downgrade python-pillow to 6.2.1
---
package/python-pillow/python-pillow.hash | 2 +-
package/python-pillow/python-pillow.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index 0d66c4bb3c..d386286a83 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/project/Pillow/
md5 d099946335c1ba372f5b1fa68ca71645 Pillow-7.0.0.tar.gz
-sha256 4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946 Pillow-7.0.0.tar.gz
+sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 Pillow-6.2.1.tar.gz
# Locally computed sha256 checksums
sha256 04a04a908e52921829c7f51528e5619c79becdde99c484ab7d4f235e2927968c LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index 5ff2dcfdb6..8c4db213c6 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 7.0.0
-PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/39/47/f28067b187dd664d205f75b07dcc6e0e95703e134008a14814827eebcaab
+PYTHON_PILLOW_VERSION = 6.2.1
+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/5b/bb/cdc8086db1f15d0664dd22a62c69613cdc00f1dd430b5b19df1bea83f2a3
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
PYTHON_PILLOW_LICENSE = PIL Software License
PYTHON_PILLOW_LICENSE_FILES = LICENSE
--
2.25.0

23
buildroot-patches/0002-Remove-python-ipaddress-python2-dependency.patch
View File

@ -1,23 +0,0 @@
From d9887a607e129081ed759c122c2d4d9c47b78482 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 29 Oct 2018 14:09:20 +0100
Subject: [PATCH 1/1] Remove python-ipaddress python2 dependency
---
package/python-ipaddress/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/python-ipaddress/Config.in b/package/python-ipaddress/Config.in
index b2b9f0b1c3..badd8eeaed 100644
--- a/package/python-ipaddress/Config.in
+++ b/package/python-ipaddress/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_PYTHON_IPADDRESS
bool "python-ipaddress"
- depends on BR2_PACKAGE_PYTHON
help
Python 3.3's ipaddress for older Python versions.
--
2.11.0

24
buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch → buildroot-patches/0003-Downgrade-python-psutil-to-5.2.1.patch
View File

@ -1,40 +1,40 @@
From 8c2bf3b497d2aacd47d206103d269afb0b017168 Mon Sep 17 00:00:00 2001
From c0b1078bdcd32d27872aebb5e43bdd496b8315fa Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 13:58:07 +0100
Date: Tue, 17 Mar 2020 08:44:43 +0100
Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1
---
package/python-psutil/python-psutil.hash | 1 +
package/python-psutil/python-psutil.hash | 2 +-
package/python-psutil/python-psutil.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash
index e61bffa840..8626528a97 100644
index 7f3d629d66..90578d2b15 100644
--- a/package/python-psutil/python-psutil.hash
+++ b/package/python-psutil/python-psutil.hash
@@ -1,5 +1,6 @@
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/psutil/json
md5 1bbc1788588cc3c2c461cd98a830ba72 psutil-5.6.3.tar.gz
sha256 863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3 psutil-5.6.3.tar.gz
md5 b2c94e0368fc6e6f237a7252f8e85ca2 psutil-5.6.7.tar.gz
-sha256 ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa psutil-5.6.7.tar.gz
+sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz
# Locally computed sha256 checksums
sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index bb4d58930f..162d1b7f50 100644
index 62a94f3c41..162d1b7f50 100644
--- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PSUTIL_VERSION = 5.6.3
-PYTHON_PSUTIL_VERSION = 5.6.7
+PYTHON_PSUTIL_VERSION = 5.2.1
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/1c/ca/5b8c1fe032a458c2c4bcbe509d1401dca9dda35c7fc46b36bb81c2834740
-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb
+PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240
PYTHON_PSUTIL_SETUP_TYPE = setuptools
PYTHON_PSUTIL_LICENSE = BSD-3-Clause
PYTHON_PSUTIL_LICENSE_FILES = LICENSE
--
2.11.0
2.25.0

38
buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch
View File

@ -1,38 +0,0 @@
From 2415c0b9d58a14000fe889400a560f037ba0aa28 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 29 Oct 2018 14:13:00 +0100
Subject: [PATCH 1/1] Update python-netifaces to 0.10.7
---
package/python-netifaces/python-netifaces.hash | 1 +
package/python-netifaces/python-netifaces.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-netifaces/python-netifaces.hash b/package/python-netifaces/python-netifaces.hash
index 335f907d59..9b07d58082 100644
--- a/package/python-netifaces/python-netifaces.hash
+++ b/package/python-netifaces/python-netifaces.hash
@@ -1,3 +1,4 @@
# md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed
md5 1d424cb5ef52907c5ab913011122a98b netifaces-0.10.6.tar.gz
sha256 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 netifaces-0.10.6.tar.gz
+sha256 bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd netifaces-0.10.7.tar.gz
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index 3258be7a95..3a287d0b0d 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_NETIFACES_VERSION = 0.10.6
+PYTHON_NETIFACES_VERSION = 0.10.7
PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
-PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/72/01/ba076082628901bca750bf53b322a8ff10c1d757dc29196a8e6082711c9d
+PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/81/39/4e9a026265ba944ddf1fea176dbb29e0fe50c43717ba4fcf3646d099fe38
PYTHON_NETIFACES_LICENSE = MIT
PYTHON_NETIFACES_LICENSE_FILES = README.rst
PYTHON_NETIFACES_SETUP_TYPE = setuptools
--
2.11.0

0
buildroot-patches/0008-Downgrade-python-serial-to-3.0.patch → buildroot-patches/0004-Downgrade-python-serial-to-3.0.patch
View File

36
buildroot-patches/0004-Upgrade-python-pillow-to-6.2.1.patch
View File

@ -1,36 +0,0 @@
From ea5047295ff6bce30ba65eb53f0e610c0600052d Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 15 Nov 2019 13:09:01 +0100
Subject: [PATCH 1/1] Upgrade python-pillow to 6.2.1
---
package/python-pillow/python-pillow.hash | 2 +-
package/python-pillow/python-pillow.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
index fe72d01d38..4864d61ce7 100644
--- a/package/python-pillow/python-pillow.hash
+++ b/package/python-pillow/python-pillow.hash
@@ -1,4 +1,4 @@
# sha256 for python-pillow from https://pypi.org/project/Pillow/
# sha256 for LICENSE locally computed
-sha256 0804f77cb1e9b6dbd37601cee11283bba39a8d44b9ddb053400c58e0c0d7d9de Pillow-6.1.0.tar.gz
+sha256 bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1 Pillow-6.2.1.tar.gz
sha256 64ea4328ed56392b423ef968519a9ad427e3de9b985862c95ed2ed4d793d22ee LICENSE
diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
index a4121da2b4..ae277dc2d2 100644
--- a/package/python-pillow/python-pillow.mk
+++ b/package/python-pillow/python-pillow.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_PILLOW_VERSION = 6.1.0
+PYTHON_PILLOW_VERSION = 6.2.1
PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/51/fe/18125dc680720e4c3086dd3f5f95d80057c41ab98326877fc7d3ff6d0ee5
PYTHON_PILLOW_LICENSE = PIL Software License
--
2.24.0.rc1

28
buildroot-patches/0009-Upgrade-python-six-to-1.13.0.patch → buildroot-patches/0005-Downgrade-python-six-to-1.13.0.patch
View File

@ -1,40 +1,40 @@
From 87471715ae7e2c663211556ab20c02dc4b205247 Mon Sep 17 00:00:00 2001
From 65b865ff92de541c8ce6565928fb25b451cbff18 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 24 Nov 2019 11:37:14 +0100
Subject: [PATCH 1/1] Upgrade python-six to 1.13.0
Date: Tue, 17 Mar 2020 09:04:33 +0100
Subject: [PATCH 1/1] Downgrade python-six to 1.13.0
---
package/python-six/python-six.hash | 1 +
package/python-six/python-six.hash | 2 +-
package/python-six/python-six.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash
index b7262b12b1..6102e8356e 100644
index 0d1e75fe9e..dc87604cd2 100644
--- a/package/python-six/python-six.hash
+++ b/package/python-six/python-six.hash
@@ -1,5 +1,6 @@
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/six/json
md5 9ae5d1feed8c0215f4ae4adcd9207fcb six-1.12.0.tar.gz
sha256 d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 six-1.12.0.tar.gz
md5 21674588a57e649d1a6d977ec3122140 six-1.14.0.tar.gz
-sha256 236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a six-1.14.0.tar.gz
+sha256 30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66 six-1.13.0.tar.gz
# Locally computed sha256 checksums
sha256 e732f54da58f3e9cf0c48e8b512948936fcf7361bd58afa63a9a3c392bf794ad LICENSE
sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 LICENSE
diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk
index 95817fa34b..906c268d74 100644
index 8acc739f2e..906c268d74 100644
--- a/package/python-six/python-six.mk
+++ b/package/python-six/python-six.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_SIX_VERSION = 1.12.0
-PYTHON_SIX_VERSION = 1.14.0
+PYTHON_SIX_VERSION = 1.13.0
PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz
-PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca
-PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/21/9f/b251f7f8a76dec1d6651be194dfba8fb8d7781d10ab3987190de8391d08e
+PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/94/3e/edcf6fef41d89187df7e38e868b2dd2182677922b600e880baad7749c865
PYTHON_SIX_SETUP_TYPE = setuptools
PYTHON_SIX_LICENSE = MIT
PYTHON_SIX_LICENSE_FILES = LICENSE
--
2.24.0.rc1
2.25.0

39
buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch → buildroot-patches/0006-Downgrade-python-websocket-client-to-0.54.0.patch
View File

@ -1,41 +1,40 @@
From cc13c52d8a7c8816b093688421b45dab0c620be6 Mon Sep 17 00:00:00 2001
From 5ff0bedcd37c0a205084b2c0c48e64a432610948 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sat, 7 Sep 2019 17:03:17 +0200
Date: Tue, 17 Mar 2020 09:14:28 +0100
Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0
---
package/python-websocket-client/python-websocket-client.hash | 1 +
package/python-websocket-client/python-websocket-client.mk | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
package/python-websocket-client/python-websocket-client.hash | 2 +-
package/python-websocket-client/python-websocket-client.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash
index 3672ca074b..70ea66a652 100644
index 968c1ab211..f46db3cc82 100644
--- a/package/python-websocket-client/python-websocket-client.hash
+++ b/package/python-websocket-client/python-websocket-client.hash
@@ -2,3 +2,4 @@
md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz
sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz
sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/websocket-client/json
md5 8061820da5e1de26a6a1a6996d4eebd5 websocket_client-0.57.0.tar.gz
-sha256 d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010 websocket_client-0.57.0.tar.gz
+sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz
# Locally computed sha256 checksums
sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE
diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk
index 58c8407db3..e07f9c5a6a 100644
index 58cb597c22..98cc941efe 100644
--- a/package/python-websocket-client/python-websocket-client.mk
+++ b/package/python-websocket-client/python-websocket-client.mk
@@ -4,11 +4,12 @@
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0
-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.57.0
+PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0
PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz
-PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27
-PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/8b/0f/52de51b9b450ed52694208ab952d5af6ebbcbce7f166a48784095d930d8c
+PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b
PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools
PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+
PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE
$(eval $(python-package))
+$(eval $(host-python-package))
# Project was under LGPL-2.1+, but was relicensed under
# BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but
--
2.11.0
2.25.0

0
buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch → buildroot-patches/0007-Downgrade-python-requests-to-2.20.0.patch
View File

0
buildroot-patches/0017-Downgrade-python-pyjwt-to-1.6.4.patch → buildroot-patches/0008-Downgrade-python-pyjwt-to-1.6.4.patch
View File

40
buildroot-patches/0009-Downgrade-python-pyyaml-to-5.1.2.patch Normal file
View File

@ -0,0 +1,40 @@
From 95456cd5d1db787a7ef04e27c38521c3182a77c1 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 09:29:47 +0100
Subject: [PATCH 1/1] Downgrade python-pyyaml to 5.1.2
---
package/python-pyyaml/python-pyyaml.hash | 2 +-
package/python-pyyaml/python-pyyaml.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash
index e0d182bcbb..9e6ea6342c 100644
--- a/package/python-pyyaml/python-pyyaml.hash
+++ b/package/python-pyyaml/python-pyyaml.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/PyYAML/json
md5 adbb0d336b509d6472d3b095a0f1cf30 PyYAML-5.3.tar.gz
-sha256 e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615 PyYAML-5.3.tar.gz
+sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz
# Locally computed sha256 checksums
sha256 a2adb9c959b797494a0ef80bdf60e22db2749ee3e0c0908556e3eb548f967c56 LICENSE
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
index 5d9246d37c..165a938f11 100644
--- a/package/python-pyyaml/python-pyyaml.mk
+++ b/package/python-pyyaml/python-pyyaml.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYYAML_VERSION = 5.3
+PYTHON_PYYAML_VERSION = 5.1.2
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/3d/d9/ea9816aea31beeadccd03f1f8b625ecf8f645bd66744484d162d84803ce5
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe
PYTHON_PYYAML_SETUP_TYPE = distutils
PYTHON_PYYAML_LICENSE = MIT
PYTHON_PYYAML_LICENSE_FILES = LICENSE
--
2.25.0

55
buildroot-patches/0010-Downgrade-python-dateutil-to-2.6.0.patch Normal file
View File

@ -0,0 +1,55 @@
From 6c79cb88b85de52152a28c8c2a7ca09047b6baae Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 12:34:20 +0100
Subject: [PATCH 1/1] Downgrade python-dateutil to 2.6.0
---
package/python-dateutil/Config.in | 2 +-
package/python-dateutil/python-dateutil.hash | 8 +++-----
package/python-dateutil/python-dateutil.mk | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/package/python-dateutil/Config.in b/package/python-dateutil/Config.in
index 1a36a150b1..56a1d838f7 100644
--- a/package/python-dateutil/Config.in
+++ b/package/python-dateutil/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_DATEUTIL
help
Extensions to the standard Python datetime module.
- https://dateutil.readthedocs.io
+ https://dateutil.readthedocs.org
diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash
index f3dc69f272..adc24bdd16 100644
--- a/package/python-dateutil/python-dateutil.hash
+++ b/package/python-dateutil/python-dateutil.hash
@@ -1,5 +1,3 @@
-# md5, sha256 from https://pypi.org/pypi/python-dateutil/json
-md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz
-sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz
-# Locally computed sha256 checksums
-sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE
+# md5 from https://pypi.python.org/pypi/python-dateutil/json, sha256 locally computed
+md5 6e38f91e8c94c15a79ce22768dfeca87 python-dateutil-2.6.0.tar.gz
+sha256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 python-dateutil-2.6.0.tar.gz
diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk
index 759261d2d1..41dee2d1cd 100644
--- a/package/python-dateutil/python-dateutil.mk
+++ b/package/python-dateutil/python-dateutil.mk
@@ -4,11 +4,10 @@
#
################################################################################
-PYTHON_DATEUTIL_VERSION = 2.8.1
-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0
+PYTHON_DATEUTIL_VERSION = 2.6.0
+PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6
PYTHON_DATEUTIL_SETUP_TYPE = setuptools
PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
-PYTHON_DATEUTIL_DEPENDENCIES = host-python-setuptools-scm
$(eval $(python-package))
--
2.25.0

0
buildroot-patches/0025-Downgrade-python-ifaddr-to-0.1.4.patch → buildroot-patches/0011-Downgrade-python-ifaddr-to-0.1.4.patch
View File

35
buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch
View File

@ -1,35 +0,0 @@
From f1468008e466ce9aa27449c98ce775b292945190 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 7 Jan 2019 16:59:08 +0100
Subject: [PATCH 1/1] Add host-openssl dependency to python3
---
package/python3/python3.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 8fbb95b9ad..0f8cce45dc 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -26,8 +26,7 @@ HOST_PYTHON3_CONF_OPTS += \
--enable-unicodedata \
--disable-test-modules \
--disable-idle3 \
- --disable-ossaudiodev \
- --disable-openssl
+ --disable-ossaudiodev
# Make sure that LD_LIBRARY_PATH overrides -rpath.
# This is needed because libpython may be installed at the same time that
@@ -40,7 +39,7 @@ HOST_PYTHON3_CONF_ENV += \
PYTHON3_DEPENDENCIES = host-python3 libffi
-HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi
+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi host-openssl
PYTHON3_INSTALL_STAGING = YES
--
2.11.0

26
buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch → buildroot-patches/0012-Downgrade-python-urllib3-to-1.24.2.patch
View File

@ -1,42 +1,40 @@
From 1d3d028e59a115f86fdac8b5bbd39dcc5565561c Mon Sep 17 00:00:00 2001
From c0ae1185f51d3c19a896d0132975c8d54f67d5b3 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 29 Oct 2019 19:33:27 +0100
Date: Tue, 17 Mar 2020 09:53:51 +0100
Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2
---
package/python-urllib3/python-urllib3.hash | 6 +++---
package/python-urllib3/python-urllib3.hash | 2 +-
package/python-urllib3/python-urllib3.mk | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash
index e61f754aa3..ec075cb4f6 100644
index 91b9e44622..d020e64a06 100644
--- a/package/python-urllib3/python-urllib3.hash
+++ b/package/python-urllib3/python-urllib3.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/urllib3/json
-md5 f09e95a5c42a7cc7ff7cb6a14c55fb69 urllib3-1.25.3.tar.gz
-sha256 dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232 urllib3-1.25.3.tar.gz
+md5 20bb5a170a534bd0acd98bfc007fcc22 urllib3-1.24.2.tar.gz
md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz
-sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz
+sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz
# Locally computed sha256 checksums
-sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt
+sha256 11db569430ca5ad793f1399297b8df5041a22137abaf90642ea71da21d59121c LICENSE.txt
sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt
diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk
index 5d8ec34f39..893d32d976 100644
index 8383cbe8e8..893d32d976 100644
--- a/package/python-urllib3/python-urllib3.mk
+++ b/package/python-urllib3/python-urllib3.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_URLLIB3_VERSION = 1.25.3
-PYTHON_URLLIB3_VERSION = 1.25.6
+PYTHON_URLLIB3_VERSION = 1.24.2
PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/4c/13/2386233f7ee40aa8444b47f7463338f3cbdf00c316627558784e3f542f07
-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424
+PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62
PYTHON_URLLIB3_LICENSE = MIT
PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
PYTHON_URLLIB3_SETUP_TYPE = setuptools
--
2.11.0
2.25.0

24
buildroot-patches/0015-Remove-python2-dependency-from-python-typing.patch
View File

@ -1,24 +0,0 @@
From aa61c7e2818d8514a9c5ad1f216aea57bcbf0f91 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Wed, 9 Jan 2019 13:19:13 +0100
Subject: [PATCH 1/1] Remove python2 dependency from python-typing Mycroft MSK
and MSN require it although Python 2.x should not need it.
---
package/python-typing/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in
index 81b7d71b4b..3d7376f28b 100644
--- a/package/python-typing/Config.in
+++ b/package/python-typing/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_PYTHON_TYPING
bool "python-typing"
- depends on BR2_PACKAGE_PYTHON
help
Type Hints for Python. This is a backport of the standard
library typing module to Python versions older than 3.5.
--
2.11.0

25
buildroot-patches/0016-Install-glibc-locale-binary-into-target.patch
View File

@ -1,25 +0,0 @@
From 0d0a3cd42688a792b6845482fccf2985b12cf631 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 14:31:47 +0100
Subject: [PATCH 1/1] Install glibc locale binary into target
---
package/glibc/glibc.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 68c6670007..ba28b668b0 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -144,6 +144,8 @@ GLIBC_LIBS_LIB += libthread_db.so.*
endif
define GLIBC_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/build/locale/locale \
+ $(TARGET_DIR)/usr/bin/locale
for libpattern in $(GLIBC_LIBS_LIB); do \
$(call copy_toolchain_lib_root,$$libpattern) ; \
done
--
2.11.0

41
buildroot-patches/0019-Upgrade-python-cryptography-to-2.8.patch
View File

@ -1,41 +0,0 @@
From de793f43c05fddd7a6153cf9ccd926e5b55e8054 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 24 Nov 2019 12:07:28 +0100
Subject: [PATCH 1/1] Upgrade python-cryptography to 2.8
---
package/python-cryptography/python-cryptography.hash | 1 +
package/python-cryptography/python-cryptography.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash
index 715beb71d1..c85e6c7a5e 100644
--- a/package/python-cryptography/python-cryptography.hash
+++ b/package/python-cryptography/python-cryptography.hash
@@ -1,6 +1,7 @@
# md5, sha256 from https://pypi.org/pypi/cryptography/json
md5 7dfe1035cae43569e571318f000462a4 cryptography-2.7.tar.gz
sha256 e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6 cryptography-2.7.tar.gz
+sha256 3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651 cryptography-2.8.tar.gz
# Locally computed sha256 checksums
sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE
sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index dad09672eb..54437ae688 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_CRYPTOGRAPHY_VERSION = 2.7
+PYTHON_CRYPTOGRAPHY_VERSION = 2.8
PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
-PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/c2/95/f43d02315f4ec074219c6e3124a87eba1d2d12196c2767fadfdc07a83884
+PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4
PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools
PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause
PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
--
2.24.0.rc1

38
buildroot-patches/0020-Upgrade-python-pyyaml-to-5.1.2.patch
View File

@ -1,38 +0,0 @@
From 625a432767c65656904369584b23f1f1bf901f76 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 24 Nov 2019 11:51:57 +0100
Subject: [PATCH 1/1] Upgrade python-pyyaml to 5.1.2
---
package/python-pyyaml/python-pyyaml.hash | 1 +
package/python-pyyaml/python-pyyaml.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash
index 256742feb6..7bdaca9859 100644
--- a/package/python-pyyaml/python-pyyaml.hash
+++ b/package/python-pyyaml/python-pyyaml.hash
@@ -1,3 +1,4 @@
# md5, sha256 from https://pypi.python.org/pypi/pyyaml/json
md5 a842bc7391e145bbe4e7fd0d32da1132 PyYAML-4.2b4.tar.gz
sha256 3c17fb92c8ba2f525e4b5f7941d850e7a48c3a59b32d331e2502a3cdc6648e76 PyYAML-4.2b4.tar.gz
+sha256 01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4 PyYAML-5.1.2.tar.gz
diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk
index b73b4356a0..165a938f11 100644
--- a/package/python-pyyaml/python-pyyaml.mk
+++ b/package/python-pyyaml/python-pyyaml.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PYYAML_VERSION = 4.2b4
+PYTHON_PYYAML_VERSION = 5.1.2
PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz
-PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/a8/c6/a8d1555e795dbd0375c3c93b576ca13bbf139db51ea604afa19a2c35fc03
+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe
PYTHON_PYYAML_SETUP_TYPE = distutils
PYTHON_PYYAML_LICENSE = MIT
PYTHON_PYYAML_LICENSE_FILES = LICENSE
--
2.24.0.rc1

39
buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch
View File

@ -1,39 +0,0 @@
From d51497c842d0d84758cf400cf793173306202386 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 9 Sep 2019 15:58:14 +0200
Subject: [PATCH 1/1] Downgrade python-dateutil to 2.7.5
---
package/python-dateutil/python-dateutil.hash | 2 +-
package/python-dateutil/python-dateutil.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash
index eecba7d35a..4cee523d00 100644
--- a/package/python-dateutil/python-dateutil.hash
+++ b/package/python-dateutil/python-dateutil.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/python-dateutil/json
md5 354db28843d949f1bc3e49e8458e22df python-dateutil-2.8.0.tar.gz
-sha256 c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e python-dateutil-2.8.0.tar.gz
+sha256 88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 python-dateutil-2.7.5.tar.gz
# Locally computed sha256 checksums
sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE
diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk
index 4c915c8e83..5e90398331 100644
--- a/package/python-dateutil/python-dateutil.mk
+++ b/package/python-dateutil/python-dateutil.mk
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_DATEUTIL_VERSION = 2.8.0
-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c
+PYTHON_DATEUTIL_VERSION = 2.7.5
+PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0
PYTHON_DATEUTIL_SETUP_TYPE = setuptools
PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
--
2.11.0

40
buildroot-patches/0022-Upgrade-python-tornado-to-6.0.3.patch
View File

@ -1,40 +0,0 @@
From 5f667546586532dddec1a93236be0acb58584535 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 24 Nov 2019 11:57:16 +0100
Subject: [PATCH 1/1] Upgrade python-tornado to 6.0.3
---
package/python-tornado/python-tornado.hash | 1 +
package/python-tornado/python-tornado.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash
index 18560b17ce..3158063ca8 100644
--- a/package/python-tornado/python-tornado.hash
+++ b/package/python-tornado/python-tornado.hash
@@ -1,5 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/tornado/json
md5 63a26fdd0bf1154d4a5e9144b7028dd0 tornado-6.0.1.tar.gz
sha256 de274c65f45f6656c375cdf1759dbf0bc52902a1e999d12a35eb13020a641a53 tornado-6.0.1.tar.gz
+sha256 c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9 tornado-6.0.3.tar.gz
# Locally computed sha256 checksums
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk
index fe65d7516e..e326fadcb5 100644
--- a/package/python-tornado/python-tornado.mk
+++ b/package/python-tornado/python-tornado.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_TORNADO_VERSION = 6.0.1
+PYTHON_TORNADO_VERSION = 6.0.3
PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
-PYTHON_TORNADO_SITE = https://pypi.python.org/packages/b1/7f/8109821ff9df1bf3519169e34646705c32ac13be6a4d51a79ed57f47686e
+PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/30/78/2d2823598496127b21423baffaa186b668f73cd91887fcef78b6eade136b
PYTHON_TORNADO_LICENSE = Apache-2.0
PYTHON_TORNADO_LICENSE_FILES = LICENSE
PYTHON_TORNADO_SETUP_TYPE = setuptools
--
2.24.0.rc1

35
buildroot-patches/0023-Bump-RPI-BT-Firmware-version-to-latest.patch
View File

@ -1,35 +0,0 @@
From b7c3b4b1cbc21c15affbf2d7199e1fe8ca4c6162 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 15:48:48 +0100
Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest
---
package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +-
package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash
index a3c7281d75..a9703150df 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.hash
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk
index 23923453c4..785f007cc3 100644
--- a/package/rpi-bt-firmware/rpi-bt-firmware.mk
+++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
+RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION))
RPI_BT_FIRMWARE_LICENSE = PROPRIETARY
RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
--
2.11.0

35
buildroot-patches/0024-Bump-RPI-Wifi-Firmware-version-to-latest.patch
View File

@ -1,35 +0,0 @@
From d4e129660fede6331859dd3c955dbcdff851d8c9 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 28 Oct 2019 15:53:01 +0100
Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest
---
package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
index 5de9e0f13f..c1f9494577 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
index 9dd1854b9a..6be02509fe 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
+RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
--
2.11.0

284
buildroot-patches/0026-Downgrade-MPV-back-to-0.27.2.patch
View File

@ -1,284 +0,0 @@
From c0890d44021e1be0b3fd32d1c10d9f084061169b Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 29 Oct 2019 08:37:19 +0100
Subject: [PATCH 1/1] Downgrade MPV back to 0.27.2
---
package/mpv/0003-rpi-fix-linking-errors.patch | 90 ++++++++++++++++++++++++++
package/mpv/0004-libva20.patch | 93 +++++++++++++++++++++++++++
package/mpv/Config.in | 1 -
package/mpv/mpv.hash | 3 +-
package/mpv/mpv.mk | 16 +++--
5 files changed, 194 insertions(+), 9 deletions(-)
create mode 100644 package/mpv/0003-rpi-fix-linking-errors.patch
create mode 100644 package/mpv/0004-libva20.patch
diff --git a/package/mpv/0003-rpi-fix-linking-errors.patch b/package/mpv/0003-rpi-fix-linking-errors.patch
new file mode 100644
index 0000000000..0e65a5a3eb
--- /dev/null
+++ b/package/mpv/0003-rpi-fix-linking-errors.patch
@@ -0,0 +1,90 @@
+From fe482a600d507dc7ce77f6d154a9e8b395f74fdd Mon Sep 17 00:00:00 2001
+From: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+Date: Tue, 24 Oct 2017 09:47:38 +0100
+Subject: [PATCH] rpi: fix linking errors
+
+Fixes linking issues when compiling with Raspberry Pi support.
+
+Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+---
+Status: pull request https://github.com/mpv-player/mpv/pull/4883
+---
+ waftools/checks/custom.py | 26 +++++++++++++++++++++++++-
+ wscript | 18 +-----------------
+ 2 files changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
+index d8065a3..9086795 100644
+--- a/waftools/checks/custom.py
++++ b/waftools/checks/custom.py
+@@ -4,7 +4,7 @@ from waflib import Utils
+ import os
+
+ __all__ = ["check_pthreads", "check_iconv", "check_lua",
+- "check_cocoa", "check_openal"]
++ "check_cocoa", "check_openal", "check_rpi"]
+
+ pthreads_program = load_fragment('pthreads.c')
+
+@@ -103,3 +103,27 @@ def check_openal(ctx, dependency_identifier):
+ if fn(ctx, dependency_identifier):
+ return True
+ return False
++
++def check_rpi(ctx, dependency_identifier):
++ # We need MMAL/bcm_host/dispmanx APIs.
++ # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'.
++ # See https://github.com/raspberrypi/userland/issues/245
++ # PKG_CONFIG_SYSROOT_DIR helps with cross compilation.
++ prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '')
++ os.environ['PKG_CONFIG_PATH'] = os.pathsep.join(
++ filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'),
++ 'opt/vc/lib/pkgconfig'),
++ prev_pkg_path]))
++
++ checks = [
++ # We still need all OpenGL symbols, because the vo_opengl code is
++ # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
++ check_pkg_config('bcm_host', uselib_store='bcm_host'),
++ check_pkg_config('egl'),
++ check_pkg_config('glesv2'),
++ check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']),
++ ]
++
++ ret = all((fn(ctx, dependency_identifier) for fn in checks))
++ os.environ['PKG_CONFIG_PATH'] = prev_pkg_path
++ return ret
+diff --git a/wscript b/wscript
+index 9d88588..84e5f2e 100644
+--- a/wscript
++++ b/wscript
+@@ -732,25 +732,9 @@ video_output_features = [
+ 'desc': 'Android support',
+ 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
+ }, {
+- # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
+- # every project to hardcode the paths to the include directories. Also,
+- # these headers are so broken that they spam tons of warnings by merely
+- # including them (compensate with -isystem and -fgnu89-inline).
+ 'name': '--rpi',
+ 'desc': 'Raspberry Pi support',
+- 'func': compose_checks(
+- check_cc(cflags="-isystem/opt/vc/include/ "+
+- "-isystem/opt/vc/include/interface/vcos/pthreads " +
+- "-isystem/opt/vc/include/interface/vmcs_host/linux " +
+- "-fgnu89-inline",
+- linkflags="-L/opt/vc/lib",
+- header_name="bcm_host.h",
+- lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
+- # We still need all OpenGL symbols, because the vo_opengl code is
+- # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+- check_cc(lib="EGL"),
+- check_cc(lib="GLESv2"),
+- ),
++ 'func': check_rpi,
+ } , {
+ 'name': '--ios-gl',
+ 'desc': 'iOS OpenGL ES hardware decoding interop support',
+--
+2.14.2
+
diff --git a/package/mpv/0004-libva20.patch b/package/mpv/0004-libva20.patch
new file mode 100644
index 0000000000..349dd3cb14
--- /dev/null
+++ b/package/mpv/0004-libva20.patch
@@ -0,0 +1,93 @@
+From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001
+From: Mark Thompson <sw@jkqxz.net>
+Date: Mon, 9 Oct 2017 20:10:26 +0100
+Subject: [PATCH] vaapi: Use libva2 message callbacks
+
+They are no longer global, so they work vaguely sensibly.
+
+Downloaded from upstream commit:
+https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ video/vaapi.c | 32 +++++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/video/vaapi.c b/video/vaapi.c
+index 6bedbbaa18..3b1cb9cc41 100644
+--- a/video/vaapi.c
++++ b/video/vaapi.c
+@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp)
+ return 0;
+ }
+
+-// VA message callbacks are global and do not have a context parameter, so it's
+-// impossible to know from which VADisplay they originate. Try to route them
+-// to existing mpv/libmpv instances within this process.
++#if VA_CHECK_VERSION(1, 0, 0)
++static void va_message_callback(void *context, const char *msg, int mp_level)
++{
++ struct mp_vaapi_ctx *res = context;
++ mp_msg(res->log, mp_level, "libva: %s", msg);
++}
++
++static void va_error_callback(void *context, const char *msg)
++{
++ va_message_callback(context, msg, MSGL_ERR);
++}
++
++static void va_info_callback(void *context, const char *msg)
++{
++ va_message_callback(context, msg, MSGL_V);
++}
++#else
++// Pre-libva2 VA message callbacks are global and do not have a context
++// parameter, so it's impossible to know from which VADisplay they
++// originate. Try to route them to existing mpv/libmpv instances within
++// this process.
+ static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static struct mp_vaapi_ctx **va_mpv_clients;
+ static int num_va_mpv_clients;
+@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg)
+ {
+ va_message_callback(msg, MSGL_V);
+ }
++#endif
+
+ static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx)
+ {
+@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+ },
+ };
+
++#if VA_CHECK_VERSION(1, 0, 0)
++ vaSetErrorCallback(display, va_error_callback, res);
++ vaSetInfoCallback(display, va_info_callback, res);
++#else
+ pthread_mutex_lock(&va_log_mutex);
+ MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res);
+ pthread_mutex_unlock(&va_log_mutex);
+@@ -118,6 +141,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+ vaSetErrorCallback(va_error_callback);
+ vaSetInfoCallback(va_info_callback);
+ #endif
++#endif
+
+ int major, minor;
+ int status = vaInitialize(display, &major, &minor);
+@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+ if (ctx->destroy_native_ctx)
+ ctx->destroy_native_ctx(ctx->native_ctx);
+
++#if !VA_CHECK_VERSION(1, 0, 0)
+ pthread_mutex_lock(&va_log_mutex);
+ for (int n = 0; n < num_va_mpv_clients; n++) {
+ if (va_mpv_clients[n] == ctx) {
+@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+ if (num_va_mpv_clients == 0)
+ TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors
+ pthread_mutex_unlock(&va_log_mutex);
++#endif
+
+ talloc_free(ctx);
+ }
diff --git a/package/mpv/Config.in b/package/mpv/Config.in
index 32910f2245..69810038f1 100644
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MPV
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
# Select xkbcommon for wayland to avoid being mysterious
select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
# Select all necessary X11 dependencies if X.org is enabled
diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash
index 734b6a3663..1dac3a4940 100644
--- a/package/mpv/mpv.hash
+++ b/package/mpv/mpv.hash
@@ -1,3 +1,2 @@
# Locally calculated
-sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz
-sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL
+sha256 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be v0.27.2.tar.gz
diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index f92b604c28..3ab2673774 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -4,14 +4,14 @@
#
################################################################################
-MPV_VERSION = 0.29.1
+MPV_VERSION = 0.27.2
MPV_SITE = https://github.com/mpv-player/mpv/archive
MPV_SOURCE = v$(MPV_VERSION).tar.gz
MPV_DEPENDENCIES = \
host-pkgconf ffmpeg zlib \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
MPV_LICENSE = GPL-2.0+
-MPV_LICENSE_FILES = LICENSE.GPL
+MPV_LICENSE_FILES = LICENSE
MPV_NEEDS_EXTERNAL_WAF = YES
@@ -164,12 +164,16 @@ MPV_CONF_OPTS += --disable-libsmbclient
endif
# SDL support
-# Sdl2 requires 64-bit sync intrinsics
+# Both can't be used at the same time, prefer newer API
+# It also requires 64-bit sync intrinsics
ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy)
-MPV_CONF_OPTS += --enable-sdl2
+MPV_CONF_OPTS += --enable-sdl2 --disable-sdl1
MPV_DEPENDENCIES += sdl2
+else ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL),yy)
+MPV_CONF_OPTS += --enable-sdl1 --disable-sdl2
+MPV_DEPENDENCIES += sdl
else
-MPV_CONF_OPTS += --disable-sdl2
+MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2
endif
# Raspberry Pi support
@@ -197,7 +201,7 @@ endif
# wayland support
ifeq ($(BR2_PACKAGE_WAYLAND),y)
MPV_CONF_OPTS += --enable-wayland
-MPV_DEPENDENCIES += libxkbcommon wayland wayland-protocols
+MPV_DEPENDENCIES += libxkbcommon wayland
else
MPV_CONF_OPTS += --disable-wayland
endif
--
2.11.0

44
buildroot-patches/0030-Bump-shairport-sync-and-build-for-PulseAudio.patch
View File

@ -1,44 +0,0 @@
From 794b1584ce54f64c0a940a80121417dc4bc42d2a Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 6 Jan 2020 14:42:23 +0100
Subject: [PATCH 1/1] Bump shairport-sync and build for PulseAudio.
---
package/shairport-sync/shairport-sync.hash | 2 +-
package/shairport-sync/shairport-sync.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash
index 6f73d109e4..b072fad045 100644
--- a/package/shairport-sync/shairport-sync.hash
+++ b/package/shairport-sync/shairport-sync.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 4f1ee142b887842727ae0c310e21c83ea2386518e841a25c7ddb015d08b54eba shairport-sync-3.2.2.tar.gz
+sha256 9757dd7f19c0bc28cb06a6753305c3ed89da2d271d069b36d1b12173309c1459 shairport-sync-3.3.5.tar.gz
sha256 1daaa904985807b7f9f2fa91f6b19f3faadf8df4e813f7451a691f89a6965e3f LICENSES
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index 5f93f1b8ea..7520f367cf 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SHAIRPORT_SYNC_VERSION = 3.2.2
+SHAIRPORT_SYNC_VERSION = 3.3.5
SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
@@ -14,7 +14,7 @@ SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
# git clone, no configure
SHAIRPORT_SYNC_AUTORECONF = YES
-SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
+SHAIRPORT_SYNC_CONF_OPTS = --with-pa \
--with-metadata \
--with-pipe \
--with-stdout
--
2.24.0.rc1

145
buildroot-patches/0101-Update-mimic-to-latest-1.3.0.1-version.patch Normal file
View File

@ -0,0 +1,145 @@
From c2abd7ff748ffd01c264ed4d380ffc0567761786 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Mon, 16 Mar 2020 19:04:14 +0100
Subject: [PATCH 1/1] Update mimic to latest 1.3.0.1 version
---
package/mimic/0001-Disable-Werror.patch | 24 +++++++++++++
.../0002-Fix-pulseaudio-library-linking.patch | 34 +++++++++++++++++++
package/mimic/Config.in | 2 ++
package/mimic/mimic.hash | 2 +-
package/mimic/mimic.mk | 16 ++++++---
5 files changed, 72 insertions(+), 6 deletions(-)
create mode 100644 package/mimic/0001-Disable-Werror.patch
create mode 100644 package/mimic/0002-Fix-pulseaudio-library-linking.patch
diff --git a/package/mimic/0001-Disable-Werror.patch b/package/mimic/0001-Disable-Werror.patch
new file mode 100644
index 0000000000..ef863d5432
--- /dev/null
+++ b/package/mimic/0001-Disable-Werror.patch
@@ -0,0 +1,24 @@
+From b57dfb78b82e9aa82df4129e389963445eb0347e Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Mon, 16 Mar 2020 16:01:50 +0100
+Subject: [PATCH 1/1] Disable Werror
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 34d367f..b238245 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(PCRE2_CFLAGS)
++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(PCRE2_CFLAGS)
+
+ SUBDIRS = .
+
+--
+2.25.0
+
diff --git a/package/mimic/0002-Fix-pulseaudio-library-linking.patch b/package/mimic/0002-Fix-pulseaudio-library-linking.patch
new file mode 100644
index 0000000000..b452e3b904
--- /dev/null
+++ b/package/mimic/0002-Fix-pulseaudio-library-linking.patch
@@ -0,0 +1,34 @@
+From a0084f897b8ff57f8ba863a50938304cb897d949 Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Mon, 16 Mar 2020 18:57:33 +0100
+Subject: [PATCH 1/1] Fix pulseaudio library linking
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c61bb6..c6f8847 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,7 +126,7 @@ AUDIOLIBS_SUN=
+
+ dnl Check PulseAudio
+ AUDIODETECTED_PULSEAUDIO="false"
+-PKG_CHECK_MODULES([PULSEAUDIO], [libpulse],
++PKG_CHECK_MODULES([PULSEAUDIO], [libpulse-simple],
+ [AUDIODRIVER="pulseaudio"
+ AUDIODETECTED_PULSEAUDIO="true"],
+ [m4_ignore])
+@@ -186,7 +186,7 @@ AS_CASE( [ ${AUDIODRIVER} ],
+ [ AUDIODEFS="${AUDIODEFS_PULSEAUDIO}"
+ AUDIOLIBS="${AUDIOLIBS_PULSEAUDIO}"
+ AUDIODETECTED="${AUDIODETECTED_PULSEAUDIO}"
+- PKGCONFIG_MIMIC_DEPS="${PKGCONFIG_MIMIC_DEPS} libpulse"
++ PKGCONFIG_MIMIC_DEPS="${PKGCONFIG_MIMIC_DEPS} libpulse-simple"
+ ],
+ [ portaudio ],
+ [ AUDIODEFS="${AUDIODEFS_PORTAUDIO}"
+--
+2.25.0
+
diff --git a/package/mimic/Config.in b/package/mimic/Config.in
index 79641d3790..254b1844ad 100644
--- a/package/mimic/Config.in
+++ b/package/mimic/Config.in
@@ -4,6 +4,8 @@ comment "mimic needs a toolchain w/ wchar"
config BR2_PACKAGE_MIMIC
bool "mimic"
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_ICU
+ select BR2_PACKAGE_PCRE2
help
Mimic is a fast, lightweight Text-to-speech engine developed
by Mycroft A.I. and VocaliD, based on Carnegie Mellon
diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash
index 10780d415d..2974711d8c 100644
--- a/package/mimic/mimic.hash
+++ b/package/mimic/mimic.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz
+sha256 9041f5c7d3720899c90c890ada179c92c3b542b90bb655c247e4a4835df79249 mimic-1.3.0.1.tar.gz
sha256 c423c1c6d260091d80ee4c00f386a10fea39963a3f1530f2c245f15dd20324ee COPYING
diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk
index 2d246561c9..4d2ecb6c84 100644
--- a/package/mimic/mimic.mk
+++ b/package/mimic/mimic.mk
@@ -4,12 +4,12 @@
#
################################################################################
-MIMIC_VERSION = 1.1.0
-MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION))
+MIMIC_VERSION = 1.3.0.1
+MIMIC_SITE = $(call github,MycroftAI,mimic1,$(MIMIC_VERSION))
MIMIC_LICENSE = MIT
MIMIC_LICENSE_FILES = COPYING
-
-MIMIC_DEPENDENCIES = host-pkgconf
+MIMIC_AUTORECONF = YES
+MIMIC_DEPENDENCIES = host-pkgconf host-automake host-autoconf host-libtool
ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y)
MIMIC_AUDIO_BACKEND = alsa
@@ -24,6 +24,12 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y)
MIMIC_AUDIO_BACKEND = none
endif
-MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND)
+define MIMIC_RUN_AUTOGEN
+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+
+MIMIC_CONF_OPTS += --prefix="/usr/local" --with-audio=$(MIMIC_AUDIO_BACKEND)
+
+MIMIC_PRE_CONFIGURE_HOOKS += MIMIC_RUN_AUTOGEN
$(eval $(autotools-package))
--
2.25.0

0
buildroot-patches/0032-Add-pulse-to-the-lp-group-for-bluetooth-to-work.patch → buildroot-patches/0102-Add-pulse-to-the-lp-group-for-bluetooth-to-work.patch
View File

0
buildroot-patches/0028-Enable-systemd-wifi-wlan0-by-default.patch → buildroot-patches/0103-Enable-systemd-wifi-wlan0-by-default.patch
View File

25
buildroot-patches/0104-Build-shairport-sync-for-PulseAudio.patch Normal file
View File

@ -0,0 +1,25 @@
From 9a6de1ba847aaeee277d318d7dc23694f2a09993 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 17 Mar 2020 10:04:01 +0100
Subject: [PATCH 1/1] Build shairport-sync for PulseAudio
---
package/shairport-sync/shairport-sync.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index 880a058909..631e9b0581 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -14,7 +14,7 @@ SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig popt host-pkgconf
# git clone, no configure
SHAIRPORT_SYNC_AUTORECONF = YES
-SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
+SHAIRPORT_SYNC_CONF_OPTS = --with-pa \
--with-metadata \
--with-pipe \
--with-stdout
--
2.25.0

0
buildroot-patches/0031-Upgrade-cargo-and-rust-to-latest-versions-and-don-t-.patch → buildroot-patches/0105-Upgrade-cargo-and-rust-to-latest-versions-and-don-t-.patch
View File

22
buildroot-patches/0018-Bump-RPI-Firmware-version-to-latest.patch → buildroot-patches/0106-Bump-RPI-Firmware-version-to-4.19.106.patch
View File

@ -1,7 +1,7 @@
From 73a5ad7dbf356f39b4356486e138dcd4f0a2548b Mon Sep 17 00:00:00 2001
From bced5282a12ad171556f7127e21963d490fc1eab Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Tue, 24 Dec 2019 08:30:30 +0100
Subject: [PATCH 1/1] Bump RPI Firmware version to latest
Date: Fri, 20 Mar 2020 10:47:44 +0100
Subject: [PATCH 1/1] Bump RPI Firmware version to 4.19.106
---
package/rpi-firmware/rpi-firmware.hash | 2 +-
@ -9,27 +9,27 @@ Subject: [PATCH 1/1] Bump RPI Firmware version to latest
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index 61834f7d42..d21ca9d251 100644
index 59ab1da0c6..69fcbfea24 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 c82c40cf37fac36160a7f6b9c314506beb942bf113a55d30fa163c56a4f98946 rpi-firmware-bcf40b5c2b94178c7564fb451098d44968e44af5.tar.gz
+sha256 6f5251c6cd1338947b49cdfa84bd581ef8c52cd9fd69a5fb7905995564a8de49 rpi-firmware-0c01dbefba45a08c47f8538d5a071a0fba6b7e83.tar.gz
sha256 ba76edfc10a248166d965b8eaf320771c44f4f432d4fce2fd31fd272e7038add boot/LICENCE.broadcom
-sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz
+sha256 32ef9f8dadbc05f3a1da3e9819f261e911f52cd05c4830a34361d989660f23b5 rpi-firmware-bf83b506b4a6f9e592e711d02871a278fad5bd1e.tar.gz
sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 717f705f66..197f3f44bb 100644
index 6fee60b08c..3a53212138 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RPI_FIRMWARE_VERSION = bcf40b5c2b94178c7564fb451098d44968e44af5
+RPI_FIRMWARE_VERSION = 0c01dbefba45a08c47f8538d5a071a0fba6b7e83
-RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
+RPI_FIRMWARE_VERSION = bf83b506b4a6f9e592e711d02871a278fad5bd1e
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
--
2.24.0.rc1
2.25.0