Merge pull request #110 from hifiberry/development

Merge June 2020 release

Changelog

@@ -1,4 +1,9 @@
-202005xx:
+20200629:
+- Added Music browser to handle local music libraries
+- New 96kHz DSP profiles for DAC+ DSP and DSP add-on board
+- Several other bugfixes and improvements
+
+20200527:
 - Local user interface running on the Pi (Pi3/4 only)
 - ALSA eq disabled by default
 - Several bugfixes and stability improvements

build-config

@@ -93,7 +93,10 @@ if [ "$VERSION" == "2" ]; then
 fi 
 
 # Workaround
-echo "BR2_JLEVEL=16" >> $TMP
+#echo "BR2_JLEVEL=16" >> $TMP
+
+# Disable parallel builds (still testing)
+echo "BR2_PER_PACKAGE_DIRECTORIES=n" >> $TMP
 
 mv $TMP $DST
 mv $DST $BRDIR/.config

buildroot/Config.in

@@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-systemd/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/watchdog/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/disable-samba/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/enable-arm7/Config.in"
+source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/pigpiod-systemd/Config.in"
 
 comment "Players"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/lmsmpris/Config.in"
@@ -46,18 +47,22 @@ comment "Backend applications"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dsptoolkit/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dspprofiles/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/audiocontrol2/Config.in"
+source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/musicfiletools/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-postgres/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-measurements/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-analytics/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/smbtools/Config.in"
+source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-automount/Config.in"
 
 comment "GUI"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/beocreate/Config.in"
+source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/beocreate-music/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dsp-promo/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/enable-vc4kms/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-psplash/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-localbrowser/Config.in"
 
+
 comment "Libraries"
 #source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/caps/Config.in"
 

buildroot/buildroot-2020.05.patch

@@ -0,0 +1,73 @@
+diff -ru buildroot-dev/package/nodejs/nodejs.mk br-dev-april/package/nodejs/nodejs.mk
+--- buildroot-dev/package/nodejs/nodejs.mk	2020-03-31 12:59:18.553214135 +0000
++++ br-dev-april/package/nodejs/nodejs.mk	2020-03-31 12:57:07.094946091 +0000
+@@ -63,7 +63,6 @@
+ 		--shared-openssl \
+ 		--shared-openssl-includes=$(HOST_DIR)/include/openssl \
+ 		--shared-openssl-libpath=$(HOST_DIR)/lib \
+-		--shared-zlib \
+ 		--no-cross-compiling \
+ 		--with-intl=small-icu \
+ 	)
+diff -ru buildroot-dev/package/python-pycairo/python-pycairo.mk br-dev-april/package/python-pycairo/python-pycairo.mk
+--- buildroot-dev/package/python-pycairo/python-pycairo.mk	2020-03-31 12:59:18.593213608 +0000
++++ br-dev-april/package/python-pycairo/python-pycairo.mk	2020-03-31 12:57:07.094946091 +0000
+@@ -8,8 +8,16 @@
+ PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz
+ PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb
+ PYTHON_PYCAIRO_SETUP_TYPE = setuptools
+-PYTHON_PYCAIRO_DEPENDENCIES = cairo
++PYTHON_PYCAIRO_DEPENDENCIES = cairo host-cairo
+ PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1
+ PYTHON_PYCAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
+
++HOST_PYTHON_PYCAIRO_ENV = \
++        PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
++        PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
++        PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
++        PKG_CONFIG_SYSROOT_DIR="/" \
++        PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
++
+ $(eval $(python-package))
++$(eval $(host-python-package))
+diff -ur buildroot-dev-unpatched/package/python-idna/python-idna.hash buildroot-dev/package/python-idna/python-idna.hash
+--- buildroot-dev-unpatched/package/python-idna/python-idna.hash        2020-03-31 15:45:57.312748338 +0000
++++ buildroot-dev/package/python-idna/python-idna.hash  2020-03-31 15:58:25.932079207 +0000
+@@ -1,5 +1,6 @@
+ # md5, sha256 from https://pypi.org/pypi/idna/json
+ md5  870b8b80267f00f0faf1b7ba4bdbf14e  idna-2.9.tar.gz
+ sha256  7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb  idna-2.9.tar.gz
++sha256  c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407  idna-2.8.tar.gz
+ # Locally computed sha256 checksums
+ sha256  412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32  LICENSE.rst
+diff -ur buildroot-dev-unpatched/package/python-idna/python-idna.mk buildroot-dev/package/python-idna/python-idna.mk
+--- buildroot-dev-unpatched/package/python-idna/python-idna.mk  2020-03-31 15:45:57.312748338 +0000
++++ buildroot-dev/package/python-idna/python-idna.mk    2020-03-31 15:49:52.056995049 +0000
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-PYTHON_IDNA_VERSION = 2.9
++PYTHON_IDNA_VERSION = 2.8
+ PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
+ PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/19/57503b5de719ee45e83472f339f617b0c01ad75cba44aba1e4c97c2b0abd
+ PYTHON_IDNA_LICENSE = BSD-3-Clause
+diff --git a/package/pkg-python.mk b/package/pkg-python.mk
+index 4bf762e662..73fe9954e7 100644
+--- a/package/pkg-python.mk
++++ b/package/pkg-python.mk
+@@ -20,9 +20,11 @@ 
+ #
+ ################################################################################
+
+-define PKG_PYTHON_SYSCONFIGDATA_NAME
+-$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py)))
+-endef
++# basename does not evaluate if a file exists, so we must check to ensure
++# the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return
++# an empty string if the file does not exist.
++PKG_PYTHON_SYSCONFIGDATA_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py
++PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true`
+
+ # Target distutils-based packages
+ PKG_PYTHON_DISTUTILS_ENV = \

buildroot/package/audiocontrol2/audiocontrol2.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AUDIOCONTROL2_VERSION = 248991249f990eb65a792dca0fa6a2ba0ad347d0
+AUDIOCONTROL2_VERSION =  a8a5d6ba5e56e132a4d38d00c8a4fdf037d23051
 AUDIOCONTROL2_SITE = $(call github,hifiberry,audiocontrol2,$(AUDIOCONTROL2_VERSION))
 
 AUDIOCONTROL2_DEPENDENCIES = python3

buildroot/package/beocreate-music/Config.in

@@ -0,0 +1,10 @@
+config BR2_PACKAGE_BEOCREATE_MUSIC
+	bool "music extension for Beocreate"
+        help
+	  User interface to control playback of local music libraries
+        depends on BR2_PACKAGE_HIFIBERRY_BASE
+        depends on BR2_PACKAGE_BEOCREATE
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBCURL_CURL
+	select BR2_PACKAGE_MPD_MPC
+

buildroot/package/beocreate-music/beocreate-music.mk

@@ -0,0 +1,15 @@
+################################################################################
+#
+# beocreate-music
+#
+################################################################################
+
+BEOCREATE_MUSIC_VERSION = 86003f0682b9bef47e73ed51826dd75da7444322
+BEOCREATE_MUSIC_SITE = $(call github,tuomashamalainen,beocreate-music,$(BEOCREATE_MUSIC_VERSION))
+
+define BEOCREATE_MUSIC_INSTALL_TARGET_CMDS
+	mkdir -p  $(TARGET_DIR)/opt/beocreate/beo-extensions/music
+	cp -rv $(@D)/music/* $(TARGET_DIR)/opt/beocreate/beo-extensions/music
+endef
+
+$(eval $(generic-package))

buildroot/package/beocreate/beocreate.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BEOCREATE_VERSION = 6805176775488db494e7fba940135d3983ec500f
+BEOCREATE_VERSION = 33badd5622417c209d733b70bad5729ae4414c1c
 BEOCREATE_SITE = $(call github,bang-olufsen,create,$(BEOCREATE_VERSION))
 
 #BEOCREATE_VERSION = ea520f8086f5639a94f81375d52492b1b66d273b
@@ -23,6 +23,9 @@ define BEOCREATE_INSTALL_TARGET_CMDS
         rm -rf $(TARGET_DIR)/opt/beocreate/etc
 	cp -rv $(@D)/beocreate_essentials $(TARGET_DIR)/opt/beocreate
 	cp -rv $(@D)/Beocreate2/etc/* $(TARGET_DIR)/etc/beocreate
+        # DSP Parameter Reader
+        mkdir -p $(TARGET_DIR)/opt/beocreate/misc/dspparamreader
+        cp -rv $(@D)/DSP\ Parameter\ Reader/* $(TARGET_DIR)/opt/beocreate/misc/dspparamreader
 	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/beocreate/system.json \
                 $(TARGET_DIR)/etc/beocreate/system.json
         $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/beocreate/system.json \

buildroot/package/btspeaker/a2dp-agent.service

@@ -2,6 +2,7 @@
 Description=Bluetooth A2DP agent
 Requires=bluetooth.service btuart.service
 After=bluetooth.service btuart.service
+ConditionPathExists=/etc/features/bluetooth
 
 [Service]
 ExecStart=/opt/btspeaker/a2dp-agent.py

buildroot/package/btspeaker/bluetoothd.service

@@ -2,6 +2,7 @@
 Description=Bluetooth demon
 Requires=dbus.service
 After=dbus.service
+ConditionPathExists=/etc/features/bluetooth
 
 [Service]
 ExecStartPre=/opt/hifiberry/bin/bootmsg "Starting Bluetooth daemon"

buildroot/package/btspeaker/btinterface.service

@@ -2,6 +2,7 @@
 Description=Bluetooth hardware initialisiation
 After=bluetooth.service
 Before=bluealsa.service
+ConditionPathExists=/etc/features/bluetooth
 
 [Service]
 Type=oneshot

buildroot/package/btspeaker/btuart.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=Bluetooth hardware initialisiation
 Before=bluetooth.service
+ConditionPathExists=/etc/features/bluetooth
 
 [Service]
 Type=simple