All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2,1/4] package/spice: disable tests
@ 2019-11-17 16:44 Fabrice Fontaine
  2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
                   ` (4 more replies)
  0 siblings, 5 replies; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-17 16:44 UTC (permalink / raw)
  To: buildroot

By disabling tests, we'll remove the optional gdk-pixbuf dependency

Fixes:
 - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Disable tests instead of adding and fixing gdk-pixbuf optional
   dependency

 .../0001-configure.ac-add-enable-tests.patch  | 54 +++++++++++++++++++
 package/spice/spice.mk                        |  5 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 package/spice/0001-configure.ac-add-enable-tests.patch

diff --git a/package/spice/0001-configure.ac-add-enable-tests.patch b/package/spice/0001-configure.ac-add-enable-tests.patch
new file mode 100644
index 0000000000..668dea1ca3
--- /dev/null
+++ b/package/spice/0001-configure.ac-add-enable-tests.patch
@@ -0,0 +1,54 @@
+From 1b6eaf5589a14763452cbe53382cc699cdeca141 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 15 Nov 2019 11:36:14 +0100
+Subject: [PATCH] configure.ac: add --enable-tests
+
+Allow the user to disable tests through --disable-tests, this is
+especially useful for example to disable gdk-pixbuf dependency
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://gitlab.freedesktop.org/spice/spice-common/merge_requests/6]
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 7 +++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/subprojects/spice-common/Makefile.am b/subprojects/spice-common/Makefile.am
+index 5402499..00623a1 100644
+--- a/subprojects/spice-common/Makefile.am
++++ b/subprojects/spice-common/Makefile.am
+@@ -1,7 +1,11 @@
+ NULL =
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = python_modules common tests docs
++SUBDIRS = python_modules common docs
++
++if ENABLE_TESTS
++SUBDIRS += tests
++endif
+ 
+ EXTRA_DIST =				\
+ 	meson.build			\
+diff --git a/subprojects/spice-common/configure.ac b/subprojects/spice-common/configure.ac
+index 9d10287..2dba7c8 100644
+--- a/subprojects/spice-common/configure.ac
++++ b/subprojects/spice-common/configure.ac
+@@ -33,6 +33,13 @@ AC_SEARCH_LIBS(regcomp, [regex rx])
+ SPICE_CHECK_SYSDEPS
+ SPICE_EXTRA_CHECKS
+ 
++AC_ARG_ENABLE([tests],
++  AS_HELP_STRING([--enable-tests],
++                 [Enable tests @<:@default=yes@:>@]),
++  [],
++  enable_tests="yes")
++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "xyes")
++
+ AC_ARG_ENABLE([alignment-checks],
+   AS_HELP_STRING([--enable-alignment-checks],
+                  [Enable runtime checks for cast alignment @<:@default=no@:>@]),
+-- 
+2.23.0
+
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 16e57441a8..b663479920 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -17,6 +17,8 @@ SPICE_DEPENDENCIES = \
 	openssl \
 	pixman \
 	spice-protocol
+# We're patching subprojects/spice-common/configure.ac
+SPICE_AUTORECONF = YES
 
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.
@@ -25,7 +27,8 @@ SPICE_CONF_OPTS = \
 	--disable-opengl \
 	--disable-smartcard \
 	--without-sasl \
-	--disable-manual
+	--disable-manual \
+	--disable-tests
 
 SPICE_DEPENDENCIES += host-pkgconf
 
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library
  2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
@ 2019-11-17 16:44 ` Fabrice Fontaine
  2019-11-23 13:38   ` [Buildroot] [PATCH v2, 2/4] " Peter Korsgaard
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0 Fabrice Fontaine
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-17 16:44 UTC (permalink / raw)
  To: buildroot

celt051 can't be built statically with opus as opus embeds its own celt
version. So add a dynamic library dependency to celt051 (and not to
opus, as celt051 is only used optionally by spice whereas opus is
selected by 9 packages)

This will fix static build of spice with opus and celt:

/home/fabrice/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/7.4.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/fabrice/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libopus.a(vq.o): in function `renormalise_vector':
vq.c:(.text+0x5ee): multiple definition of `renormalise_vector'; /home/fabrice/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libcelt051.a(vq.o):vq.c:(.text+0x6e6): first defined here

Fixes:
 - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/celt051/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/celt051/Config.in b/package/celt051/Config.in
index e1513190db..e8d6661ed8 100644
--- a/package/celt051/Config.in
+++ b/package/celt051/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CELT051
 	bool "celt051"
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_LIBOGG
 	help
 	  The CELT ultra-low delay audio codec
@@ -13,3 +14,6 @@ config BR2_PACKAGE_CELT051
 	  Note: this is version 0.5.1.3 of celt.
 
 	  http://www.celt-codec.org/
+
+comment "celt051 needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0
  2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
  2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
@ 2019-11-17 16:44 ` Fabrice Fontaine
  2019-11-23 13:33   ` Peter Korsgaard
  2019-12-03  9:49   ` Peter Korsgaard
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2 Fabrice Fontaine
                   ` (2 subsequent siblings)
  4 siblings, 2 replies; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-17 16:44 UTC (permalink / raw)
  To: buildroot

- This bump is needed for spice 0.14.2
- Add license hash

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/spice-protocol/spice-protocol.hash | 5 ++++-
 package/spice-protocol/spice-protocol.mk   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/spice-protocol/spice-protocol.hash b/package/spice-protocol/spice-protocol.hash
index e72bb2d712..c23135141a 100644
--- a/package/spice-protocol/spice-protocol.hash
+++ b/package/spice-protocol/spice-protocol.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	20350bc4309039fdf0d29ee4fd0033cde27bccf33501e13b3c1befafde9d0c9c	spice-protocol-0.12.14.tar.bz2
+sha256	b6a4aa1ca32668790b45a494bbd000e9d05797b391d5a5d4b91adf1118216eac	spice-protocol-0.14.0.tar.bz2
+
+# Hash for license file
+sha256	eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92	COPYING
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
index 7392e9533d..f8c55c7b01 100644
--- a/package/spice-protocol/spice-protocol.mk
+++ b/package/spice-protocol/spice-protocol.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SPICE_PROTOCOL_VERSION = 0.12.14
+SPICE_PROTOCOL_VERSION = 0.14.0
 SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
 SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
 SPICE_PROTOCOL_LICENSE = BSD-3-Clause
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2
  2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
  2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0 Fabrice Fontaine
@ 2019-11-17 16:44 ` Fabrice Fontaine
  2019-11-23 13:33   ` Peter Korsgaard
  2019-12-03  9:49   ` Peter Korsgaard
  2019-11-18 21:47 ` [Buildroot] [PATCH v2,1/4] package/spice: disable tests Thomas Petazzoni
  2019-11-22 22:14 ` Peter Korsgaard
  4 siblings, 2 replies; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-17 16:44 UTC (permalink / raw)
  To: buildroot

