All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2,1/2] package/serd: bump to version 0.30.14
@ 2022-08-08 21:56 Fabrice Fontaine
  2022-08-08 21:56 ` [Buildroot] [PATCH v2,2/2] package/sord: bump to version 0.16.12 Fabrice Fontaine
  2022-08-24 11:34 ` [Buildroot] [PATCH v2, 1/2] package/serd: bump to version 0.30.14 Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-08-08 21:56 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan, James Hilliard, Fabrice Fontaine

- Switch to meson-package
- Update hash of COPYING (update in year:
  https://github.com/drobilla/serd/commit/0e7053de7086423484e5a8f2c0db76efba4ed257)

https://github.com/drobilla/serd/blob/v0.30.14/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
 - Always set static to false

 package/serd/serd.hash |  6 +++---
 package/serd/serd.mk   | 12 ++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/package/serd/serd.hash b/package/serd/serd.hash
index d64a2aa271..c8a45a0831 100644
--- a/package/serd/serd.hash
+++ b/package/serd/serd.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking signature
-# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig
-sha256  affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf  serd-0.30.10.tar.bz2
-sha256  e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0  COPYING
+# http://download.drobilla.net/serd-0.30.14.tar.xz.sig
+sha256  a14137d47b11d6ad431e78da341ca9737998d9eaccf6a49263d4c8d79fd856e3  serd-0.30.14.tar.xz
+sha256  13b62d3705cabee6a21730eb24f773249271c2d95e9ecbab16069e729d4ae147  COPYING
diff --git a/package/serd/serd.mk b/package/serd/serd.mk
index 85b16f6866..7922e777c8 100644
--- a/package/serd/serd.mk
+++ b/package/serd/serd.mk
@@ -4,17 +4,13 @@
 #
 ################################################################################
 
-SERD_VERSION = 0.30.10
+SERD_VERSION = 0.30.14
 SERD_SITE = https://download.drobilla.net
-SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2
+SERD_SOURCE = serd-$(SERD_VERSION).tar.xz
 SERD_LICENSE = ISC
 SERD_LICENSE_FILES = COPYING
 SERD_INSTALL_STAGING = YES
 
-SERD_CONF_OPTS += --largefile --no-coverage
+SERD_CONF_OPTS += -Ddocs=disabled -Dstatic=false -Dtests=disabled
 
-ifeq ($(BR2_STATIC_LIBS),y)
-SERD_CONF_OPTS += --static --no-shared --static-progs
-endif
-
-$(eval $(waf-package))
+$(eval $(meson-package))
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* [Buildroot] [PATCH v2,2/2] package/sord: bump to version 0.16.12
  2022-08-08 21:56 [Buildroot] [PATCH v2,1/2] package/serd: bump to version 0.30.14 Fabrice Fontaine
@ 2022-08-08 21:56 ` Fabrice Fontaine
  2022-08-24 11:34 ` [Buildroot] [PATCH v2, 1/2] package/serd: bump to version 0.30.14 Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-08-08 21:56 UTC (permalink / raw)
  To: buildroot; +Cc: Eric Le Bihan, James Hilliard, Fabrice Fontaine

Switch to meson-package and so drop patch

https://github.com/drobilla/sord/blob/v0.16.12/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-wscript-add-no-threads-option.patch  | 59 -------------------
 package/sord/sord.hash                        |  4 +-
 package/sord/sord.mk                          | 16 ++---
 3 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 package/sord/0001-wscript-add-no-threads-option.patch

diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch
deleted file mode 100644
index 750ea8f4ad..0000000000
--- a/package/sord/0001-wscript-add-no-threads-option.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 22 Feb 2022 21:22:31 +0100
-Subject: [PATCH] wscript: add -no-threads option
-
-Add -no-threads options to avoid the following build failure on embedded
-toolchains without threads support:
-
-/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread
-
-Fixes:
- - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/drobilla/sord/pull/3]
----
- wscript | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index fd8578e..d71d78c 100644
---- a/wscript
-+++ b/wscript
-@@ -35,6 +35,7 @@ def options(ctx):
-         {'no-utils':     'do not build command line utilities',
-          'static':       'build static library',
-          'no-shared':    'do not build shared library',
-+         'no-threads':   'disable threads',
-          'static-progs': 'build programs as static binaries'})
- 
-     opt.add_option('--dump', type='string', default='', dest='dump',
-@@ -55,6 +56,7 @@ def configure(conf):
- 
-     conf.env.BUILD_UTILS  = not Options.options.no_utils
-     conf.env.BUILD_SHARED = not Options.options.no_shared
-+    conf.env.ENABLE_THREADS = not Options.options.no_threads
-     conf.env.STATIC_PROGS = Options.options.static_progs
-     conf.env.BUILD_STATIC = (Options.options.static or
-                              Options.options.static_progs)
-@@ -124,7 +126,7 @@ def configure(conf):
-     conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD')
-     conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False)
- 
--    if conf.env.HAVE_PCRE:
-+    if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS:
-         if conf.check(cflags=['-pthread'], mandatory=False):
-             conf.env.PTHREAD_CFLAGS    = ['-pthread']
-             if conf.env.CC_NAME != 'clang':
-@@ -160,6 +162,7 @@ def configure(conf):
-         conf,
-         {'Static library': bool(conf.env.BUILD_STATIC),
-          'Shared library': bool(conf.env.BUILD_SHARED),
-+         'Threads':        bool(conf.env.ENABLE_THREADS),
-          'Utilities':      bool(conf.env.BUILD_UTILS),
-          'Unit tests':     bool(conf.env.BUILD_TESTS),
-          'Debug dumping':  dump})
--- 
-2.34.1
-
diff --git a/package/sord/sord.hash b/package/sord/sord.hash
index af175f91f0..ec5c88a43c 100644
--- a/package/sord/sord.hash
+++ b/package/sord/sord.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking signature
-# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc
-sha256  7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14  sord-0.16.8.tar.bz2
+# https://download.drobilla.net/sord-0.16.12.tar.xz.sig
+sha256  fde269893cb24b2ab7b75708d7a349c6e760c47a0d967aeca5b1c651294ff9f2  sord-0.16.12.tar.xz
 sha256  e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0  COPYING
