* [Buildroot] [PATCH] libmpdclient: bump to version 2.14
@ 2018-03-07 22:52 Jörg Krause
2018-03-08 8:04 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Jörg Krause @ 2018-03-07 22:52 UTC (permalink / raw)
To: buildroot
Since version 2.13 libmpdclient only supports the meson build.
Therefore, adapt to package infrastructure according to the user manual.
Also add a hash for the license file.
Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
---
package/libmpdclient/libmpdclient.hash | 5 +++--
package/libmpdclient/libmpdclient.mk | 32 +++++++++++++++++++++++++++++---
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash
index 2fd20a41fb..eb32786419 100644
--- a/package/libmpdclient/libmpdclient.hash
+++ b/package/libmpdclient/libmpdclient.hash
@@ -1,2 +1,3 @@
-# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig, sha256 locally computed
-sha256 4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 libmpdclient-2.10.tar.xz
+# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.14.tar.xz.sig, sha256 locally computed
+sha256 0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372 libmpdclient-2.14.tar.xz
+sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING
diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk
index 691aba9f71..5574bde948 100644
--- a/package/libmpdclient/libmpdclient.mk
+++ b/package/libmpdclient/libmpdclient.mk
@@ -5,12 +5,38 @@
################################################################################
LIBMPDCLIENT_VERSION_MAJOR = 2
-LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).10
+LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).14
LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz
LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR)
-LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
LIBMPDCLIENT_INSTALL_STAGING = YES
LIBMPDCLIENT_LICENSE = BSD-3-Clause
LIBMPDCLIENT_LICENSE_FILES = COPYING
-$(eval $(autotools-package))
+LIBMPDCLIENT_CONF_OPTS += \
+ --prefix=/usr \
+ --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
+ --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf
+
+LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v)
+
+define LIBMPDCLIENT_CONFIGURE_CMDS
+ rm -rf $(@D)/build
+ mkdir -p $(@D)/build
+ $(TARGET_MAKE_ENV) meson $(LIBMPDCLIENT_CONF_OPTS) $(@D) $(@D)/build
+endef
+
+define LIBMPDCLIENT_BUILD_CMDS
+ $(TARGET_MAKE_ENV) ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build
+endef
+
+define LIBMPDCLIENT_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) \
+ ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install
+endef
+
+define LIBMPDCLIENT_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) \
+ ninja $(LIBMPDCLIENT_NINJA_OPTS) -C $(@D)/build install
+endef
+
+$(eval $(generic-package))
--
2.16.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] libmpdclient: bump to version 2.14
2018-03-07 22:52 [Buildroot] [PATCH] libmpdclient: bump to version 2.14 Jörg Krause
@ 2018-03-08 8:04 ` Peter Korsgaard
2018-03-08 8:07 ` Jörg Krause
0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2018-03-08 8:04 UTC (permalink / raw)
To: buildroot
>>>>> "J?rg" == J?rg Krause <joerg.krause@embedded.rocks> writes:
> Since version 2.13 libmpdclient only supports the meson build.
> Therefore, adapt to package infrastructure according to the user manual.
> Also add a hash for the license file.
> Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
> ---
> package/libmpdclient/libmpdclient.hash | 5 +++--
> package/libmpdclient/libmpdclient.mk | 32 +++++++++++++++++++++++++++++---
> 2 files changed, 32 insertions(+), 5 deletions(-)
> diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash
> index 2fd20a41fb..eb32786419 100644
> --- a/package/libmpdclient/libmpdclient.hash
> +++ b/package/libmpdclient/libmpdclient.hash
> @@ -1,2 +1,3 @@
> -# Verified against
> http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig,
> sha256 locally computed
> -sha256 4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 libmpdclient-2.10.tar.xz
> +# Verified against
> http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.14.tar.xz.sig,
> sha256 locally computed
> +sha256 0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372 libmpdclient-2.14.tar.xz
> +sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING
> diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk
> index 691aba9f71..5574bde948 100644
> --- a/package/libmpdclient/libmpdclient.mk
> +++ b/package/libmpdclient/libmpdclient.mk
> @@ -5,12 +5,38 @@
> ################################################################################
> LIBMPDCLIENT_VERSION_MAJOR = 2
> -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).10
> +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).14
> LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz
> LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR)
> -LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
> LIBMPDCLIENT_INSTALL_STAGING = YES
> LIBMPDCLIENT_LICENSE = BSD-3-Clause
> LIBMPDCLIENT_LICENSE_FILES = COPYING
> -$(eval $(autotools-package))
> +LIBMPDCLIENT_CONF_OPTS += \
> + --prefix=/usr \
> + --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
> + --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf
> +
> +LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v)
I see that systemd also passes -j$(PARALLEL_JOBS). Any specific reason
why you don't? If not, please send a followup patch to add it.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] libmpdclient: bump to version 2.14
2018-03-08 8:04 ` Peter Korsgaard
@ 2018-03-08 8:07 ` Jörg Krause
0 siblings, 0 replies; 3+ messages in thread
From: Jörg Krause @ 2018-03-08 8:07 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Thu, 2018-03-08 at 09:04 +0100, Peter Korsgaard wrote:
> > > > > > "J?rg" == J?rg Krause <joerg.krause@embedded.rocks> writes:
>
> > Since version 2.13 libmpdclient only supports the meson build.
> > Therefore, adapt to package infrastructure according to the user manual.
>
> > Also add a hash for the license file.
>
> > Signed-off-by: J?rg Krause <joerg.krause@embedded.rocks>
> > ---
> > package/libmpdclient/libmpdclient.hash | 5 +++--
> > package/libmpdclient/libmpdclient.mk | 32 +++++++++++++++++++++++++++++---
> > 2 files changed, 32 insertions(+), 5 deletions(-)
>
> > diff --git a/package/libmpdclient/libmpdclient.hash b/package/libmpdclient/libmpdclient.hash
> > index 2fd20a41fb..eb32786419 100644
> > --- a/package/libmpdclient/libmpdclient.hash
> > +++ b/package/libmpdclient/libmpdclient.hash
> > @@ -1,2 +1,3 @@
> > -# Verified against
> > http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig,
> > sha256 locally computed
> > -sha256 4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 libmpdclient-2.10.tar.xz
> > +# Verified against
> > http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.14.tar.xz.sig,
> > sha256 locally computed
> > +sha256 0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372 libmpdclient-2.14.tar.xz
> > +sha256 9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32 COPYING
> > diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk
> > index 691aba9f71..5574bde948 100644
> > --- a/package/libmpdclient/libmpdclient.mk
> > +++ b/package/libmpdclient/libmpdclient.mk
> > @@ -5,12 +5,38 @@
> > ################################################################################
>
> > LIBMPDCLIENT_VERSION_MAJOR = 2
> > -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).10
> > +LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).14
> > LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz
> > LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR)
> > -LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
> > LIBMPDCLIENT_INSTALL_STAGING = YES
> > LIBMPDCLIENT_LICENSE = BSD-3-Clause
> > LIBMPDCLIENT_LICENSE_FILES = COPYING
>
> > -$(eval $(autotools-package))
> > +LIBMPDCLIENT_CONF_OPTS += \
> > + --prefix=/usr \
> > + --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
> > + --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf
> > +
> > +LIBMPDCLIENT_NINJA_OPTS = $(if $(VERBOSE),-v)
>
> I see that systemd also passes -j$(PARALLEL_JOBS). Any specific reason
> why you don't?
No specific reason. I just follow the user manual, which does not
mention this option.
> If not, please send a followup patch to add it.
I'll do.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-08 8:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-07 22:52 [Buildroot] [PATCH] libmpdclient: bump to version 2.14 Jörg Krause
2018-03-08 8:04 ` Peter Korsgaard
2018-03-08 8:07 ` Jörg Krause
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox