CVS commit: pkgsrc/audio/musicpd

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Jul 12 21:20:40 UTC 2022

Modified Files:
        pkgsrc/audio/musicpd: Makefile distinfo options.mk
Added Files:
        pkgsrc/audio/musicpd/patches: patch-src_decoder_plugins_meson.build

Log Message:
musicpd: Fix sidplay option

pkgsrc changes:
---------------
  * Add directory to find the reside-builder library in sidplay2.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/audio/musicpd/distinfo
cvs rdiff -u -r1.41 -r1.42 pkgsrc/audio/musicpd/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/musicpd/Makefile
diff -u pkgsrc/audio/musicpd/Makefile:1.270 pkgsrc/audio/musicpd/Makefile:1.271
--- pkgsrc/audio/musicpd/Makefile:1.270 Tue Jul 12 20:16:08 2022
+++ pkgsrc/audio/musicpd/Makefile       Tue Jul 12 21:20:40 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.270 2022/07/12 20:16:08 triaxx Exp $
+# $NetBSD: Makefile,v 1.271 2022/07/12 21:20:40 triaxx Exp $
 
 DISTNAME=      mpd-0.23.8
 PKGNAME=       ${DISTNAME:S/mpd/musicpd/}
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  https://www.musicpd.org/download/mpd/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -113,6 +114,12 @@ SUBST_FILES.doc=   doc/mpd.conf.5.rst
 SUBST_MESSAGE.doc=     Fixing sysconfdir path in mpd.conf location.
 SUBST_VARS.doc+=       PKG_SYSCONFDIR
 
+SUBST_CLASSES+=                sidplay
+SUBST_STAGE.sidplay=   pre-configure
+SUBST_FILES.sidplay=   src/decoder/plugins/meson.build
+SUBST_MESSAGE.sidplay= Add directory of sidplay2 to search resid-buidler library in.
+SUBST_VARS.sidplay+=   PREFIX
+
 INSTALLATION_DIRS=     ${EGDIR} ${EGDIR}/logrotate.d
 
 PYTHON_FOR_BUILD_ONLY=         tool

Index: pkgsrc/audio/musicpd/distinfo
diff -u pkgsrc/audio/musicpd/distinfo:1.138 pkgsrc/audio/musicpd/distinfo:1.139
--- pkgsrc/audio/musicpd/distinfo:1.138 Tue Jul 12 20:16:08 2022
+++ pkgsrc/audio/musicpd/distinfo       Tue Jul 12 21:20:40 2022
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.138 2022/07/12 20:16:08 triaxx Exp $
+$NetBSD: distinfo,v 1.139 2022/07/12 21:20:40 triaxx Exp $
 
 BLAKE2s (mpd-0.23.8.tar.xz) = f7573d127356d7e8a2042086abdd4b65eedd9eea85b80505a26277a7a892a898
 SHA512 (mpd-0.23.8.tar.xz) = 62f7571de29a329b8ef1fc6f7c338125e70895e06fca134eb9ade19635498ec13da00511870bfadabc5a9ccb090c44543d3101361ffe109e4fadce66435b37ab
 Size (mpd-0.23.8.tar.xz) = 773280 bytes
 SHA1 (patch-doc_mpd.conf.5.rst) = ee22092564075cdf7917e4e66687f6ab98b5817c
+SHA1 (patch-src_decoder_plugins_meson.build) = 8033d6e19da05f472f14f3562a5dfc2f410da98b
 SHA1 (patch-src_net_IPv6Address.hxx) = f89b838ad5e946c5db8d95a6dd560e02bdccae29
 SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233

Index: pkgsrc/audio/musicpd/options.mk
diff -u pkgsrc/audio/musicpd/options.mk:1.41 pkgsrc/audio/musicpd/options.mk:1.42
--- pkgsrc/audio/musicpd/options.mk:1.41        Mon Jun 27 15:59:15 2022
+++ pkgsrc/audio/musicpd/options.mk     Tue Jul 12 21:20:40 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.41 2022/06/27 15:59:15 wiz Exp $
+# $NetBSD: options.mk,v 1.42 2022/07/12 21:20:40 triaxx Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.musicpd
 
@@ -6,7 +6,7 @@ PKG_OPTIONS_VAR=        PKG_OPTIONS.musicpd
 PKG_SUPPORTED_OPTIONS+=        jack openal libao pulseaudio
 # codecs
 PKG_SUPPORTED_OPTIONS+=        adplug faad ffmpeg fluidsynth libgme libwildmidi
-PKG_SUPPORTED_OPTIONS+=        mikmod modplug musepack wavpack
+PKG_SUPPORTED_OPTIONS+=        mikmod modplug musepack sidplay wavpack
 # codecs (encoding only)
 PKG_SUPPORTED_OPTIONS+=        lame shine twolame
 # archive formats
@@ -198,12 +198,11 @@ MESON_ARGS+=      -Dsamplerate=disabled
 MESON_ARGS+=   -Dshine=disabled
 .endif
 
-# src/decoder/plugins/meson.build:170:6: ERROR: C++ shared or static library 'resid-builder' not found
-#.if !empty(PKG_OPTIONS:Msidplay)
-#.  include "../../audio/libsidplay2/buildlink3.mk"
-#.else
-#MESON_ARGS+=  -Dsidplay=disabled
-#.endif
+.if !empty(PKG_OPTIONS:Msidplay)
+.  include "../../audio/libsidplay2/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dsidplay=disabled
+.endif
 
 .if !empty(PKG_OPTIONS:Mshout)
 BUILDLINK_API_DEPENDS.libshout+=       libshout>=2.4.0

Added files:

Index: pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_meson.build
diff -u /dev/null pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_meson.build:1.1
--- /dev/null   Tue Jul 12 21:20:40 2022
+++ pkgsrc/audio/musicpd/patches/patch-src_decoder_plugins_meson.build  Tue Jul 12 21:20:40 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_decoder_plugins_meson.build,v 1.1 2022/07/12 21:20:40 triaxx Exp $
+
+Add directory to search resid-builder library in sidplay2.
+
+--- src/decoder/plugins/meson.build.orig       2022-07-08 23:05:38.000000000 +0000
++++ src/decoder/plugins/meson.build
+@@ -167,7 +167,7 @@ if not get_option('sidplay').disabled()
+     libsidplay2_dep = dependency('libsidplay2', required: false)
+     if libsidplay2_dep.found()
+       libsidutils_dep = dependency('libsidutils')
+-      libresid_builder_dep = compiler.find_library('resid-builder')
++      libresid_builder_dep = compiler.find_library('resid-builder', dirs: '@PREFIX@/lib/sidplay/builders')
+       libsidplay_dep = declare_dependency(dependencies: [libsidplay2_dep, libsidutils_dep, libresid_builder_dep])
+     elif get_option('sidplay').enabled()
+       error('Neither libsidplayfp nor libsidplay2 found')