Skip to content

Commit af7f517

Browse files
hifiberryhifiberry
authored
Merge pull request #54 from hifiberry/brdev
Brdev
2 parents 76e7cf4 + 51788a7 commit af7f517

File tree

18 files changed

+504
-421
lines changed

18 files changed

+504
-421
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ b
1414
notify
1515
publish-files
1616
publish-dev
17+
update-all

‎buildroot/Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-greenlet/Config.in"
5252
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-keyboard/Config.in"
5353
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-levenshtein/Config.in"
5454
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-musicbrainz-ngs/Config.in"
55+
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pygobject/Config.in"
5556
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pyky040/Config.in"
5657
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pylast/Config.in"
5758
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-tzupdate/Config.in"

‎buildroot/buildroot-dev.patch

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
diff -bur buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk brdev/package/gstreamer1/gstreamer1/gstreamer1.mk
2+
--- buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk 2020-03-19 06:27:39.898016792 +0000
3+
+++ brdev/package/gstreamer1/gstreamer1/gstreamer1.mk 2020-03-19 06:26:19.130780046 +0000
4+
@@ -33,7 +33,6 @@
5+
host-pkgconf \
6+
libglib2 \
7+
$(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \
8+
- $(if $(BR2_PACKAGE_VALGRIND),valgrind) \
9+
$(TARGET_NLS_DEPENDENCIES)
10+
11+
GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
12+
diff -bur buildroot-dev/package/nodejs/nodejs.mk brdev/package/nodejs/nodejs.mk
13+
--- buildroot-dev/package/nodejs/nodejs.mk 2020-03-19 06:27:39.966016147 +0000
14+
+++ brdev/package/nodejs/nodejs.mk 2020-03-18 15:55:12.021994021 +0000
15+
@@ -63,7 +63,6 @@
16+
--shared-openssl \
17+
--shared-openssl-includes=$(HOST_DIR)/include/openssl \
18+
--shared-openssl-libpath=$(HOST_DIR)/lib \
19+
- --shared-zlib \
20+
--no-cross-compiling \
21+
--with-intl=small-icu \
22+
)
23+
diff -bur buildroot-dev/package/python-pycairo/python-pycairo.mk brdev/package/python-pycairo/python-pycairo.mk
24+
--- buildroot-dev/package/python-pycairo/python-pycairo.mk 2020-03-19 06:27:40.010015730 +0000
25+
+++ brdev/package/python-pycairo/python-pycairo.mk 2020-03-18 20:58:07.365488420 +0000
26+
@@ -8,8 +8,16 @@
27+
PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz
28+
PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb
29+
PYTHON_PYCAIRO_SETUP_TYPE = setuptools
30+
-PYTHON_PYCAIRO_DEPENDENCIES = cairo
31+
+PYTHON_PYCAIRO_DEPENDENCIES = cairo host-cairo
32+
PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1
33+
PYTHON_PYCAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
34+
35+
+HOST_PYTHON_PYCAIRO_ENV = \
36+
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
37+
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
38+
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
39+
+ PKG_CONFIG_SYSROOT_DIR="/" \
40+
+ PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
41+
+
42+
$(eval $(python-package))
43+
+$(eval $(host-python-package))

‎buildroot/package/audiocontrol2/Config.in

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ config BR2_PACKAGE_AUDIOCONTROL2
1616
select BR2_PACKAGE_PYTHON_SETUPTOOLS
1717
select BR2_PACKAGE_PYTHON_URLLIB3
1818
select BR2_PACKAGE_PYTHON_KEYBOARD
19-
# select BR2_PACKAGE_PYTHON_PSYCOPG2
2019
select BR2_PACKAGE_PYTHON_MUSICBRAINZ_NGS
2120
select BR2_PACKAGE_PYTHON_LEVENSHTEIN
21+
select BR2_PACKAGE_PYTHON_REQUESTS
22+
select BR2_PACKAGE_PYTHON_EXPIRINGDICT
23+
select BR2_PACKAGE_PYTHON_PYKY040
2224

‎buildroot/package/audiocontrol2/audiocontrol2.mk

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ define AUDIOCONTROL2_INSTALL_TARGET_CMDS
2222
endef
2323

2424
define AUDIOCONTROL2_INSTALL_INIT_SYSTEMD
25+
if [ ! -f $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ]; then \
26+
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants; \
27+
fi
2528
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/audiocontrol2/override.conf \
2629
$(TARGET_DIR)/etc/systemd/system/audiocontrol2.service.d/override.conf
2730
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/audiocontrol2/audiocontrol2.service \

