CVS commit: pkgsrc/audio

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar 11 08:56:02 UTC 2022

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile
        pkgsrc/audio/quodlibet: Makefile
        pkgsrc/audio/sound-juicer: Makefile
        pkgsrc/audio/speech-dispatcher: Makefile
Added Files:
        pkgsrc/audio/pulseaudio: hacks.mk
        pkgsrc/audio/quodlibet: hacks.mk
        pkgsrc/audio/sound-juicer: hacks.mk

Log Message:
audio: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/pulseaudio/hacks.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/quodlibet/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/quodlibet/hacks.mk
cvs rdiff -u -r1.121 -r1.122 pkgsrc/audio/sound-juicer/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/sound-juicer/hacks.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/audio/speech-dispatcher/Makefile

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

Modified files:

Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.166 pkgsrc/audio/pulseaudio/Makefile:1.167
--- pkgsrc/audio/pulseaudio/Makefile:1.166      Wed Dec  8 16:01:44 2021
+++ pkgsrc/audio/pulseaudio/Makefile    Fri Mar 11 08:56:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2021/12/08 16:01:44 adam Exp $
+# $NetBSD: Makefile,v 1.167 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      pulseaudio-15.0
 PKGREVISION=   1
@@ -27,9 +27,6 @@ SUBST_FILES.egdir+=   src/pulse/meson.buil
 SUBST_FILES.egdir+=    src/daemon/meson.build
 SUBST_VARS.egdir+=     EGDIR
 
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 LIBTOOL_REQD=  2.4
 GCC_REQD+=     4.8
 

Index: pkgsrc/audio/quodlibet/Makefile
diff -u pkgsrc/audio/quodlibet/Makefile:1.15 pkgsrc/audio/quodlibet/Makefile:1.16
--- pkgsrc/audio/quodlibet/Makefile:1.15        Sun Jan  9 16:18:55 2022
+++ pkgsrc/audio/quodlibet/Makefile     Fri Mar 11 08:56:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/01/09 16:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      quodlibet-4.4.0
 PKGREVISION=   4
@@ -36,11 +36,6 @@ USE_TOOLS+=  msgfmt
 
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 # Requires Python 3.5 or higher
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 

Index: pkgsrc/audio/sound-juicer/Makefile
diff -u pkgsrc/audio/sound-juicer/Makefile:1.121 pkgsrc/audio/sound-juicer/Makefile:1.122
--- pkgsrc/audio/sound-juicer/Makefile:1.121    Wed Dec  8 16:03:20 2021
+++ pkgsrc/audio/sound-juicer/Makefile  Fri Mar 11 08:56:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2021/12/08 16:03:20 adam Exp $
+# $NetBSD: Makefile,v 1.122 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      sound-juicer-3.24.0
 PKGREVISION=   12
@@ -19,9 +19,6 @@ USE_TOOLS+=   pkg-config
 USE_TOOLS+=    msgfmt msgmerge xgettext itstool
 USE_TOOLS+=    gmake
 
-# XXX fails without GNU msgfmt
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../audio/libdiscid/buildlink3.mk"
 .include "../../audio/libmusicbrainz5/buildlink3.mk"

Index: pkgsrc/audio/speech-dispatcher/Makefile
diff -u pkgsrc/audio/speech-dispatcher/Makefile:1.22 pkgsrc/audio/speech-dispatcher/Makefile:1.23
--- pkgsrc/audio/speech-dispatcher/Makefile:1.22        Wed Dec  8 16:01:44 2021
+++ pkgsrc/audio/speech-dispatcher/Makefile     Fri Mar 11 08:56:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/08 16:01:44 adam Exp $
+# $NetBSD: Makefile,v 1.23 2022/03/11 08:56:02 nia Exp $
 
 DISTNAME=      speech-dispatcher-0.10.2
 PKGREVISION=   3
@@ -35,11 +35,6 @@ CONFIGURE_ARGS+=     --without-pulse
 
 .include "../../mk/bsd.prefs.mk"
 
-# msgfmt: unknown option -- desktop
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.msgfmt=
-.endif
-
 PKGCONFIG_OVERRIDE+=   speech-dispatcher.pc.in
 
 PKG_SYSCONFSUBDIR=     speech-dispatcher

Added files:

Index: pkgsrc/audio/pulseaudio/hacks.mk
diff -u /dev/null pkgsrc/audio/pulseaudio/hacks.mk:1.1
--- /dev/null   Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/pulseaudio/hacks.mk    Fri Mar 11 08:56:02 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $
+
+.if !defined(PULSEAUDIO_HACKS_MK)
+PULSEAUDIO_HACKS_MK:=
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
+TOOLS_PLATFORM.msgfmt= # none
+PKG_HACKS+=            avoid-gplv2-msgfmt
+.endif
+.endif # PULSEAUDIO_HACKS_MK

Index: pkgsrc/audio/quodlibet/hacks.mk
diff -u /dev/null pkgsrc/audio/quodlibet/hacks.mk:1.1
--- /dev/null   Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/quodlibet/hacks.mk     Fri Mar 11 08:56:02 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $
+
+.if !defined(QUODLIBET_HACKS_MK)
+QUODLIBET_HACKS_MK:=
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
+TOOLS_PLATFORM.msgfmt= # none
+PKG_HACKS+=            avoid-gplv2-msgfmt
+.endif
+.endif # QUODLIBET_HACKS_MK

Index: pkgsrc/audio/sound-juicer/hacks.mk
diff -u /dev/null pkgsrc/audio/sound-juicer/hacks.mk:1.1
--- /dev/null   Fri Mar 11 08:56:02 2022
+++ pkgsrc/audio/sound-juicer/hacks.mk  Fri Mar 11 08:56:02 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/11 08:56:02 nia Exp $
+
+.if !defined(SOUND_JUICER_HACKS_MK)
+SOUND_JUICER_HACKS_MK:=
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# Old GPLv2 version of msgfmt in NetBSD does not support --desktop/--xml.
+TOOLS_PLATFORM.msgfmt= # none
+PKG_HACKS+=            avoid-gplv2-msgfmt
+.endif
+.endif # SOUND_JUICER_HACKS_MK