CVS commit: pkgsrc/multimedia

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan  9 10:29:19 UTC 2025

Modified Files:
        pkgsrc/multimedia/ffmpeg6: Makefile.common
        pkgsrc/multimedia/ffmpeg7: Makefile.common

Log Message:
ffmpeg*: Clean up previous.

I didn't notice the error as the test builds succeeded and there were no
pkglint warnings.  Files are now in sync and duplicate compiler.mk inclusions
removed.

The sunpro section can probably be removed, has been cargo-culted around for
years and is better placed in the wrappers.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg6/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg7/Makefile.common

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

Modified files:

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.10 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.11
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.10      Thu Jan  9 10:22:14 2025
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Thu Jan  9 10:29:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2025/01/09 10:22:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2025/01/09 10:29:19 jperkin Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
@@ -33,8 +33,10 @@ CONFIGURE_ARGS+=     --incdir=${PREFIX}/incl
 CONFIGURE_ARGS+=       --libdir=${PREFIX}/lib/ffmpeg6
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg6
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg6
-# https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
+
 .include "../../mk/compiler.mk"
+
+# https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
 .if ${CC_VERSION:Mclang-15.*}
 LDFLAGS.Darwin+=       -Wl,-ld_classic
 .endif
@@ -75,8 +77,6 @@ CONFIG_SHELL= ${TOOLS_PATH.bash}
 # Let's not put garbage into /tmp
 CONFIGURE_ENV+=                TMPDIR=${WRKSRC}/tmp
 
-.include "../../mk/compiler.mk"
-
 .if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=                sunwspro
 SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.

Index: pkgsrc/multimedia/ffmpeg7/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg7/Makefile.common:1.8 pkgsrc/multimedia/ffmpeg7/Makefile.common:1.9
--- pkgsrc/multimedia/ffmpeg7/Makefile.common:1.8       Thu Jan  9 10:20:50 2025
+++ pkgsrc/multimedia/ffmpeg7/Makefile.common   Thu Jan  9 10:29:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2025/01/09 10:20:50 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.9 2025/01/09 10:29:19 jperkin Exp $
 # used by multimedia/ffmpeg7/Makefile
 # used by multimedia/ffplay7/Makefile
 
@@ -34,8 +34,10 @@ CONFIGURE_ARGS+=     --incdir=${PREFIX}/incl
 CONFIGURE_ARGS+=       --libdir=${PREFIX}/lib/ffmpeg7
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg7
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg7
-# https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
+
 .include "../../mk/compiler.mk"
+
+# https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
 .if ${CC_VERSION:Mclang-15.*}
 LDFLAGS.Darwin+=       -Wl,-ld_classic
 .endif
@@ -76,8 +78,6 @@ CONFIG_SHELL= ${TOOLS_PATH.bash}
 # Let's not put garbage into /tmp
 CONFIGURE_ENV+=                TMPDIR=${WRKSRC}/tmp
 
-.include "../../mk/compiler.mk"
-
 .if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=                sunwspro
 SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.