CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan  9 10:16:05 UTC 2025

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

Log Message:
ffmpeg*: Limit -ld_classic workaround to clang-15.

Fixes builds with older XCode that do not support that option.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg6/Makefile.common
cvs rdiff -u -r1.6 -r1.7 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.8 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.9
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.8       Sat Aug  3 06:52:01 2024
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Thu Jan  9 10:16:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2024/08/03 06:52:01 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2025/01/09 10:16:04 jperkin Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
@@ -34,7 +34,9 @@ CONFIGURE_ARGS+=      --libdir=${PREFIX}/lib/
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg6
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg6
 # https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
+.if ${CC_VERSION:Mclang-15.*}
 LDFLAGS.Darwin+=       -Wl,-ld_classic
+.endif
 
 .if ${USE_CROSS_COMPILE:tl} == yes
 CONFIGURE_ARGS+=       --enable-cross-compile

Index: pkgsrc/multimedia/ffmpeg7/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg7/Makefile.common:1.6 pkgsrc/multimedia/ffmpeg7/Makefile.common:1.7
--- pkgsrc/multimedia/ffmpeg7/Makefile.common:1.6       Mon Oct 21 12:16:51 2024
+++ pkgsrc/multimedia/ffmpeg7/Makefile.common   Thu Jan  9 10:16:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2024/10/21 12:16:51 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2025/01/09 10:16:04 jperkin Exp $
 # used by multimedia/ffmpeg7/Makefile
 # used by multimedia/ffplay7/Makefile
 
@@ -35,7 +35,9 @@ CONFIGURE_ARGS+=      --libdir=${PREFIX}/lib/
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg7
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg7
 # https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
+.if ${CC_VERSION:Mclang-15.*}
 LDFLAGS.Darwin+=       -Wl,-ld_classic
+.endif
 
 .if ${USE_CROSS_COMPILE:tl} == yes
 CONFIGURE_ARGS+=       --enable-cross-compile