- Fix CVE-2019-3813: fix off-by-one error in group/slot boundary check
- Add license hash

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/spice/spice.hash | 3 ++-
 package/spice/spice.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/spice/spice.hash b/package/spice/spice.hash
index 1a25926ab2..4243244129 100644
--- a/package/spice/spice.hash
+++ b/package/spice/spice.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	1ead5de63d06eededed4017db37240f07bef0abffbaf621899647e7e685a1519	spice-0.14.1.tar.bz2
+sha256	b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7	spice-0.14.2.tar.bz2
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index b663479920..8c421abf2e 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SPICE_VERSION = 0.14.1
+SPICE_VERSION = 0.14.2
 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server
 SPICE_LICENSE = LGPL-2.1+
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2,1/4] package/spice: disable tests
  2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
                   ` (2 preceding siblings ...)
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2 Fabrice Fontaine
@ 2019-11-18 21:47 ` Thomas Petazzoni
  2019-11-19  7:47   ` Fabrice Fontaine
  2019-11-22 22:14 ` Peter Korsgaard
  4 siblings, 1 reply; 20+ messages in thread
From: Thomas Petazzoni @ 2019-11-18 21:47 UTC (permalink / raw)
  To: buildroot

On Sun, 17 Nov 2019 17:44:49 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> By disabling tests, we'll remove the optional gdk-pixbuf dependency
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Disable tests instead of adding and fixing gdk-pixbuf optional
>    dependency

