Sat Mar 12 07:17:20 2022 UTC ()
multimedia: Use hacks.mk to avoid NetBSD msgfmt on NetBSD only.


(nia)
diff -r1.2 -r1.3 pkgsrc/multimedia/gnome-video-effects/Makefile
diff -r0 -r1.1 pkgsrc/multimedia/gnome-video-effects/hacks.mk
diff -r1.72 -r1.73 pkgsrc/multimedia/handbrake/Makefile
diff -r0 -r1.1 pkgsrc/multimedia/handbrake/hacks.mk
diff -r1.120 -r1.121 pkgsrc/multimedia/totem/Makefile
diff -r0 -r1.1 pkgsrc/multimedia/totem/hacks.mk
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/gnome-video-effects/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gnome-video-effects/Makefile 2020/08/17 20:19:38 1.2
+++ pkgsrc/multimedia/gnome-video-effects/Makefile 2022/03/12 07:17:19 1.3
@@ -1,25 +1,22 @@ @@ -1,25 +1,22 @@
1# $NetBSD: Makefile,v 1.2 2020/08/17 20:19:38 leot Exp $ 1# $NetBSD: Makefile,v 1.3 2022/03/12 07:17:19 nia Exp $
2 2
3DISTNAME= gnome-video-effects-0.5.0 3DISTNAME= gnome-video-effects-0.5.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= multimedia gnome 5CATEGORIES= multimedia gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-video-effects/0.5/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-video-effects/0.5/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeVideoEffects 10HOMEPAGE= https://wiki.gnome.org/Projects/GnomeVideoEffects
11COMMENT= Collection of GStreamer effects for GNOME 11COMMENT= Collection of GStreamer effects for GNOME
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15 15
16PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
17 17
18PKGCONFIG_OVERRIDE+= gnome-video-effects.pc.in 18PKGCONFIG_OVERRIDE+= gnome-video-effects.pc.in
19 19
20# XXX msgfmt: unknown option -- desktop 
21_TOOLS_USE_PKGSRC.msgfmt= yes 
22 
23.include "../../devel/meson/build.mk" 20.include "../../devel/meson/build.mk"
24.include "../../multimedia/frei0r/buildlink3.mk" 21.include "../../multimedia/frei0r/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/multimedia/gnome-video-effects/Attic/hacks.mk
# $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
cvs diff -r1.72 -r1.73 pkgsrc/multimedia/handbrake/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/handbrake/Makefile 2021/12/08 16:05:49 1.72
+++ pkgsrc/multimedia/handbrake/Makefile 2022/03/12 07:17:19 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.72 2021/12/08 16:05:49 adam Exp $ 1# $NetBSD: Makefile,v 1.73 2022/03/12 07:17:19 nia Exp $
2# 2#
3 3
4DISTNAME= HandBrake-1.3.3-source 4DISTNAME= HandBrake-1.3.3-source
5PKGNAME= ${DISTNAME:tl:S/-source//} 5PKGNAME= ${DISTNAME:tl:S/-source//}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=HandBrake/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10GITHUB_PROJECT= HandBrake 10GITHUB_PROJECT= HandBrake
11GITHUB_RELEASE= 1.3.3 11GITHUB_RELEASE= 1.3.3
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://handbrake.fr/ 14HOMEPAGE= https://handbrake.fr/
@@ -41,30 +41,26 @@ RESTRICTED= Unresolved patent issues @@ -41,30 +41,26 @@ RESTRICTED= Unresolved patent issues
41NO_BIN_ON_CDROM= ${RESTRICTED} 41NO_BIN_ON_CDROM= ${RESTRICTED}
42NO_BIN_ON_FTP= ${RESTRICTED} 42NO_BIN_ON_FTP= ${RESTRICTED}
43NO_SRC_ON_CDROM= ${RESTRICTED} 43NO_SRC_ON_CDROM= ${RESTRICTED}
44NO_SRC_ON_FTP= ${RESTRICTED} 44NO_SRC_ON_FTP= ${RESTRICTED}
45 45
46WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 46WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
47 47
48HAS_CONFIGURE= yes 48HAS_CONFIGURE= yes
49USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash 49USE_TOOLS+= gmake perl intltool msgfmt pkg-config bash
50USE_TOOLS+= autoconf automake aclocal autoreconf m4 50USE_TOOLS+= autoconf automake aclocal autoreconf m4
51USE_LIBTOOL= yes 51USE_LIBTOOL= yes
52USE_LANGUAGES= c c++ 52USE_LANGUAGES= c c++
53 53
54TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 
55_TOOLS_USE_PKGSRC.msgfmt= yes 
56USE_BUILTIN.gettext= no 
57 
58BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl 54BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl
59 55
60CONFIGURE_ARGS+= --prefix=${PREFIX} 56CONFIGURE_ARGS+= --prefix=${PREFIX}
61BUILD_DIRS= build 57BUILD_DIRS= build
62MAKE_FILE= GNUmakefile 58MAKE_FILE= GNUmakefile
63BUILD_TARGET= # empty 59BUILD_TARGET= # empty
64BUILD_FLAGS+= BUILDLINK_DIR=${BUILDLINK_DIR} 60BUILD_FLAGS+= BUILDLINK_DIR=${BUILDLINK_DIR}
65 61
66BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake 62BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
67BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm 63BUILD_DEPENDS+= nasm>=2.05.01:../../devel/nasm
68BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson 64BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson
69#BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 65#BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
70 66
File Added: pkgsrc/multimedia/handbrake/Attic/hacks.mk
# $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
cvs diff -r1.120 -r1.121 pkgsrc/multimedia/totem/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/totem/Makefile 2021/12/20 07:02:20 1.120
+++ pkgsrc/multimedia/totem/Makefile 2022/03/12 07:17:19 1.121
@@ -1,42 +1,39 @@ @@ -1,42 +1,39 @@
1# $NetBSD: Makefile,v 1.120 2021/12/20 07:02:20 nia Exp $ 1# $NetBSD: Makefile,v 1.121 2022/03/12 07:17:19 nia Exp $
2 2
3DISTNAME= totem-3.34.1 3DISTNAME= totem-3.34.1
4PKGREVISION= 13 4PKGREVISION= 13
5CATEGORIES= multimedia gnome 5CATEGORIES= multimedia gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem/3.34/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem/3.34/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Apps/Videos 10HOMEPAGE= https://wiki.gnome.org/Apps/Videos
11COMMENT= Movie player designed for GNOME 11COMMENT= Movie player designed for GNOME
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext itstool 14USE_TOOLS+= pkg-config msgfmt xgettext itstool
15USE_TOOLS+= pod2man 15USE_TOOLS+= pod2man
16 16
17MESON_ARGS+= -Denable-python=no 17MESON_ARGS+= -Denable-python=no
18 18
19PYTHON_FOR_BUILD_ONLY= tool 19PYTHON_FOR_BUILD_ONLY= tool
20 20
21PKGCONFIG_OVERRIDE+= data/totem.pc.in 21PKGCONFIG_OVERRIDE+= data/totem.pc.in
22 22
23# workaround for build failure 23# workaround for build failure
24# https://gitlab.gnome.org/GNOME/json-glib/issues/35 24# https://gitlab.gnome.org/GNOME/json-glib/issues/35
25MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/src 25MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/src
26 26
27# XXX msgfmt: unknown option -- desktop 
28_TOOLS_USE_PKGSRC.msgfmt= yes 
29 
30.include "../../devel/meson/build.mk" 27.include "../../devel/meson/build.mk"
31.include "../../devel/glib2/schemas.mk" 28.include "../../devel/glib2/schemas.mk"
32.include "../../devel/libpeas/buildlink3.mk" 29.include "../../devel/libpeas/buildlink3.mk"
33.include "../../graphics/clutter-gtk/buildlink3.mk" 30.include "../../graphics/clutter-gtk/buildlink3.mk"
34.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 31.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
35.include "../../lang/python/tool.mk" 32.include "../../lang/python/tool.mk"
36.include "../../net/grilo/buildlink3.mk" 33.include "../../net/grilo/buildlink3.mk"
37.include "../../multimedia/clutter-gst/buildlink3.mk" 34.include "../../multimedia/clutter-gst/buildlink3.mk"
38.include "../../multimedia/gstreamer1/buildlink3.mk" 35.include "../../multimedia/gstreamer1/buildlink3.mk"
39.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 36.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
40.include "../../multimedia/gst-plugins1-good/buildlink3.mk" 37.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
41.include "../../multimedia/totem-pl-parser/buildlink3.mk" 38.include "../../multimedia/totem-pl-parser/buildlink3.mk"
42.include "../../sysutils/desktop-file-utils/desktopdb.mk" 39.include "../../sysutils/desktop-file-utils/desktopdb.mk"
File Added: pkgsrc/multimedia/totem/Attic/hacks.mk
# $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