Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brdev #54

Merged
merged 16 commits into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ b
notify
publish-files
publish-dev
update-all
1 change: 1 addition & 0 deletions buildroot/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-greenlet/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-keyboard/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-levenshtein/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-musicbrainz-ngs/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pygobject/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pyky040/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pylast/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-tzupdate/Config.in"
Expand Down
43 changes: 43 additions & 0 deletions buildroot/buildroot-dev.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
diff -bur buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk brdev/package/gstreamer1/gstreamer1/gstreamer1.mk
--- buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk 2020-03-19 06:27:39.898016792 +0000
+++ brdev/package/gstreamer1/gstreamer1/gstreamer1.mk 2020-03-19 06:26:19.130780046 +0000
@@ -33,7 +33,6 @@
host-pkgconf \
libglib2 \
$(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \
- $(if $(BR2_PACKAGE_VALGRIND),valgrind) \
$(TARGET_NLS_DEPENDENCIES)

GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
diff -bur buildroot-dev/package/nodejs/nodejs.mk brdev/package/nodejs/nodejs.mk
--- buildroot-dev/package/nodejs/nodejs.mk 2020-03-19 06:27:39.966016147 +0000
+++ brdev/package/nodejs/nodejs.mk 2020-03-18 15:55:12.021994021 +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 -bur buildroot-dev/package/python-pycairo/python-pycairo.mk brdev/package/python-pycairo/python-pycairo.mk
--- buildroot-dev/package/python-pycairo/python-pycairo.mk 2020-03-19 06:27:40.010015730 +0000
+++ brdev/package/python-pycairo/python-pycairo.mk 2020-03-18 20:58:07.365488420 +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))
4 changes: 3 additions & 1 deletion buildroot/package/audiocontrol2/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ config BR2_PACKAGE_AUDIOCONTROL2
select BR2_PACKAGE_PYTHON_SETUPTOOLS
select BR2_PACKAGE_PYTHON_URLLIB3
select BR2_PACKAGE_PYTHON_KEYBOARD
# select BR2_PACKAGE_PYTHON_PSYCOPG2
select BR2_PACKAGE_PYTHON_MUSICBRAINZ_NGS
select BR2_PACKAGE_PYTHON_LEVENSHTEIN
select BR2_PACKAGE_PYTHON_REQUESTS
select BR2_PACKAGE_PYTHON_EXPIRINGDICT
select BR2_PACKAGE_PYTHON_PYKY040

3 changes: 3 additions & 0 deletions buildroot/package/audiocontrol2/audiocontrol2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ define AUDIOCONTROL2_INSTALL_TARGET_CMDS
endef

define AUDIOCONTROL2_INSTALL_INIT_SYSTEMD
if [ ! -f $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ]; then \
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants; \
fi
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/audiocontrol2/override.conf \
$(TARGET_DIR)/etc/systemd/system/audiocontrol2.service.d/override.conf
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/audiocontrol2/audiocontrol2.service \
Expand Down
13 changes: 12 additions & 1 deletion buildroot/package/hifiberry-mpd/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ config BR2_PACKAGE_HIFIBERRY_MPD
Start script and configuration files for MPD
depends on BR2_PACKAGE_HIFIBERRY_BASE
depends on !BR2_PACKAGE_MPD
select BR2_PACKAGE_CURL
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_FAAD2
select BR2_PACKAGE_LAME
select BR2_PACKAGE_LIBSHOUT
Expand All @@ -14,6 +14,17 @@ config BR2_PACKAGE_HIFIBERRY_MPD
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_SAMBA4
select BR2_PACKAGE_YAJL
select BR2_PACKAGE_AVAH
select BR2_PACKAGE_BOOS
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FLAC
select BR2_PACKAGE_ICU
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBID3TAG
select BR2_PACKAGE_LIBMAD
select BR2_PACKAGE_LIBSNDFILE
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_WAVPACK

comment "HiFiBerry mpd package can't be used together with buildroot mpd version, disable this first!"
depends on BR2_PACKAGE_MPD
Expand Down
1 change: 1 addition & 0 deletions buildroot/package/hifiberry-squeezelite/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ config BR2_PACKAGE_HIFIBERRY_SQUEEZELITE
select BR2_PACKAGE_FAAD2
select BR2_PACKAGE_LAME
select BR2_PACKAGE_JQ
select BR2_PACKAGE_MPG123

comment "HiFiBerry squeezelite package can't be used together with buildroot squeezelite version, disable this first!"
depends on BR2_PACKAGE_SQUEEZELITE
2 changes: 2 additions & 0 deletions buildroot/package/hifiberry-updater/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ config BR2_PACKAGE_HIFIBERRY_UPDATER
"Update tools for HiFiBerryOS"
select BR2_PACKAGE_E2FSPROGS
select BR2_PACKAGE_E2FSPROGS_RESIZE2FS
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBCURL_CURL
9 changes: 9 additions & 0 deletions buildroot/package/python-pygobject/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
config BR2_PACKAGE_PYTHON_PYGOBJECT
bool "python-pygobject"
select BR2_PACKAGE_PYTHON_PYCAIRO # runtime
select BR2_PACKAGE_GOBJECT_INTROSPECTION
help
Python bindings for GObject Introspection.

https://pygobject.readthedocs.io

6 changes: 6 additions & 0 deletions buildroot/package/python-pygobject/python-pygobject.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/PyGObject/json
md5 f191a160d492a154beccc4c20f30cbc0 PyGObject-3.36.0.tar.gz
sha256 b97f570e55017fcd3732164811f24ecf63983a4834f61b55b0aaf64ecefac856 PyGObject-3.36.0.tar.gz
# Locally computed sha256 checksums
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
sha256 5c382291e88a29636da3f17b0ac11095b2bc7f9939188900037fac3d7f4f5dd7 docs/images/LICENSE
20 changes: 20 additions & 0 deletions buildroot/package/python-pygobject/python-pygobject.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
################################################################################
#
# python-pygobject
#
################################################################################

PYTHON_PYGOBJECT_VERSION = 3.36.0
PYTHON_PYGOBJECT_SOURCE = PyGObject-$(PYTHON_PYGOBJECT_VERSION).tar.gz
PYTHON_PYGOBJECT_SITE = https://files.pythonhosted.org/packages/3e/b5/f4fd3351ed074aeeae30bff71428f38bc42187e34c44913239a9dc85a7fc
PYTHON_PYGOBJECT_SETUP_TYPE = setuptools
PYTHON_PYGOBJECT_LICENSE = GNU Lesser General Public License v2 or later (LGPLv2+)
PYTHON_PYGOBJECT_LICENSE_FILES = COPYING docs/images/LICENSE

PYTHON_PYGOBJECT_DEPENDENCIES += python3 host-python3 python-pycairo host-python-pycairo

PYTHON_GOBJECT_CONF_ENV = \
PYTHON=$(HOST_DIR)/usr/bin/python3 \
PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`"

$(eval $(python-package))
1 change: 1 addition & 0 deletions buildroot/package/python-usagedata/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ config BR2_PACKAGE_PYTHON_USAGEDATA
depends on BR2_PACKAGE_PYTHON3
depends on BR2_PACKAGE_HIFIBERRY_BASE
select BR2_PACKAGE_PYTHON_BOTTLE
select BR2_PACKAGE_PYTHON_REQUESTS
3 changes: 3 additions & 0 deletions buildroot/package/webradio/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ config BR2_PACKAGE_WEBRADIO
Tools fosten to web radio stations (incl. TuneIn)
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

Loading