I've applied to next. However, your patch to upstream is not really
complete, or at least an additional patch is needed: when tests are
enabled, their configure.ac script should check if gdk-pixbuf is
available. And if it's not available, it should bail out, or disable
tests, but not allow the configure process to complete, and then have a
build failure when compiling.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2,1/4] package/spice: disable tests
  2019-11-18 21:47 ` [Buildroot] [PATCH v2,1/4] package/spice: disable tests Thomas Petazzoni
@ 2019-11-19  7:47   ` Fabrice Fontaine
  2019-11-19  8:15     ` Thomas Petazzoni
  0 siblings, 1 reply; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-19  7:47 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Le lun. 18 nov. 2019 ? 22:47, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
>
> On Sun, 17 Nov 2019 17:44:49 +0100
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > By disabling tests, we'll remove the optional gdk-pixbuf dependency
> >
> > Fixes:
> >  - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> > Changes v1 -> v2 (after review of Yann E. Morin):
> >  - Disable tests instead of adding and fixing gdk-pixbuf optional
> >    dependency
>
> I've applied to next. However, your patch to upstream is not really
> complete, or at least an additional patch is needed: when tests are
> enabled, their configure.ac script should check if gdk-pixbuf is
> available. And if it's not available, it should bail out, or disable
> tests, but not allow the configure process to complete, and then have a
> build failure when compiling.
You applied only the first patch of the serie and you applied it on
next even if it fixes a build failure on master. Was it intentional?
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2,1/4] package/spice: disable tests
  2019-11-19  7:47   ` Fabrice Fontaine
@ 2019-11-19  8:15     ` Thomas Petazzoni
  0 siblings, 0 replies; 20+ messages in thread
From: Thomas Petazzoni @ 2019-11-19  8:15 UTC (permalink / raw)
  To: buildroot

On Tue, 19 Nov 2019 08:47:52 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> > I've applied to next. However, your patch to upstream is not really
> > complete, or at least an additional patch is needed: when tests are
> > enabled, their configure.ac script should check if gdk-pixbuf is
> > available. And if it's not available, it should bail out, or disable
> > tests, but not allow the configure process to complete, and then have a
> > build failure when compiling.  
> You applied only the first patch of the serie

Yes, I didn't get around to applying the rest of the series.

> and you applied it on next even if it fixes a build failure on master. Was it intentional?

I was not sure if it was a build failure on master, and the autobuilder
failure linked in the commit log
(http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd)
happened on the next branch. I'll cherry-pick on master.

In such cases (i.e autobuilder failures happening on next, but issue
also present in master), it's always good to be explicit in the patch,
by adding a small note like this:

"""
balblabla

Signed-off-by: John Doe <john.doe@foobar.org>
---
The autobuilder failure linked in the commit log was for next, but the
problem also exists on master.
"""

This would really help.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2,1/4] package/spice: disable tests
  2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
                   ` (3 preceding siblings ...)
  2019-11-18 21:47 ` [Buildroot] [PATCH v2,1/4] package/spice: disable tests Thomas Petazzoni
@ 2019-11-22 22:14 ` Peter Korsgaard
  4 siblings, 0 replies; 20+ messages in thread
From: Peter Korsgaard @ 2019-11-22 22:14 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > By disabling tests, we'll remove the optional gdk-pixbuf dependency
 > Fixes:
 >  - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Yann E. Morin):
 >  - Disable tests instead of adding and fixing gdk-pixbuf optional
 >    dependency

Committed to 2019.02.x and 2019.08.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0 Fabrice Fontaine
@ 2019-11-23 13:33   ` Peter Korsgaard
  2019-12-03  9:49   ` Peter Korsgaard
  1 sibling, 0 replies; 20+ messages in thread
