diff mbox

[2/2] package/jack2: add missing optional dependencies

Message ID 5f7632a3d6ed3e3ab0f324e31be21a0ea18245d4.1451329553.git.yann.morin.1998@free.fr
State Changes Requested
Headers show

Commit Message

Yann E. MORIN Dec. 28, 2015, 7:08 p.m. UTC
jack2 can optionally use opus, readline and eigen3, but those
dependencies were not expressed in out jack2 package, potentially
leading to unreproducible builds.

Add them.

Note that the optinal dependency on celt is not added, because we only
have celt-0.5.1 and jack2 requires celt >= 0.5.2 (even though it does
look for celt >= 0.5.0, it does not build with celt- < 0.5.2). Sinc ewe
can not upgrade celt (for now), we just never make jack2 depend on
celt051, and it won;t find it either, as it just searches for celt.pc
and we have celt051.pc.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/jack2/jack2.mk | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Thomas Petazzoni Dec. 28, 2015, 8:42 p.m. UTC | #1
Dear Yann E. MORIN,

On Mon, 28 Dec 2015 20:08:55 +0100, Yann E. MORIN wrote:

> +ifeq ($(BR2_PACKAGE_OPUS),y)
> +JACK2_DEPENDENCIES += opus
> +endif
> +
> +ifeq ($(BR2_PACKAGE_READLINE),y)
> +JACK2_DEPENDENCIES += readline
> +endif
> +
> +ifeq ($(BR2_PACKAGE_EIGEN),y)
> +JACK2_DEPENDENCIES += eigen
> +endif

I'm fine with the opus and readline dependencies. But for the eigen
dependency, I'm not so sure. linux/wscript defines HAVE_EIGEN3 is eigen
is available. And this symbol is not used anywhere in the jack2 source
code... So it seems like eigen is a useless dependency.

Thomas
Yann E. MORIN Dec. 28, 2015, 8:49 p.m. UTC | #2
Thomas, All,

On 2015-12-28 21:42 +0100, Thomas Petazzoni spake thusly:
> On Mon, 28 Dec 2015 20:08:55 +0100, Yann E. MORIN wrote:
> > +ifeq ($(BR2_PACKAGE_OPUS),y)
> > +JACK2_DEPENDENCIES += opus
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_READLINE),y)
> > +JACK2_DEPENDENCIES += readline
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_EIGEN),y)
> > +JACK2_DEPENDENCIES += eigen
> > +endif
> 
> I'm fine with the opus and readline dependencies. But for the eigen
> dependency, I'm not so sure. linux/wscript defines HAVE_EIGEN3 is eigen
> is available. And this symbol is not used anywhere in the jack2 source
> code... So it seems like eigen is a useless dependency.

OK, I just based my analysis on the output of the waf configure command,
which just reported a missing eigen before this patch, and found it with
this patch.

However, after your comment I looked at what eigen was used for. It is
only used in cunjunction with gtkiostream to provide the IIO backend.

But we don't have gtkiostream (and it's not even in dDebian or Ubuntu!),
so indeed the eigen dependency is useless in our case.

I'll fix and respin.

Thanks! :-)

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk
index e4ad36e..5566b78 100644
--- a/package/jack2/jack2.mk
+++ b/package/jack2/jack2.mk
@@ -24,6 +24,23 @@  JACK2_DEPENDENCIES += dbus
 JACK2_CONF_OPTS += --dbus
 endif
 
+ifeq ($(BR2_PACKAGE_OPUS),y)
+JACK2_DEPENDENCIES += opus
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+JACK2_DEPENDENCIES += readline
+endif
+
+ifeq ($(BR2_PACKAGE_EIGEN),y)
+JACK2_DEPENDENCIES += eigen
+endif
+
+# Even though it advertises support for celt-0.5.x, jack2 really requires
+# celt >= 0.5.2 but we only have 0.5.1.3 and we can not upgrade, so we do
+# not add a dependency to celt051, which it can't find anyway as it looks
+# for celt.pc but we only have celt-51.pc.
+
 define JACK2_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS)	\