CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 12 07:17:20 UTC 2022

Modified Files:
        pkgsrc/multimedia/gnome-video-effects: Makefile
        pkgsrc/multimedia/handbrake: Makefile
        pkgsrc/multimedia/totem: Makefile
Added Files:
        pkgsrc/multimedia/gnome-video-effects: hacks.mk
        pkgsrc/multimedia/handbrake: hacks.mk
        pkgsrc/multimedia/totem: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/gnome-video-effects/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/gnome-video-effects/hacks.mk
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/handbrake/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/handbrake/hacks.mk
cvs rdiff -u -r1.120 -r1.121 pkgsrc/multimedia/totem/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/totem/hacks.mk

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

Modified files:

Index: pkgsrc/multimedia/gnome-video-effects/Makefile
diff -u pkgsrc/multimedia/gnome-video-effects/Makefile:1.2 pkgsrc/multimedia/gnome-video-effects/Makefile:1.3
--- pkgsrc/multimedia/gnome-video-effects/Makefile:1.2  Mon Aug 17 20:19:38 2020
+++ pkgsrc/multimedia/gnome-video-effects/Makefile      Sat Mar 12 07:17:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/08/17 20:19:38 leot Exp $
+# $NetBSD: Makefile,v 1.3 2022/03/12 07:17:19 nia Exp $
 
 DISTNAME=      gnome-video-effects-0.5.0
 PKGREVISION=   1
@@ -17,9 +17,6 @@ PYTHON_FOR_BUILD_ONLY=        tool
 
 PKGCONFIG_OVERRIDE+=   gnome-video-effects.pc.in
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 .include "../../devel/meson/build.mk"
 .include "../../multimedia/frei0r/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/handbrake/Makefile
diff -u pkgsrc/multimedia/handbrake/Makefile:1.72 pkgsrc/multimedia/handbrake/Makefile:1.73
--- pkgsrc/multimedia/handbrake/Makefile:1.72   Wed Dec  8 16:05:49 2021
+++ pkgsrc/multimedia/handbrake/Makefile        Sat Mar 12 07:17:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2021/12/08 16:05:49 adam Exp $
+# $NetBSD: Makefile,v 1.73 2022/03/12 07:17:19 nia Exp $
 #
 
 DISTNAME=      HandBrake-1.3.3-source
@@ -51,10 +51,6 @@ USE_TOOLS+=  autoconf automake aclocal au
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
-TOOL_DEPENDS+=                 gettext-tools-[0-9]*:../../devel/gettext-tools
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-USE_BUILTIN.gettext=           no
-
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-ldl
 
 CONFIGURE_ARGS+=       --prefix=${PREFIX}

Index: pkgsrc/multimedia/totem/Makefile
diff -u pkgsrc/multimedia/totem/Makefile:1.120 pkgsrc/multimedia/totem/Makefile:1.121
--- pkgsrc/multimedia/totem/Makefile:1.120      Mon Dec 20 07:02:20 2021
+++ pkgsrc/multimedia/totem/Makefile    Sat Mar 12 07:17:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2021/12/20 07:02:20 nia Exp $
+# $NetBSD: Makefile,v 1.121 2022/03/12 07:17:19 nia Exp $
 
 DISTNAME=      totem-3.34.1
 PKGREVISION=   13
@@ -24,9 +24,6 @@ PKGCONFIG_OVERRIDE+=  data/totem.pc.in
 # https://gitlab.gnome.org/GNOME/json-glib/issues/35
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/src
 
-# XXX msgfmt: unknown option -- desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libpeas/buildlink3.mk"

Added files:

Index: pkgsrc/multimedia/gnome-video-effects/hacks.mk
diff -u /dev/null pkgsrc/multimedia/gnome-video-effects/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:17:20 2022
+++ pkgsrc/multimedia/gnome-video-effects/hacks.mk      Sat Mar 12 07:17:19 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $
+
+.if !defined(GNOME_VIDEO_EFFECTS_HACKS_MK)
+GNOME_VIDEO_EFFECTS_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 # GNOME_VIDEO_EFFECTS_HACKS_MK

Index: pkgsrc/multimedia/handbrake/hacks.mk
diff -u /dev/null pkgsrc/multimedia/handbrake/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:17:20 2022
+++ pkgsrc/multimedia/handbrake/hacks.mk        Sat Mar 12 07:17:19 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $
+
+.if !defined(HANDBRAKE_HACKS_MK)
+HANDBRAKE_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 # HANDBRAKE_HACKS_MK

Index: pkgsrc/multimedia/totem/hacks.mk
diff -u /dev/null pkgsrc/multimedia/totem/hacks.mk:1.1
--- /dev/null   Sat Mar 12 07:17:20 2022
+++ pkgsrc/multimedia/totem/hacks.mk    Sat Mar 12 07:17:19 2022
@@ -0,0 +1,13 @@
+# $NetBSD: hacks.mk,v 1.1 2022/03/12 07:17:19 nia Exp $
+
+.if !defined(TOTEM_HACKS_MK)
+TOTEM_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 # TOTEM_HACKS_MK