From: Peter Korsgaard @ 2019-11-23 13:33 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - This bump is needed for spice 0.14.2
 > - Add license hash

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2 Fabrice Fontaine
@ 2019-11-23 13:33   ` Peter Korsgaard
  2019-12-03  9:49   ` Peter Korsgaard
  1 sibling, 0 replies; 20+ messages in thread
From: Peter Korsgaard @ 2019-11-23 13:33 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - Fix CVE-2019-3813: fix off-by-one error in group/slot boundary check
 > - Add license hash

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 2/4] package/celt051: needs dynamic library
  2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
@ 2019-11-23 13:38   ` Peter Korsgaard
  2019-11-23 16:05     ` Fabrice Fontaine
  0 siblings, 1 reply; 20+ messages in thread
From: Peter Korsgaard @ 2019-11-23 13:38 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > celt051 can't be built statically with opus as opus embeds its own celt
 > version. So add a dynamic library dependency to celt051 (and not to
 > opus, as celt051 is only used optionally by spice whereas opus is
 > selected by 9 packages)

 > This will fix static build of spice with opus and celt:

 > /home/fabrice/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/7.4.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/fabrice/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libopus.a(vq.o): in function `renormalise_vector':
 > vq.c:(.text+0x5ee): multiple definition of `renormalise_vector'; /home/fabrice/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libcelt051.a(vq.o):vq.c:(.text+0x6e6): first defined here

 > Fixes:
 >  - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd

So this is only really an issue for spice, if spice is built statically
and both celt051 and opus are enabled?

If so, then I would prefer to handle it in spice.mk instead,
E.G. blacklist the celt51 + opus + static combination with a sensible
comment, something like:

ifeq ($(BR2_PACKAGE_CELT051),y)

# opus embeds a copy of celt, causing multiple definitions of a number
# of symbols when linked statically together with celt051, so disable
# celt051 support for that combination
ifeq ($(BR2_PACKAGE_OPUS)$(BR2_STATIC_LIBS),yy)
SPICE_CONF_OPTS += --disable-celt051
else
SPICE_CONF_OPTS += --enable-celt051
SPICE_DEPENDENCIES += celt051
endif

else
SPICE_CONF_OPTS += --disable-celt051
endif

Care to send a patch doing something like that? Thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 2/4] package/celt051: needs dynamic library
  2019-11-23 13:38   ` [Buildroot] [PATCH v2, 2/4] " Peter Korsgaard
@ 2019-11-23 16:05     ` Fabrice Fontaine
  2020-01-23 22:23       ` Arnout Vandecappelle
  0 siblings, 1 reply; 20+ messages in thread
From: Fabrice Fontaine @ 2019-11-23 16:05 UTC (permalink / raw)
  To: buildroot

Dear Peter,

Le sam. 23 nov. 2019 ? 14:38, Peter Korsgaard <peter@korsgaard.com> a ?crit :
>
> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
>
>  > celt051 can't be built statically with opus as opus embeds its own celt
>  > version. So add a dynamic library dependency to celt051 (and not to
>  > opus, as celt051 is only used optionally by spice whereas opus is
>  > selected by 9 packages)
>
>  > This will fix static build of spice with opus and celt:
>
>  > /home/fabrice/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/7.4.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/fabrice/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libopus.a(vq.o): in function `renormalise_vector':
>  > vq.c:(.text+0x5ee): multiple definition of `renormalise_vector'; /home/fabrice/buildroot/output/host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libcelt051.a(vq.o):vq.c:(.text+0x6e6): first defined here
>
>  > Fixes:
>  >  - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd
>
> So this is only really an issue for spice, if spice is built statically
> and both celt051 and opus are enabled?
>
> If so, then I would prefer to handle it in spice.mk instead,
> E.G. blacklist the celt51 + opus + static combination with a sensible
> comment, something like:
>
> ifeq ($(BR2_PACKAGE_CELT051),y)
>
> # opus embeds a copy of celt, causing multiple definitions of a number
> # of symbols when linked statically together with celt051, so disable
> # celt051 support for that combination
> ifeq ($(BR2_PACKAGE_OPUS)$(BR2_STATIC_LIBS),yy)
> SPICE_CONF_OPTS += --disable-celt051
> else
> SPICE_CONF_OPTS += --enable-celt051
> SPICE_DEPENDENCIES += celt051
> endif
>
> else
> SPICE_CONF_OPTS += --disable-celt051
> endif
>
> Care to send a patch doing something like that? Thanks.
An other option would be to remove celt051 package indeed the root
cause of this static build failure is that celt has been merged into
the IETF Opus codec and is now obsolete (see http://celt-codec.org/).
>
> --
> Bye, Peter Korsgaard
Best Regards,

Fabrice

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0 Fabrice Fontaine
  2019-11-23 13:33   ` Peter Korsgaard
