[Buildroot] [PATCHv2] package/jack1: new package

[Buildroot] [PATCHv2] package/jack1: new package

[Yann E. MORIN]

From: Adam Heinrich <adam@adamh.cz>

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).

It is not possible to enable both at the same time, so hide away jack1
when jack2 is enabled (to keep existing defconfig files working).

For more information, see:
https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2

Signed-off-by: Adam Heinrich <adam@adamh.cz>
[yann.morin.1998 at free.fr:
  - fix coding style
  - use the release tarball, not a git clone
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/Config.in        |  1 +
 package/jack1/Config.in  | 33 +++++++++++++++++++++++++++++++++
 package/jack1/jack1.hash |  5 +++++
 package/jack1/jack1.mk   | 28 ++++++++++++++++++++++++++++
 4 files changed, 67 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 b7472b9bea..d3323ee9b1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -26,6 +26,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..b03145aa27
--- /dev/null
+++ b/package/jack1/Config.in
@@ -0,0 +1,33 @@
+config BR2_PACKAGE_JACK1
+	bool "jack1"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_PACKAGE_JACK2
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_HWDEP
+	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	select BR2_PACKAGE_BERKELEYDB
+	select BR2_PACKAGE_LIBSNDFILE
+	select BR2_PACKAGE_LIBSAMPLERATE
+	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
diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash
new file mode 100644
index 0000000000..d7787ac2ad
--- /dev/null
+++ b/package/jack1/jack1.hash
@@ -0,0 +1,5 @@
+# Locally computed
+sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444  jack-audio-connection-kit-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..3f5ce8d92f
--- /dev/null
+++ b/package/jack1/jack1.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# jack1
+#
+################################################################################
+
+JACK1_VERSION = 0.125.0
+JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz
+JACK1_SITE = http://jackaudio.org/downloads
+JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
+JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
+JACK1_INSTALL_STAGING = YES
+
+# 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.
+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
+
+JACK1_CONF_OPTS = --without-html-dir --disable-oss
+
+$(eval $(autotools-package))
-- 
2.20.1

[Buildroot] [PATCHv2] package/jack1: new package

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > From: Adam Heinrich <adam@adamh.cz>
 > 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).

 > It is not possible to enable both at the same time, so hide away jack1
 > when jack2 is enabled (to keep existing defconfig files working).

 > For more information, see:
 > https://github.com/jackaudio/jackaudio.github.com/wiki/Q_difference_jack1_jack2

 > Signed-off-by: Adam Heinrich <adam@adamh.cz>
 > [yann.morin.1998 at free.fr:
 >   - fix coding style
 >   - use the release tarball, not a git clone
 > ]
 > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
 > ---
 >  package/Config.in        |  1 +
 >  package/jack1/Config.in  | 33 +++++++++++++++++++++++++++++++++
 >  package/jack1/jack1.hash |  5 +++++
 >  package/jack1/jack1.mk   | 28 ++++++++++++++++++++++++++++

A DEVELOPERS entry was missing, I've added it.

 >  4 files changed, 67 insertions(+)
 >  create mode 100644 package/jack1/Config.in
 >  create mode 100644 package/jack1/jack1.hash
 >  create mode 100644 package/jack1/jack1.mk

 > +++ b/package/jack1/Config.in
 > @@ -0,0 +1,33 @@
 > +config BR2_PACKAGE_JACK1
 > +	bool "jack1"
 > +	depends on BR2_USE_MMU # fork()
 > +	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 > +	depends on !BR2_STATIC_LIBS
 > +	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 > +	depends on !BR2_PACKAGE_JACK2
 > +	select BR2_PACKAGE_ALSA_LIB
 > +	select BR2_PACKAGE_ALSA_LIB_HWDEP
 > +	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
 > +	select BR2_PACKAGE_ALSA_LIB_SEQ
 > +	select BR2_PACKAGE_BERKELEYDB
 > +	select BR2_PACKAGE_LIBSNDFILE
 > +	select BR2_PACKAGE_LIBSAMPLERATE

Ideally we want this list sorted, so libsamplerate before libndfile

 > +++ b/package/jack1/jack1.mk
 > @@ -0,0 +1,28 @@
 > +################################################################################
 > +#
 > +# jack1
 > +#
 > +################################################################################
 > +
 > +JACK1_VERSION = 0.125.0
 > +JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz
 > +JACK1_SITE = http://jackaudio.org/downloads
 > +JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
 > +JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
 > +JACK1_INSTALL_STAGING = YES
 > +
 > +# 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.
 > +JACK1_DEPENDENCIES = berkeleydb libsamplerate libsndfile alsa-lib

Looking at configure.ac it uses pkg-config to find dependencies, so I've
added host-pkgconf.

> +
 > +ifeq ($(BR2_PACKAGE_OPUS),y)
 > +JACK1_DEPENDENCIES += opus
 > +endif

I don't see any references to opus in the source code, so I've dropped
this.

Committed with these fixes, thanks.

-- 
Bye, Peter Korsgaard