package/spice: add optional gdk-pixbuf dependency
PATCH 1/5 package/spice: add optional gdk-pixbuf dependency
This dependency has been added in version 0.14.1 with
https://gitlab.freedesktop.org/spice/spice-common/commit/d58a5b6a5a25134396661e1d805dfc567181e3af
--- package/spice/spice.mk | 1 + 1 file changed, 1 insertion(+)
package/spice/spice.mk +1 -0
@@ -13,6 +13,7 @@ SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ jpeg \ + $(if $(BR2_PACKAGE_GDK_PIXBUF),gdk-pixbuf) \ libglib2 \ openssl \ pixman \
Signature · 1 line
2.23.0
PATCH 2/5 package/gdk-pixbuf: add gio to Requires.private
Fixes:
- http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd
--- ....0.pc.in-add-gio-to-Requires.private.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/gdk-pixbuf/0001-gdk-pixbuf-2.0.pc.in-add-gio-to-Requires.private.patch
package/gdk-pixbuf/0001-gdk-pixbuf-2.0.pc.in-add-gio-to-Requires.private.patch new file +32 -0
@@ -0,0 +1,32 @@ +From d7f003e47a1c4a531e30e0633c7f6d3b11ef6e2f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Thu, 14 Nov 2019 09:52:11 +0100 +Subject: [PATCH] gdk-pixbuf-2.0.pc.in: add gio to Requires.private + +Fix static linking with spice + +Fixes: + - http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: Not upstreamable (upstream switched to meson)] +--- + gdk-pixbuf-2.0.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in +index 7addefcbd..ff262bc68 100644 +--- a/gdk-pixbuf-2.0.pc.in ++++ b/gdk-pixbuf-2.0.pc.in +@@ -12,7 +12,7 @@ Name: GdkPixbuf + Description: Image loading and scaling + Version: @VERSION@ + Requires: gobject-2.0 +-Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ ++Requires.private: gmodule-no-export-2.0 gio-2.0 @PNG_DEP_CFLAGS_PACKAGES@ + Libs: -L${libdir} -lgdk_pixbuf- at GDK_PIXBUF_API_VERSION@ + Libs.private: @GDK_PIXBUF_EXTRA_LIBS@ + Cflags: -I${includedir}/gdk-pixbuf- at GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ +-- +2.23.0 +
Signature · 1 line
2.23.0
PATCH 2/5 package/gdk-pixbuf: add gio to Requires.private
Quoted 4 lines · On Thu, 14 Nov 2019 20:13:18 +0100 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cdSigned-off-by Fabrice Fontaine <[email protected]>
Since you sent a new version of the spice series, I marked this one as Superseded. Let me know if it still makes sense to have this patch or not.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/5 package/spice: needs dynamic library
In reply to Fabrice Fontainespice can optionally uses opus and celt051 which will result in a static build failure as opus embeds its own celt version.
So add a dynamic library dependency on spice as this is the only package using celt051 and because next version of spice will also fails to build statically because of
https://gitlab.freedesktop.org/spice/spice-common/commit/16aa8c98d89fdfc49b7aa58d60f1cd82c075cb1f
which redefines the X509_NAME_add_entry_by_txt openssl function
Fixes:
- http://autobuild.buildroot.org/results/96c786f85d35f33508e9c71778043d16b87f72cd
--- package/spice/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
package/spice/Config.in +4 -2
@@ -1,12 +1,14 @@ -comment "spice server needs a toolchain w/ wchar, threads" +comment "spice server needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS config BR2_PACKAGE_SPICE bool "spice server" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL
Signature · 1 line
2.23.0
PATCH 4/5 package/spice-protocol: bump to version 0.14.0
In reply to Fabrice Fontaine- This bump is needed for spice 0.14.2
- Add license hash
--- package/spice-protocol/spice-protocol.hash | 5 ++++- package/spice-protocol/spice-protocol.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
package/spice-protocol/spice-protocol.hash +4 -1
@@ -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
package/spice-protocol/spice-protocol.mk +1 -1
@@ -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
Signature · 1 line
2.23.0
PATCH 5/5 package/spice: security bump to version 0.14.2
In reply to Fabrice Fontaine- Fix CVE-2019-3813: fix off-by-one error in group/slot boundary check
- Add license hash
--- package/spice/spice.hash | 3 ++- package/spice/spice.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
package/spice/spice.hash +2 -1
@@ -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
package/spice/spice.mk +1 -1
@@ -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+
Signature · 1 line
2.23.0
PATCH 1/5 package/spice: add optional gdk-pixbuf dependency
In reply to Fabrice FontaineFabrice, All,
On 2019-11-14 20:13 +0100, Fabrice Fontaine spake thusly:
Quoted 13 lines
This dependency has been added in version 0.14.1 with
https://gitlab.freedesktop.org/spice/spice-common/commit/d58a5b6a5a25134396661e1d805dfc567181e3afSigned-off-by Fabrice Fontaine <[email protected]>--- package/spice/spice.mk | 1 + 1 file changed, 1 insertion(+)package/spice/spice.mk +0
-0
package/spice/spice.mk SPICE_INSTALL_STAGING = YES · line 16
Quoted 4 lines
package/spice/spice.mk +1
-0@@ -13,6 +13,7 @@ SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ jpeg \ + $(if $(BR2_PACKAGE_GDK_PIXBUF),gdk-pixbuf) \
I see you've gine for conciseness here. However, I think we want to handle this optional dependency like we handle the optional dependency on opus, lines 53..56.
Regards,
Yann E. MORIN.
Quoted 6 lines
package/spice/spice.mk +0
-0libglib2 \ openssl \ pixman \Signature · 1 line
2.23.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/5 package/spice: add optional gdk-pixbuf dependency
Hi Yann,
Le ven. 15 nov. 2019 ? 21:20, Yann E. MORIN <[email protected]> a ?crit :
Quoted 12 lines
Fabrice, All,
On 2019-11-14 20:13 +0100, Fabrice Fontaine spake thusly:
Quoted 8 lines
This dependency has been added in version 0.14.1 with
https://gitlab.freedesktop.org/spice/spice-common/commit/d58a5b6a5a25134396661e1d805dfc567181e3afSigned-off-by Fabrice Fontaine <[email protected]>--- package/spice/spice.mk | 1 + 1 file changed, 1 insertion(+)
Quoted 13 lines
package/spice/spice.mk SPICE_INSTALL_STAGING = YES · line 16
Quoted 9 lines
package/spice/spice.mk +1
-0@@ -13,6 +13,7 @@ SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ jpeg \ + $(if $(BR2_PACKAGE_GDK_PIXBUF),gdk-pixbuf) \I see you've gine for conciseness here. However, I think we want to handle this optional dependency like we handle the optional dependency on opus, lines 53..56.
OK, I can send a v2 with this change however I've also think about it and I can also send a v2 that disable tests in spice-common. This will avoid this gdk-pixbuf dependency as well as the dynamic library dependency (I'll move it to celt051). The only drawback is that I'll have to add a hook to call autoreconf in subprojects/spice-common. What do you think about this proposal?
Quoted 11 lines
Regards,
Yann E. MORIN.Quoted 6 lines
package/spice/spice.mk +0
-1libglib2 \ openssl \ pixman \ --2.23.0
Quoted 7 lines
--
.-----------------.--------------------.------------------.--------------------.| 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. |'------------------------------^-------^------------------^--------------------'
Best Regards,
Fabrice
PATCH 1/5 package/spice: add optional gdk-pixbuf dependency
Quoted 28 lines · Fabrice Fontaine
Hi Yann,
Le ven. 15 nov. 2019 ? 21:20, Yann E. MORIN <[email protected]> a ?crit :
Quoted 12 lines
Fabrice, All,
On 2019-11-14 20:13 +0100, Fabrice Fontaine spake thusly:
Quoted 8 lines
This dependency has been added in version 0.14.1 with
https://gitlab.freedesktop.org/spice/spice-common/commit/d58a5b6a5a25134396661e1d805dfc567181e3afSigned-off-by Fabrice Fontaine <[email protected]>--- package/spice/spice.mk | 1 + 1 file changed, 1 insertion(+)Quoted 13 lines
package/spice/spice.mk SPICE_INSTALL_STAGING = YES · line 16
Quoted 9 lines
package/spice/spice.mk +1
-0@@ -13,6 +13,7 @@ SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ jpeg \ + $(if $(BR2_PACKAGE_GDK_PIXBUF),gdk-pixbuf) \I see you've gine for conciseness here. However, I think we want to handle this optional dependency like we handle the optional dependency on opus, lines 53..56.
Quoted 2 lines
OK, I can send a v2 with this change however I've also think about it and I can also send a v2 that disable tests in spice-common.
Disabling tests is clearly better, even without the considerations below.
Quoted 4 lines
This will
avoid this gdk-pixbuf dependency as well as the dynamic library dependency (I'll move it to celt051). The only drawback is that I'll have to add a hook to call autoreconf in subprojects/spice-common.
Why? A toplevel AUTORECONF=YES seems to work fine.
Regards,
Arnout
Quoted 27 lines
What do you think about this proposal?
Quoted 11 lines
Regards,
Yann E. MORIN.Quoted 6 lines
package/spice/spice.mk +0
-1libglib2 \ openssl \ pixman \ --2.23.0
Quoted 7 lines
--
.-----------------.--------------------.------------------.--------------------.| 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. |'------------------------------^-------^------------------^--------------------'
Best Regards,
Fabrice
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot