Sun Jan 10 19:25:18 2021 UTC ()
Pullup ticket #6394 - requested by nia
audio/musicpd: NetBSD/earm build fix

Revisions pulled up:
- audio/musicpd/Makefile                                        1.233

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Fri Jan  8 09:31:32 UTC 2021

   Modified Files:
   	pkgsrc/audio/musicpd: Makefile

   Log Message:
   musicpd: Lower GCC requirement.

   This is a build fix for NetBSD/earm...


(bsiegert)
diff -r1.230 -r1.230.2.1 pkgsrc/audio/musicpd/Makefile
cvs diff -r1.230 -r1.230.2.1 pkgsrc/audio/musicpd/Makefile (switch to unified diff)

--- pkgsrc/audio/musicpd/Makefile 2020/12/04 04:55:42 1.230
+++ pkgsrc/audio/musicpd/Makefile 2021/01/10 19:25:18 1.230.2.1
@@ -1,131 +1,137 @@ @@ -1,131 +1,137 @@
1# $NetBSD: Makefile,v 1.230 2020/12/04 04:55:42 riastradh Exp $ 1# $NetBSD: Makefile,v 1.230.2.1 2021/01/10 19:25:18 bsiegert Exp $
2 2
3DISTNAME= mpd-0.22.3 3DISTNAME= mpd-0.22.3
4PKGNAME= ${DISTNAME:S/mpd/musicpd/} 4PKGNAME= ${DISTNAME:S/mpd/musicpd/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= https://www.musicpd.org/download/mpd/0.22/ 7MASTER_SITES= https://www.musicpd.org/download/mpd/0.22/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.musicpd.org/ 11HOMEPAGE= https://www.musicpd.org/
12COMMENT= Remote controllable audio player 12COMMENT= Remote controllable audio player
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS= mpd-[0-9]* 15CONFLICTS= mpd-[0-9]*
16 16
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19 19
20# c++17 20# The upstream changelog recommends gcc8, but it compiles fine with 7.5.0
21GCC_REQD+= 8 21# (NetBSD 9.1) using -std=c++17.
 22#
 23# Please be cautious of raising this requirement - mpd seems to adopt new C++
 24# standards quickly. Notably, gcc8 from pkgsrc doesn't have support for
 25# NetBSD/earmv7hf. gcc10 should, but fails for other reasons (TODO:
 26# investigate).
 27GCC_REQD+= 7
22 28
23MESON_ARGS+= -Ddocumentation=enabled 29MESON_ARGS+= -Ddocumentation=enabled
24 30
25# worrying libraries with limited maintainance: 31# worrying libraries with limited maintainance:
26# - audiofile, many CVEs, no activity since 2016 32# - audiofile, many CVEs, no activity since 2016
27# using sndfile instead 33# using sndfile instead
28# - mad, no release since 2004 34# - mad, no release since 2004
29# using mpg123 instead 35# using mpg123 instead
30MESON_ARGS+= -Dmad=disabled 36MESON_ARGS+= -Dmad=disabled
31MESON_ARGS+= -Daudiofile=disabled 37MESON_ARGS+= -Daudiofile=disabled
32 38
33# not available in pkgsrc? 39# not available in pkgsrc?
34MESON_ARGS+= -Dnfs=disabled 40MESON_ARGS+= -Dnfs=disabled
35MESON_ARGS+= -Diso9660=disabled 41MESON_ARGS+= -Diso9660=disabled
36MESON_ARGS+= -Dsndio=disabled 42MESON_ARGS+= -Dsndio=disabled
37 43
38.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
39 45
40.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 46.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
41MESON_ARGS+= -Dsolaris_output=enabled 47MESON_ARGS+= -Dsolaris_output=enabled
42.endif 48.endif
43 49
44MPD_USER?= mpd 50MPD_USER?= mpd
45MPD_GROUP?= mpd 51MPD_GROUP?= mpd
46PKG_GROUPS= ${MPD_GROUP} 52PKG_GROUPS= ${MPD_GROUP}
47PKG_USERS= ${MPD_USER}:${MPD_GROUP} 53PKG_USERS= ${MPD_USER}:${MPD_GROUP}
48PKG_GROUPS_VARS= MPD_USER 54PKG_GROUPS_VARS= MPD_USER
49PKG_USERS_VARS= MPD_GROUP 55PKG_USERS_VARS= MPD_GROUP
50 56
51.include "../../mk/oss.buildlink3.mk" 57.include "../../mk/oss.buildlink3.mk"
52 58
53.if ${OSS_TYPE} == "none" 59.if ${OSS_TYPE} == "none"
54MESON_ARGS+= -Doss=disabled 60MESON_ARGS+= -Doss=disabled
55.else 61.else
56MESON_ARGS+= -Doss=enabled 62MESON_ARGS+= -Doss=enabled
57LDFLAGS+= ${LIBOSSAUDIO} 63LDFLAGS+= ${LIBOSSAUDIO}
58SUBST_CLASSES+= oss 64SUBST_CLASSES+= oss
59SUBST_STAGE.oss= pre-configure 65SUBST_STAGE.oss= pre-configure
60SUBST_MESSAGE.oss= Correcting the path to the OSS device. 66SUBST_MESSAGE.oss= Correcting the path to the OSS device.
61SUBST_FILES.oss+= src/output/plugins/OssOutputPlugin.cxx 67SUBST_FILES.oss+= src/output/plugins/OssOutputPlugin.cxx
62SUBST_SED.oss+= -e "s,/dev/sound/dsp,${DEVOSSAUDIO},g" 68SUBST_SED.oss+= -e "s,/dev/sound/dsp,${DEVOSSAUDIO},g"
63.endif 69.endif
64 70
65EGDIR= ${PREFIX}/share/examples/mpd 71EGDIR= ${PREFIX}/share/examples/mpd
66CONF_FILES= ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf 72CONF_FILES= ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf
67RCD_SCRIPTS= mpd 73RCD_SCRIPTS= mpd
68 74
69FILES_SUBST+= MPD_USER=${MPD_USER:Q} 75FILES_SUBST+= MPD_USER=${MPD_USER:Q}
70FILES_SUBST+= MPD_GROUP=${MPD_GROUP:Q} 76FILES_SUBST+= MPD_GROUP=${MPD_GROUP:Q}
71FILES_SUBST+= VARBASE=${VARBASE} 77FILES_SUBST+= VARBASE=${VARBASE}
72 78
73BUILD_DEFS+= VARBASE 79BUILD_DEFS+= VARBASE
74 80
75OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd \ 81OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd \
76 ${MPD_USER} ${MPD_GROUP} 0755 82 ${MPD_USER} ${MPD_GROUP} 0755
77 83
78OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/music \ 84OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/music \
79 ${MPD_USER} ${MPD_GROUP} 0755 85 ${MPD_USER} ${MPD_GROUP} 0755
80 86
81OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/playlists \ 87OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/playlists \
82 ${MPD_USER} ${MPD_GROUP} 0755 88 ${MPD_USER} ${MPD_GROUP} 0755
83 89
84CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 90CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
85 91
86.include "options.mk" 92.include "options.mk"
87 93
88SUBST_CLASSES+= conf 94SUBST_CLASSES+= conf
89SUBST_STAGE.conf= pre-configure 95SUBST_STAGE.conf= pre-configure
90SUBST_FILES.conf= mpd.conf 96SUBST_FILES.conf= mpd.conf
91SUBST_MESSAGE.conf= Setting variables in the configuration file. 97SUBST_MESSAGE.conf= Setting variables in the configuration file.
92SUBST_VARS.conf+= VARBASE 98SUBST_VARS.conf+= VARBASE
93SUBST_VARS.conf+= MPD_USER 99SUBST_VARS.conf+= MPD_USER
94 100
95SUBST_CLASSES+= sphinx 101SUBST_CLASSES+= sphinx
96SUBST_STAGE.sphinx= pre-configure 102SUBST_STAGE.sphinx= pre-configure
97SUBST_FILES.sphinx= doc/meson.build 103SUBST_FILES.sphinx= doc/meson.build
98SUBST_MESSAGE.sphinx= Fixing sphinx binary name. 104SUBST_MESSAGE.sphinx= Fixing sphinx binary name.
99SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX}," 105SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
100 106
101INSTALLATION_DIRS= ${EGDIR} 107INSTALLATION_DIRS= ${EGDIR}
102 108
103PYTHON_FOR_BUILD_ONLY= tool 109PYTHON_FOR_BUILD_ONLY= tool
104 110
105PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool 111PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
106 112
107post-extract: 113post-extract:
108 ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf 114 ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf
109 115
110post-install: 116post-install:
111 ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR} 117 ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${DESTDIR}${EGDIR}
112 ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR} 118 ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${DESTDIR}${EGDIR}
113 119
114.include "../../devel/meson/build.mk" 120.include "../../devel/meson/build.mk"
115BUILDLINK_API_DEPENDS.flac+= flac>=1.2 121BUILDLINK_API_DEPENDS.flac+= flac>=1.2
116.include "../../audio/flac/buildlink3.mk" 122.include "../../audio/flac/buildlink3.mk"
117.include "../../audio/libid3tag/buildlink3.mk" 123.include "../../audio/libid3tag/buildlink3.mk"
118.include "../../audio/libopus/buildlink3.mk" 124.include "../../audio/libopus/buildlink3.mk"
119.include "../../audio/libsndfile/buildlink3.mk" 125.include "../../audio/libsndfile/buildlink3.mk"
120.include "../../audio/mpg123/buildlink3.mk" 126.include "../../audio/mpg123/buildlink3.mk"
121.include "../../databases/sqlite3/buildlink3.mk" 127.include "../../databases/sqlite3/buildlink3.mk"
122.include "../../devel/boost-libs/buildlink3.mk" 128.include "../../devel/boost-libs/buildlink3.mk"
123.include "../../devel/pcre/buildlink3.mk" 129.include "../../devel/pcre/buildlink3.mk"
124.include "../../devel/zlib/buildlink3.mk" 130.include "../../devel/zlib/buildlink3.mk"
125.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 131.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
126.include "../../lang/python/versioned_dependencies.mk" 132.include "../../lang/python/versioned_dependencies.mk"
127.include "../../security/libgcrypt/buildlink3.mk" 133.include "../../security/libgcrypt/buildlink3.mk"
128.include "../../textproc/expat/buildlink3.mk" 134.include "../../textproc/expat/buildlink3.mk"
129.include "../../textproc/icu/buildlink3.mk" 135.include "../../textproc/icu/buildlink3.mk"
130.include "../../mk/pthread.buildlink3.mk" 136.include "../../mk/pthread.buildlink3.mk"
131.include "../../mk/bsd.pkg.mk" 137.include "../../mk/bsd.pkg.mk"