libmpdclient: bump to version 2.14

PATCH New Jörg Krause 2 participants 3 messages Mar 7, 2018 – Mar 8, 2018

Share & tools

Jörg Krause

author

2018-03-07 22:52 UTC #0 lore raw

PATCH 1/1 libmpdclient: bump to version 2.14

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 <[email protected]>

---
 package/libmpdclient/libmpdclient.hash |  5 +++--
 package/libmpdclient/libmpdclient.mk   | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

package/libmpdclient/libmpdclient.hash +3 -2

index 2fd20a41fb..eb32786419 100644
@@ -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

package/libmpdclient/libmpdclient.mk +29 -3

index 691aba9f71..5574bde948 100644
@@ -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))

Signature · 1 line

2.16.2

Peter Korsgaard

2018-03-08 08:04 UTC #1 lore raw

PATCH 1/1 libmpdclient: bump to version 2.14

Quoted 41 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?rg" == J?rg Krause <[email protected]> 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 <[email protected]>
---
 package/libmpdclient/libmpdclient.hash |  5 +++--
 package/libmpdclient/libmpdclient.mk   | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)
package/libmpdclient/libmpdclient.hash +0 -1
index 2fd20a41fb..eb32786419 100644
@@ -1,2 +1,3 @@
-# Verified against
 http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig,
sha256 locally computed
package/libmpdclient/libmpdclient.hash +1 -1
-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
package/libmpdclient/libmpdclient.hash +2 -0
+sha256  0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372  libmpdclient-2.14.tar.xz
+sha256  9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32  COPYING
package/libmpdclient/libmpdclient.mk +1 -2
index 691aba9f71..5574bde948 100644
@@ -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

package/libmpdclient/libmpdclient.mk line 20

Quoted 10 lines

package/libmpdclient/libmpdclient.mk +6 -1

 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.

Signature · 1 line

Bye, Peter Korsgaard

Jörg Krause

author

2018-03-08 08:07 UTC #2 lore raw

PATCH 1/1 libmpdclient: bump to version 2.14

Hi Peter,

Quoted 44 lines · Peter Korsgaard

Quoted 43 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"J?rg" == J?rg Krause <[email protected]> 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 <[email protected]>
---
 package/libmpdclient/libmpdclient.hash |  5 +++--
 package/libmpdclient/libmpdclient.mk   | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)
package/libmpdclient/libmpdclient.hash +0 -1
index 2fd20a41fb..eb32786419 100644
@@ -1,2 +1,3 @@
-# Verified against
 http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig,
sha256 locally computed
package/libmpdclient/libmpdclient.hash +1 -1
-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
package/libmpdclient/libmpdclient.hash +2 -0
+sha256  0a84e2791bfe3077cf22ee1784c805d5bb550803dffe56a39aa3690a38061372  libmpdclient-2.14.tar.xz
+sha256  9574c3b0a9c31723cc3d5f32af4655a015fff5ec6ec8115b7906cd7d9623cf32  COPYING
package/libmpdclient/libmpdclient.mk +1 -2
index 691aba9f71..5574bde948 100644
@@ -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

Quoted 10 lines

package/libmpdclient/libmpdclient.mk line 20
Quoted 7 lines
package/libmpdclient/libmpdclient.mk +6 -1
-$(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.

Quoted 1 line

If not, please send a followup patch to add it.

I'll do.