Skip to content

Commit d1ac558

Browse files
hifiberryhifiberry
authored
Merge pull request #110 from hifiberry/development
Merge June 2020 release
2 parents de50b59 + 3a951c4 commit d1ac558

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1181
-8901
lines changed

‎Changelog

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
202005xx:
1+
20200629:
2+
- Added Music browser to handle local music libraries
3+
- New 96kHz DSP profiles for DAC+ DSP and DSP add-on board
4+
- Several other bugfixes and improvements
5+
6+
20200527:
27
- Local user interface running on the Pi (Pi3/4 only)
38
- ALSA eq disabled by default
49
- Several bugfixes and stability improvements

‎build-config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ if [ "$VERSION" == "2" ]; then
9393
fi
9494

9595
# Workaround
96-
echo "BR2_JLEVEL=16" >> $TMP
96+
#echo "BR2_JLEVEL=16" >> $TMP
97+
98+
# Disable parallel builds (still testing)
99+
echo "BR2_PER_PACKAGE_DIRECTORIES=n" >> $TMP
97100

98101
mv $TMP $DST
99102
mv $DST $BRDIR/.config

‎buildroot/Config.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-systemd/Config.in"
1010
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/watchdog/Config.in"
1111
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/disable-samba/Config.in"
1212
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/enable-arm7/Config.in"
13+
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/pigpiod-systemd/Config.in"
1314

1415
comment "Players"
1516
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/lmsmpris/Config.in"
@@ -46,18 +47,22 @@ comment "Backend applications"
4647
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dsptoolkit/Config.in"
4748
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dspprofiles/Config.in"
4849
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/audiocontrol2/Config.in"
50+
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/musicfiletools/Config.in"
4951
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-postgres/Config.in"
5052
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-measurements/Config.in"
5153
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-analytics/Config.in"
5254
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/smbtools/Config.in"
55+
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-automount/Config.in"
5356

5457
comment "GUI"
5558
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/beocreate/Config.in"
59+
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/beocreate-music/Config.in"
5660
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dsp-promo/Config.in"
5761
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/enable-vc4kms/Config.in"
5862
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-psplash/Config.in"
5963
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-localbrowser/Config.in"
6064

65+
6166
comment "Libraries"
6267
#source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/caps/Config.in"
6368

‎buildroot/buildroot-2020.05.patch

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
diff -ru buildroot-dev/package/nodejs/nodejs.mk br-dev-april/package/nodejs/nodejs.mk
2+
--- buildroot-dev/package/nodejs/nodejs.mk 2020-03-31 12:59:18.553214135 +0000
3+
+++ br-dev-april/package/nodejs/nodejs.mk 2020-03-31 12:57:07.094946091 +0000
4+
@@ -63,7 +63,6 @@
5+
--shared-openssl \
6+
--shared-openssl-includes=$(HOST_DIR)/include/openssl \
7+
--shared-openssl-libpath=$(HOST_DIR)/lib \
8+
- --shared-zlib \
9+
--no-cross-compiling \
10+
--with-intl=small-icu \
11+
)
12+
diff -ru buildroot-dev/package/python-pycairo/python-pycairo.mk br-dev-april/package/python-pycairo/python-pycairo.mk
13+
--- buildroot-dev/package/python-pycairo/python-pycairo.mk 2020-03-31 12:59:18.593213608 +0000
14+
+++ br-dev-april/package/python-pycairo/python-pycairo.mk 2020-03-31 12:57:07.094946091 +0000
15+
@@ -8,8 +8,16 @@
16+
PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz
17+
PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb
18+
PYTHON_PYCAIRO_SETUP_TYPE = setuptools
19+
-PYTHON_PYCAIRO_DEPENDENCIES = cairo
20+
+PYTHON_PYCAIRO_DEPENDENCIES = cairo host-cairo
21+
PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1
22+
PYTHON_PYCAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
23+
24+
+HOST_PYTHON_PYCAIRO_ENV = \
25+
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
26+
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
27+
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
28+
+ PKG_CONFIG_SYSROOT_DIR="/" \
29+
+ PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
30+
+
31+
$(eval $(python-package))
32+
+$(eval $(host-python-package))
33+
diff -ur buildroot-dev-unpatched/package/python-idna/python-idna.hash buildroot-dev/package/python-idna/python-idna.hash
34+
--- buildroot-dev-unpatched/package/python-idna/python-idna.hash 2020-03-31 15:45:57.312748338 +0000
35+
+++ buildroot-dev/package/python-idna/python-idna.hash 2020-03-31 15:58:25.932079207 +0000
36+
@@ -1,5 +1,6 @@
37+
# md5, sha256 from https://pypi.org/pypi/idna/json
38+
md5 870b8b80267f00f0faf1b7ba4bdbf14e idna-2.9.tar.gz
39+
sha256 7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb idna-2.9.tar.gz
40+
+sha256 c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 idna-2.8.tar.gz
41+
# Locally computed sha256 checksums
42+
sha256 412014420d2473dba06117c3d4d9e0eecaa6dde0ca30cd951f4ec2be39426f32 LICENSE.rst
43+
diff -ur buildroot-dev-unpatched/package/python-idna/python-idna.mk buildroot-dev/package/python-idna/python-idna.mk
44+
--- buildroot-dev-unpatched/package/python-idna/python-idna.mk 2020-03-31 15:45:57.312748338 +0000
45+
+++ buildroot-dev/package/python-idna/python-idna.mk 2020-03-31 15:49:52.056995049 +0000
46+
@@ -4,7 +4,7 @@
47+
#
48+
################################################################################
49+
50+
-PYTHON_IDNA_VERSION = 2.9
51+
+PYTHON_IDNA_VERSION = 2.8
52+
PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
53+
PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/cb/19/57503b5de719ee45e83472f339f617b0c01ad75cba44aba1e4c97c2b0abd
54+
PYTHON_IDNA_LICENSE = BSD-3-Clause
55+
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
56+
index 4bf762e662..73fe9954e7 100644
57+
--- a/package/pkg-python.mk
58+
+++ b/package/pkg-python.mk
59+
@@ -20,9 +20,11 @@
60+
#
61+
################################################################################
62+
63+
-define PKG_PYTHON_SYSCONFIGDATA_NAME
64+
-$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py)))
65+
-endef
66+
+# basename does not evaluate if a file exists, so we must check to ensure
67+
+# the _sysconfigdata__linux_*.py file exists. The "|| true" is added to return
68+
+# an empty string if the file does not exist.
69+
+PKG_PYTHON_SYSCONFIGDATA_PATH = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py
70+
+PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true`
71+
72+
# Target distutils-based packages
73+
PKG_PYTHON_DISTUTILS_ENV = \

‎buildroot/package/audiocontrol2/audiocontrol2.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AUDIOCONTROL2_VERSION = 248991249f990eb65a792dca0fa6a2ba0ad347d0
7+
AUDIOCONTROL2_VERSION = a8a5d6ba5e56e132a4d38d00c8a4fdf037d23051
88
AUDIOCONTROL2_SITE = $(call github,hifiberry,audiocontrol2,$(AUDIOCONTROL2_VERSION))
99

1010
AUDIOCONTROL2_DEPENDENCIES = python3

‎buildroot/package/beocreate-music/Config.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
config BR2_PACKAGE_BEOCREATE_MUSIC
2+
bool "music extension for Beocreate"
3+
help
4+
User interface to control playback of local music libraries
5+
depends on BR2_PACKAGE_HIFIBERRY_BASE
6+
depends on BR2_PACKAGE_BEOCREATE
7+
select BR2_PACKAGE_LIBCURL
8+
select BR2_PACKAGE_LIBCURL_CURL
9+
select BR2_PACKAGE_MPD_MPC
10+

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
################################################################################
2+
#
3+
# beocreate-music
4+
#
5+
################################################################################
6+
7+
BEOCREATE_MUSIC_VERSION = 86003f0682b9bef47e73ed51826dd75da7444322
8+
BEOCREATE_MUSIC_SITE = $(call github,tuomashamalainen,beocreate-music,$(BEOCREATE_MUSIC_VERSION))
9+
10+
define BEOCREATE_MUSIC_INSTALL_TARGET_CMDS
11+
mkdir -p $(TARGET_DIR)/opt/beocreate/beo-extensions/music
12+
cp -rv $(@D)/music/* $(TARGET_DIR)/opt/beocreate/beo-extensions/music
13+
endef
14+
15+
$(eval $(generic-package))

‎buildroot/package/beocreate/beocreate.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
BEOCREATE_VERSION = 6805176775488db494e7fba940135d3983ec500f
7+
BEOCREATE_VERSION = 33badd5622417c209d733b70bad5729ae4414c1c
88
BEOCREATE_SITE = $(call github,bang-olufsen,create,$(BEOCREATE_VERSION))
99

1010
#BEOCREATE_VERSION = ea520f8086f5639a94f81375d52492b1b66d273b
@@ -23,6 +23,9 @@ define BEOCREATE_INSTALL_TARGET_CMDS
2323
rm -rf $(TARGET_DIR)/opt/beocreate/etc
2424
cp -rv $(@D)/beocreate_essentials $(TARGET_DIR)/opt/beocreate
2525
cp -rv $(@D)/Beocreate2/etc/* $(TARGET_DIR)/etc/beocreate
26+
# DSP Parameter Reader
27+
mkdir -p $(TARGET_DIR)/opt/beocreate/misc/dspparamreader
28+
cp -rv $(@D)/DSP\ Parameter\ Reader/* $(TARGET_DIR)/opt/beocreate/misc/dspparamreader
2629
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/beocreate/system.json \
2730
$(TARGET_DIR)/etc/beocreate/system.json
2831
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/beocreate/system.json \

‎buildroot/package/btspeaker/a2dp-agent.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Description=Bluetooth A2DP agent
33
Requires=bluetooth.service btuart.service
44
After=bluetooth.service btuart.service
5+
ConditionPathExists=/etc/features/bluetooth
56

67
[Service]
78
ExecStart=/opt/btspeaker/a2dp-agent.py

‎buildroot/package/btspeaker/bluetoothd.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Description=Bluetooth demon
33
Requires=dbus.service
44
After=dbus.service
5+
ConditionPathExists=/etc/features/bluetooth
56

67
[Service]
78
ExecStartPre=/opt/hifiberry/bin/bootmsg "Starting Bluetooth daemon"

‎buildroot/package/btspeaker/btinterface.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Description=Bluetooth hardware initialisiation
33
After=bluetooth.service
44
Before=bluealsa.service
5+
ConditionPathExists=/etc/features/bluetooth
56

67
[Service]
78
Type=oneshot

‎buildroot/package/btspeaker/btuart.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[Unit]
22
Description=Bluetooth hardware initialisiation
33
Before=bluetooth.service
4+
ConditionPathExists=/etc/features/bluetooth
45

56
[Service]
67
Type=simple

0 commit comments

Comments
 (0)