@ 2019-12-03  9:49   ` Peter Korsgaard
  2019-12-03 10:08     ` Baruch Siach
  1 sibling, 1 reply; 20+ messages in thread
From: Peter Korsgaard @ 2019-12-03  9:49 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - This bump is needed for spice 0.14.2
 > - Add license hash

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x and 2019.08.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2
  2019-11-17 16:44 ` [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2 Fabrice Fontaine
  2019-11-23 13:33   ` Peter Korsgaard
@ 2019-12-03  9:49   ` Peter Korsgaard
  1 sibling, 0 replies; 20+ messages in thread
From: Peter Korsgaard @ 2019-12-03  9:49 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > - Fix CVE-2019-3813: fix off-by-one error in group/slot boundary check
 > - Add license hash

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x and 2019.08.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0
  2019-12-03  9:49   ` Peter Korsgaard
@ 2019-12-03 10:08     ` Baruch Siach
  2019-12-03 12:15       ` Peter Korsgaard
  0 siblings, 1 reply; 20+ messages in thread
From: Baruch Siach @ 2019-12-03 10:08 UTC (permalink / raw)
  To: buildroot

Hi Peter,

On Tue, Dec 03, 2019 at 10:49:36AM +0100, Peter Korsgaard wrote:
> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> 
>  > - This bump is needed for spice 0.14.2
>  > - Add license hash
> 
>  > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> 
> Committed to 2019.02.x and 2019.08.x, thanks.

Not in 2019.02.x as of commit 7de477493571b9. This breaks spice, I presume.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0
  2019-12-03 10:08     ` Baruch Siach
@ 2019-12-03 12:15       ` Peter Korsgaard
  0 siblings, 0 replies; 20+ messages in thread
From: Peter Korsgaard @ 2019-12-03 12:15 UTC (permalink / raw)
  To: buildroot

>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Hi Peter,
 > On Tue, Dec 03, 2019 at 10:49:36AM +0100, Peter Korsgaard wrote:
 >> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
 >> 
 >> > - This bump is needed for spice 0.14.2
 >> > - Add license hash
 >> 
 >> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 >> 
 >> Committed to 2019.02.x and 2019.08.x, thanks.

 > Not in 2019.02.x as of commit 7de477493571b9. This breaks spice, I presume.

Ups, indeed not - Fixed now, thanks!

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 2/4] package/celt051: needs dynamic library
  2019-11-23 16:05     ` Fabrice Fontaine
@ 2020-01-23 22:23       ` Arnout Vandecappelle
  2020-01-24 18:14         ` Yann E. MORIN
  0 siblings, 1 reply; 20+ messages in thread
From: Arnout Vandecappelle @ 2020-01-23 22:23 UTC (permalink / raw)
  To: buildroot



On 23/11/2019 17:05, Fabrice Fontaine wrote:
> Dear Peter,
> 
> Le sam. 23 nov. 2019 ? 14:38, Peter Korsgaard <peter@korsgaard.com> a ?crit :
>>
>>>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
>>
>>  > celt051 can't be built statically with opus as opus embeds its own celt
>>  > version. So add a dynamic library dependency to celt051 (and not to
>>  > opus, as celt051 is only used optionally by spice whereas opus is
>>  > selected by 9 packages)
[snip]
>> Care to send a patch doing something like that? Thanks.
> An other option would be to remove celt051 package indeed the root
> cause of this static build failure is that celt has been merged into
> the IETF Opus codec and is now obsolete (see http://celt-codec.org/).

 Indeed, that makes more sense. Care to remove it? Legacy handling should select
BR2_PACKAGE_OPUS then (with appropriate explanation).

 Yann is developer for celt051, so please give a peep if it can't be removed.

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 2/4] package/celt051: needs dynamic library
  2020-01-23 22:23       ` Arnout Vandecappelle
