* [Buildroot] [PATCH 2/2] jack2: Add version info, display comment when jack1+2 are enabled
2019-01-01 17:33 [Buildroot] [PATCH 1/2] jack1: new package Adam Heinrich
@ 2019-01-01 17:33 ` Adam Heinrich
2019-08-03 10:04 ` [Buildroot] [PATCH 1/2] jack1: new package Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Adam Heinrich @ 2019-01-01 17:33 UTC (permalink / raw)
To: buildroot
This patch changes the help text to emphasize the version of the jack
implementation. It also displays the same comment as the jack1 package
does when both versions are enabled together.
Signed-off-by: Adam Heinrich <adam@adamh.cz>
---
package/jack2/Config.in | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/package/jack2/Config.in b/package/jack2/Config.in
index f9de7be041..6a940ed76d 100644
--- a/package/jack2/Config.in
+++ b/package/jack2/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_JACK2
# Ensure we get at least one:
select BR2_PACKAGE_JACK2_LEGACY if !BR2_PACKAGE_JACK2_DBUS
help
- JACK Audio Connection Kit (server and example clients).
+ JACK Audio Connection Kit (JACK 2 implementation).
JACK is a low-latency sound server, allowing multiple
applications to connect to one audio device, and to share
@@ -23,6 +23,11 @@ config BR2_PACKAGE_JACK2
http://jackaudio.org/
+ Another implementation (BR2_PACKAGE_JACK1) is also available,
+ please consult the documentation to choose the right one:
+
+ https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2
+
if BR2_PACKAGE_JACK2
config BR2_PACKAGE_JACK2_LEGACY
@@ -52,3 +57,7 @@ comment "jack2 needs a toolchain w/ threads, C++, dynamic library"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
BR2_STATIC_LIBS
+
+comment "do not enable jack1 and jack2 together"
+ depends on BR2_PACKAGE_JACK1
+ depends on BR2_PACKAGE_JACK2
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/2] jack1: new package
2019-01-01 17:33 [Buildroot] [PATCH 1/2] jack1: new package Adam Heinrich
2019-01-01 17:33 ` [Buildroot] [PATCH 2/2] jack2: Add version info, display comment when jack1+2 are enabled Adam Heinrich
@ 2019-08-03 10:04 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2019-08-03 10:04 UTC (permalink / raw)
To: buildroot
Adam, All,
Thanks for your contribution, and sorry to come back so late...
On 2019-01-01 18:33 +0100, Adam Heinrich spake thusly:
> This patch adds a new jack1 package alongside the existing jack2.
>
> While jack1 and jack2 are two equivalent implementations of the same
> protocol, they differ in a few details and both of them are being
> actively used (jack2 is not considered to be a replacement of jack1).
I've respun the jack1 patch with some changes:
https://patchwork.ozlabs.org/patch/1141475/
Specifically, I've switched to using the released tarfball, because it
does contain everything to build, tested with utils/test-package:
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: SKIPPED
sourcery-arm [6/6]: OK
6 builds, 2 skipped, 0 build failed, 0 legal-info failed
Consequently, it meansthere is not reason to run autoreconf anymore.
Also, running autogen.sh was not needed; all that was needed for
autoreconf to work was to create the m4 directory, but that's not needed
for the release tarball.
Finally, I've changed the dependency so that jack1 can't be enabled when
jack2 is (a bit like we disallow python3 when python2 is enabled), which
means your second patch (expanding the comment in jack2) is no longer
really needed.
Regards,
Yann E. MORIN.
> For more information, see:
> https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2
>
> Signed-off-by: Adam Heinrich <adam@adamh.cz>
> ---
> package/Config.in | 1 +
> package/jack1/Config.in | 36 ++++++++++++++++++++++++++++++++++++
> package/jack1/jack1.hash | 5 +++++
> package/jack1/jack1.mk | 36 ++++++++++++++++++++++++++++++++++++
> 4 files changed, 78 insertions(+)
> create mode 100644 package/jack1/Config.in
> create mode 100644 package/jack1/jack1.hash
> create mode 100644 package/jack1/jack1.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 0df9b73088..ad8070f54c 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -25,6 +25,7 @@ menu "Audio and video applications"
> source "package/gmrender-resurrect/Config.in"
> source "package/gstreamer/Config.in"
> source "package/gstreamer1/Config.in"
> + source "package/jack1/Config.in"
> source "package/jack2/Config.in"
> source "package/kodi/Config.in"
> source "package/lame/Config.in"
> diff --git a/package/jack1/Config.in b/package/jack1/Config.in
> new file mode 100644
> index 0000000000..bedd3ec449
> --- /dev/null
> +++ b/package/jack1/Config.in
> @@ -0,0 +1,36 @@
> +config BR2_PACKAGE_JACK1
> + bool "jack1"
> + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
> + depends on BR2_USE_MMU # fork()
> + depends on !BR2_STATIC_LIBS
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
> + select BR2_PACKAGE_BERKELEYDB
> + select BR2_PACKAGE_LIBSAMPLERATE
> + select BR2_PACKAGE_LIBSNDFILE
> + select BR2_PACKAGE_ALSA_LIB
> + select BR2_PACKAGE_ALSA_LIB_HWDEP
> + select BR2_PACKAGE_ALSA_LIB_SEQ
> + select BR2_PACKAGE_ALSA_LIB_RAWMIDI
> + help
> + JACK Audio Connection Kit (JACK 1 implementation).
> +
> + JACK is a low-latency sound server, allowing multiple
> + applications to connect to one audio device, and to share
> + audio between themselves. This package contains the daemon
> + jackd as well as some example clients.
> +
> + http://jackaudio.org/
> +
> + Another implementation (BR2_PACKAGE_JACK2) is also available,
> + please consult the documentation to choose the right one:
> +
> + https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2
> +
> +comment "jack1 needs a toolchain w/ threads, dynamic library"
> + depends on BR2_USE_MMU
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
> + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
> +
> +comment "do not enable jack1 and jack2 together"
> + depends on BR2_PACKAGE_JACK1
> + depends on BR2_PACKAGE_JACK2
> diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash
> new file mode 100644
> index 0000000000..06458180f0
> --- /dev/null
> +++ b/package/jack1/jack1.hash
> @@ -0,0 +1,5 @@
> +# Locally computed
> +sha256 c811826f2993d4f0245b0ee92e9d305d0b67990cea08a2c5f9b21a5d65939a82 jack1-0.125.0.tar.gz
> +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING
> +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL
> +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL
> diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk
> new file mode 100644
> index 0000000000..b346839393
> --- /dev/null
> +++ b/package/jack1/jack1.mk
> @@ -0,0 +1,36 @@
> +################################################################################
> +#
> +# jack1
> +#
> +################################################################################
> +
> +JACK1_VERSION = 0.125.0
> +# Do not use the official release link nor the github helper because
> +# the archive contains empty directories (uninitialized submodules):
> +JACK1_SITE = https://github.com/jackaudio/jack1.git
> +JACK1_SITE_METHOD = git
> +JACK1_GIT_SUBMODULES = YES
> +JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
> +JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
> +JACK1_INSTALL_STAGING = YES
> +JACK1_AUTORECONF = YES
> +JACK1_CONF_OPTS = --without-html-dir --disable-oss
> +JACK1_DEPENDENCIES = berkeleydb libsamplerate libsndfile alsa-lib
> +
> +ifeq ($(BR2_PACKAGE_OPUS),y)
> +JACK1_DEPENDENCIES += opus
> +endif
> +
> +ifeq ($(BR2_PACKAGE_READLINE),y)
> +JACK1_DEPENDENCIES += readline
> +endif
> +
> +# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we
> +# only have 0.5.1.3 and we cannot upgrade.
> +
> +define JACK1_RUN_AUTOGEN
> + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./autogen.sh)
> +endef
> +JACK1_PRE_CONFIGURE_HOOKS += JACK1_RUN_AUTOGEN
> +
> +$(eval $(autotools-package))
> --
> 2.17.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread