Module Name: pkgsrc
Committed By: rillig
Date: Sun May 31 07:42:13 UTC 2020
Modified Files:
pkgsrc/multimedia/ffmpeg4: Makefile.common
pkgsrc/multimedia/ffplay4: Makefile
Log Message:
multimedia/ffmpeg4: fix USE_LANGUAGES
multimedia/ffmpeg4 does not need -std=gnu99, only ffplay4 does.
Since mk/compiler.mk is protected by a multiple-inclusion guard, any
later assignment to USE_LANGUAGES has no effect except being confusing.
The additional languages show up in "bmake show-var" but at the point of
evaluation, they had not been set yet.
This can be detected by several pkgsrc tools:
pkglint says:
WARN: ../../multimedia/ffmpeg4/Makefile.common:14: Modifying
USE_LANGUAGES after including ../../mk/compiler.mk has no effect.
Adding a manual check to mk/compiler.mk results in:
bmake[1]: "mk/compiler.mk" line 273: warning:
For multimedia/ffmpeg4, only languages "c" are used,
the others in "c99" were defined too late.
Making the variable USE_LANGUAGES read-only after including
mk/compiler.mk results in:
bmake[1]: "multimedia/ffmpeg4/Makefile.common" line 14:
Read-only USE_LANGUAGES cannot be set
(The latter two checks are not yet in the official pkgsrc tree.)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffplay4/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.18 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.19
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.18 Fri May 22 07:59:29 2020
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common Sun May 31 07:42:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2020/05/22 07:59:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2020/05/31 07:42:13 rillig Exp $
# used by multimedia/ffmpeg4/Makefile
# used by multimedia/ffplay4/Makefile
@@ -11,7 +11,6 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 ${
PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg4/patches
-USE_LANGUAGES= c99
USE_LIBTOOL= yes
USE_TOOLS+= gmake pod2man perl pkg-config
HAS_CONFIGURE= yes
Index: pkgsrc/multimedia/ffplay4/Makefile
diff -u pkgsrc/multimedia/ffplay4/Makefile:1.8 pkgsrc/multimedia/ffplay4/Makefile:1.9
--- pkgsrc/multimedia/ffplay4/Makefile:1.8 Fri May 22 07:59:29 2020
+++ pkgsrc/multimedia/ffplay4/Makefile Sun May 31 07:42:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/05/22 07:59:29 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/31 07:42:13 rillig Exp $
PKGNAME= ${DISTNAME:S/ffmpeg/ffplay4/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -7,6 +7,8 @@ COMMENT= Simple SDL frontend for FFmpeg
DISTINFO_FILE= ${.CURDIR}/../ffmpeg4/distinfo
+USE_LANGUAGES= c99
+
CONFIGURE_ARGS+= --disable-ffmpeg
CONFIGURE_ARGS+= --disable-ffprobe
CONFIGURE_ARGS+= --disable-encoders