@ 2020-01-24 18:14         ` Yann E. MORIN
  2020-01-27 16:22           ` Arnout Vandecappelle
  0 siblings, 1 reply; 20+ messages in thread
From: Yann E. MORIN @ 2020-01-24 18:14 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2020-01-23 23:23 +0100, Arnout Vandecappelle spake thusly:
> On 23/11/2019 17:05, Fabrice Fontaine wrote:
> > Dear Peter,
> > 
> > Le sam. 23 nov. 2019 ? 14:38, Peter Korsgaard <peter@korsgaard.com> a ?crit :
> >>
> >>>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> >>
> >>  > celt051 can't be built statically with opus as opus embeds its own celt
> >>  > version. So add a dynamic library dependency to celt051 (and not to
> >>  > opus, as celt051 is only used optionally by spice whereas opus is
> >>  > selected by 9 packages)
> [snip]
> >> Care to send a patch doing something like that? Thanks.
> > An other option would be to remove celt051 package indeed the root
> > cause of this static build failure is that celt has been merged into
> > the IETF Opus codec and is now obsolete (see http://celt-codec.org/).
> 
>  Indeed, that makes more sense. Care to remove it? Legacy handling should select
> BR2_PACKAGE_OPUS then (with appropriate explanation).
> 
>  Yann is developer for celt051, so please give a peep if it can't be removed.

Well, celt-0.51 was introduced because at the time. spice on;y supported
that, and not the later versions, which is still documented in the
package itself.

But sicne then (7 years ago now), spice was updated, so maybe it can
support newer versions, and maybe it works with Opus instead.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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] 20+ messages in thread

* [Buildroot] [PATCH v2, 2/4] package/celt051: needs dynamic library
  2020-01-24 18:14         ` Yann E. MORIN
@ 2020-01-27 16:22           ` Arnout Vandecappelle
  2020-01-27 16:25             ` Fabrice Fontaine
  0 siblings, 1 reply; 20+ messages in thread
From: Arnout Vandecappelle @ 2020-01-27 16:22 UTC (permalink / raw)
  To: buildroot



On 24/01/2020 19:14, Yann E. MORIN wrote:
> Arnout, All,
> 
> On 2020-01-23 23:23 +0100, Arnout Vandecappelle spake thusly:
>> On 23/11/2019 17:05, Fabrice Fontaine wrote:
>>> Dear Peter,
>>>
>>> Le sam. 23 nov. 2019 ? 14:38, Peter Korsgaard <peter@korsgaard.com> a ?crit :
>>>>
>>>>>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
>>>>
>>>>  > celt051 can't be built statically with opus as opus embeds its own celt
>>>>  > version. So add a dynamic library dependency to celt051 (and not to
>>>>  > opus, as celt051 is only used optionally by spice whereas opus is
>>>>  > selected by 9 packages)
>> [snip]
>>>> Care to send a patch doing something like that? Thanks.
>>> An other option would be to remove celt051 package indeed the root
>>> cause of this static build failure is that celt has been merged into
>>> the IETF Opus codec and is now obsolete (see http://celt-codec.org/).
>>
>>  Indeed, that makes more sense. Care to remove it? Legacy handling should select
>> BR2_PACKAGE_OPUS then (with appropriate explanation).
>>
>>  Yann is developer for celt051, so please give a peep if it can't be removed.
> 
> Well, celt-0.51 was introduced because at the time. spice on;y supported
> that, and not the later versions, which is still documented in the
> package itself.
> 
> But sicne then (7 years ago now), spice was updated, so maybe it can
> support newer versions, and maybe it works with Opus instead.

 Opus support in spice has already been added with the bump to 0.14.1 in
f33f7a4f6407f.

 So if someone could remove celt051 please :-)

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 20+ messages in thread

* [Buildroot] [PATCH v2, 2/4] package/celt051: needs dynamic library
  2020-01-27 16:22           ` Arnout Vandecappelle
