pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/multimedia/ffmpeg6



Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct  3 09:43:25 UTC 2023

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

Log Message:
ffmpeg6: use classic ld on macos

To avoid duplicate symbol.

https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg6/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.2 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.3
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.2       Tue Jun  6 12:42:00 2023
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Tue Oct  3 09:43:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/06/06 12:42:00 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/10/03 09:43:25 wiz Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
@@ -33,6 +33,8 @@ 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
+LDFLAGS.Darwin+=       -Wl,-ld_classic
 
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
 CONFIGURE_ARGS+=       --enable-opencl



Home | Main Index | Thread Index | Old Index