‎buildroot/package/hifiberry-mpd/Config.in

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config BR2_PACKAGE_HIFIBERRY_MPD
44
Start script and configuration files for MPD
55
depends on BR2_PACKAGE_HIFIBERRY_BASE
66
depends on !BR2_PACKAGE_MPD
7-
select BR2_PACKAGE_CURL
7+
select BR2_PACKAGE_LIBCURL
88
select BR2_PACKAGE_FAAD2
99
select BR2_PACKAGE_LAME
1010
select BR2_PACKAGE_LIBSHOUT
@@ -14,6 +14,17 @@ config BR2_PACKAGE_HIFIBERRY_MPD
1414
select BR2_PACKAGE_LIBOGG
1515
select BR2_PACKAGE_SAMBA4
1616
select BR2_PACKAGE_YAJL
17+
select BR2_PACKAGE_AVAH
18+
select BR2_PACKAGE_BOOS
19+
select BR2_PACKAGE_FFMPEG
20+
select BR2_PACKAGE_FLAC
21+
select BR2_PACKAGE_ICU
22+
select BR2_PACKAGE_LIBGCRYPT
23+
select BR2_PACKAGE_LIBID3TAG
24+
select BR2_PACKAGE_LIBMAD
25+
select BR2_PACKAGE_LIBSNDFILE
26+
select BR2_PACKAGE_SQLITE
27+
select BR2_PACKAGE_WAVPACK
1728

1829
comment "HiFiBerry mpd package can't be used together with buildroot mpd version, disable this first!"
1930
depends on BR2_PACKAGE_MPD

‎buildroot/package/hifiberry-squeezelite/Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ config BR2_PACKAGE_HIFIBERRY_SQUEEZELITE
99
select BR2_PACKAGE_FAAD2
1010
select BR2_PACKAGE_LAME
1111
select BR2_PACKAGE_JQ
12+
select BR2_PACKAGE_MPG123
1213

1314
comment "HiFiBerry squeezelite package can't be used together with buildroot squeezelite version, disable this first!"
1415
depends on BR2_PACKAGE_SQUEEZELITE

‎buildroot/package/hifiberry-updater/Config.in

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ config BR2_PACKAGE_HIFIBERRY_UPDATER
44
"Update tools for HiFiBerryOS"
55
select BR2_PACKAGE_E2FSPROGS
66
select BR2_PACKAGE_E2FSPROGS_RESIZE2FS
7+
select BR2_PACKAGE_LIBCURL
8+
select BR2_PACKAGE_LIBCURL_CURL

‎buildroot/package/python-pygobject/Config.in

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
config BR2_PACKAGE_PYTHON_PYGOBJECT
2+
bool "python-pygobject"
3+
select BR2_PACKAGE_PYTHON_PYCAIRO # runtime
4+
select BR2_PACKAGE_GOBJECT_INTROSPECTION
5+
help
6+
Python bindings for GObject Introspection.
7+
8+
https://pygobject.readthedocs.io
9+

‎buildroot/package/python-pygobject/python-pygobject.hash

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# md5, sha256 from https://pypi.org/pypi/PyGObject/json
2+
md5 f191a160d492a154beccc4c20f30cbc0 PyGObject-3.36.0.tar.gz
3+
sha256 b97f570e55017fcd3732164811f24ecf63983a4834f61b55b0aaf64ecefac856 PyGObject-3.36.0.tar.gz
4+
# Locally computed sha256 checksums
5+
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
6+
sha256 5c382291e88a29636da3f17b0ac11095b2bc7f9939188900037fac3d7f4f5dd7 docs/images/LICENSE

‎buildroot/package/python-pygobject/python-pygobject.mk

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
################################################################################
2+
#
3+
# python-pygobject
4+
#
5+
################################################################################
6+
7+
PYTHON_PYGOBJECT_VERSION = 3.36.0
8+
PYTHON_PYGOBJECT_SOURCE = PyGObject-$(PYTHON_PYGOBJECT_VERSION).tar.gz
9+
PYTHON_PYGOBJECT_SITE = https://files.pythonhosted.org/packages/3e/b5/f4fd3351ed074aeeae30bff71428f38bc42187e34c44913239a9dc85a7fc
10+
PYTHON_PYGOBJECT_SETUP_TYPE = setuptools
11+
PYTHON_PYGOBJECT_LICENSE = GNU Lesser General Public License v2 or later (LGPLv2+)
12+
PYTHON_PYGOBJECT_LICENSE_FILES = COPYING docs/images/LICENSE
13+
14+
PYTHON_PYGOBJECT_DEPENDENCIES += python3 host-python3 python-pycairo host-python-pycairo
15+
16+
PYTHON_GOBJECT_CONF_ENV = \
17+
PYTHON=$(HOST_DIR)/usr/bin/python3 \
18+
PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`"
19+
20+
$(eval $(python-package))

‎buildroot/package/python-usagedata/Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ config BR2_PACKAGE_PYTHON_USAGEDATA
55
depends on BR2_PACKAGE_PYTHON3
66
depends on BR2_PACKAGE_HIFIBERRY_BASE
77
select BR2_PACKAGE_PYTHON_BOTTLE
8+
select BR2_PACKAGE_PYTHON_REQUESTS

‎buildroot/package/webradio/Config.in

+3
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ config BR2_PACKAGE_WEBRADIO
44
Tools fosten to web radio stations (incl. TuneIn)
55
depends on BR2_PACKAGE_HIFIBERRY_BASE
66
depends on BR2_PACKAGE_BEOCREATE
7+
select BR2_PACKAGE_LIBCURL
8+
select BR2_PACKAGE_LIBCURL_CURL
9+
select BR2_PACKAGE_MPD_MPC
710

0 commit comments

Comments
 (0)