CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Oct  9 10:59:45 UTC 2021

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile
        pkgsrc/multimedia/ffmpeg4: Makefile

Log Message:
ffmpeg: we no longer need to include compiler.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/multimedia/ffmpeg4/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/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.73 pkgsrc/multimedia/ffmpeg3/Makefile:1.74
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.73     Sat Oct  9 07:48:07 2021
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Sat Oct  9 10:59:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2021/10/09 07:48:07 nia Exp $
+# $NetBSD: Makefile,v 1.74 2021/10/09 10:59:44 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
 PKGREVISION=   14
@@ -39,8 +39,6 @@ post-install:
 
 .include "options.mk"
 
-.include "../../mk/compiler.mk"
-
 # disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=       --disable-asm

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.56 pkgsrc/multimedia/ffmpeg4/Makefile:1.57
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.56     Sat Oct  9 07:48:07 2021
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Sat Oct  9 10:59:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2021/10/09 07:48:07 nia Exp $
+# $NetBSD: Makefile,v 1.57 2021/10/09 10:59:45 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
 PKGREVISION=   9
@@ -34,8 +34,6 @@ post-install:
 
 .include "options.mk"
 
-.include "../../mk/compiler.mk"
-
 # disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=       --disable-asm