@ 2020-01-27 16:25             ` Fabrice Fontaine
  0 siblings, 0 replies; 20+ messages in thread
From: Fabrice Fontaine @ 2020-01-27 16:25 UTC (permalink / raw)
  To: buildroot

Hi Arnout,

Le lun. 27 janv. 2020 ? 17:22, Arnout Vandecappelle <arnout@mind.be> a ?crit :
>
>
>
> On 24/01/2020 19:14, Yann E. MORIN wrote:
> > Arnout, All,
> >
> > On 2020-01-23 23:23 +0100, Arnout Vandecappelle spake thusly:
> >> On 23/11/2019 17:05, Fabrice Fontaine wrote:
> >>> Dear Peter,
> >>>
> >>> Le sam. 23 nov. 2019 ? 14:38, Peter Korsgaard <peter@korsgaard.com> a ?crit :
> >>>>
> >>>>>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> >>>>
> >>>>  > celt051 can't be built statically with opus as opus embeds its own celt
> >>>>  > version. So add a dynamic library dependency to celt051 (and not to
> >>>>  > opus, as celt051 is only used optionally by spice whereas opus is
> >>>>  > selected by 9 packages)
> >> [snip]
> >>>> Care to send a patch doing something like that? Thanks.
> >>> An other option would be to remove celt051 package indeed the root
> >>> cause of this static build failure is that celt has been merged into
> >>> the IETF Opus codec and is now obsolete (see http://celt-codec.org/).
> >>
> >>  Indeed, that makes more sense. Care to remove it? Legacy handling should select
> >> BR2_PACKAGE_OPUS then (with appropriate explanation).
> >>
> >>  Yann is developer for celt051, so please give a peep if it can't be removed.
> >
> > Well, celt-0.51 was introduced because at the time. spice on;y supported
> > that, and not the later versions, which is still documented in the
> > package itself.
> >
> > But sicne then (7 years ago now), spice was updated, so maybe it can
> > support newer versions, and maybe it works with Opus instead.
>
>  Opus support in spice has already been added with the bump to 0.14.1 in
> f33f7a4f6407f.
>
>  So if someone could remove celt051 please :-)
It's done since 29 hours and commit b32efbdb0354557db48852478b99080705ba315b ;-)
>
>  Regards,
>  Arnout
>
Regards,

Fabrice

^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2020-01-27 16:25 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-17 16:44 [Buildroot] [PATCH v2,1/4] package/spice: disable tests Fabrice Fontaine
2019-11-17 16:44 ` [Buildroot] [PATCH v2,2/4] package/celt051: needs dynamic library Fabrice Fontaine
2019-11-23 13:38   ` [Buildroot] [PATCH v2, 2/4] " Peter Korsgaard
2019-11-23 16:05     ` Fabrice Fontaine
2020-01-23 22:23       ` Arnout Vandecappelle
2020-01-24 18:14         ` Yann E. MORIN
2020-01-27 16:22           ` Arnout Vandecappelle
2020-01-27 16:25             ` Fabrice Fontaine
2019-11-17 16:44 ` [Buildroot] [PATCH v2, 3/4] package/spice-protocol: bump to version 0.14.0 Fabrice Fontaine
2019-11-23 13:33   ` Peter Korsgaard
2019-12-03  9:49   ` Peter Korsgaard
2019-12-03 10:08     ` Baruch Siach
2019-12-03 12:15       ` Peter Korsgaard
2019-11-17 16:44 ` [Buildroot] [PATCH v2, 4/4] package/spice: security bump to version 0.14.2 Fabrice Fontaine
2019-11-23 13:33   ` Peter Korsgaard
2019-12-03  9:49   ` Peter Korsgaard
2019-11-18 21:47 ` [Buildroot] [PATCH v2,1/4] package/spice: disable tests Thomas Petazzoni
2019-11-19  7:47   ` Fabrice Fontaine
2019-11-19  8:15     ` Thomas Petazzoni
2019-11-22 22:14 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.