diff --git a/package/sord/sord.mk b/package/sord/sord.mk
index c06ef9c55c..9fcf98858a 100644
--- a/package/sord/sord.mk
+++ b/package/sord/sord.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SORD_VERSION = 0.16.8
+SORD_VERSION = 0.16.12
 SORD_SITE = https://download.drobilla.net
-SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2
+SORD_SOURCE = sord-$(SORD_VERSION).tar.xz
 SORD_LICENSE = ISC
 SORD_LICENSE_FILES = COPYING
 SORD_DEPENDENCIES = host-pkgconf serd
@@ -16,14 +16,6 @@ ifeq ($(BR2_PACKAGE_PCRE),y)
 SORD_DEPENDENCIES += pcre
 endif
 
-SORD_CONF_OPTS += --no-coverage
+SORD_CONF_OPTS += -Ddocs=disabled -Dtests=disabled
 
-ifeq ($(BR2_STATIC_LIBS),y)
-SORD_CONF_OPTS += --static --no-shared --static-progs
-endif
-
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
-SORD_CONF_OPTS += --no-threads
-endif
-
-$(eval $(waf-package))
+$(eval $(meson-package))
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

* Re: [Buildroot] [PATCH v2, 1/2] package/serd: bump to version 0.30.14
  2022-08-08 21:56 [Buildroot] [PATCH v2,1/2] package/serd: bump to version 0.30.14 Fabrice Fontaine
  2022-08-08 21:56 ` [Buildroot] [PATCH v2,2/2] package/sord: bump to version 0.16.12 Fabrice Fontaine
@ 2022-08-24 11:34 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-24 11:34 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Eric Le Bihan, James Hilliard, buildroot

On Mon,  8 Aug 2022 23:56:11 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> - Switch to meson-package
> - Update hash of COPYING (update in year:
>   https://github.com/drobilla/serd/commit/0e7053de7086423484e5a8f2c0db76efba4ed257)
> 
> https://github.com/drobilla/serd/blob/v0.30.14/NEWS
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
>  - Always set static to false

Both applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

end of thread, other threads:[~2022-08-24 11:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-08 21:56 [Buildroot] [PATCH v2,1/2] package/serd: bump to version 0.30.14 Fabrice Fontaine
2022-08-08 21:56 ` [Buildroot] [PATCH v2,2/2] package/sord: bump to version 0.16.12 Fabrice Fontaine
2022-08-24 11:34 ` [Buildroot] [PATCH v2, 1/2] package/serd: bump to version 0.30.14 Thomas Petazzoni via buildroot

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.