CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 17 14:21:39 UTC 2025

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile.common
        pkgsrc/multimedia/ffmpeg4: Makefile.common
        pkgsrc/multimedia/ffmpeg5: Makefile.common
        pkgsrc/multimedia/ffmpeg7: Makefile.common

Log Message:
ffmpeg[7,5,4,3]: Fix build on NetBSD/mips64

The assembler code uses MIPS IV instructions while the NetBSD
toolchain defaults to MIPS III. This renders the package
uncompilable.

ffmpeg2 is unaffected, ffmpeg6 already has the fix applied.

XXX unsure if we're running mips64 on any MIPS III processors by
default, but this is at least better than the package failing on
every mips64 processor


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.35 -r1.36 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg5/Makefile.common
cvs rdiff -u -r1.10 -r1.11 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/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.44 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.45
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.44      Tue Sep 17 08:15:06 2024
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Thu Apr 17 14:21:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2024/09/17 08:15:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.45 2025/04/17 14:21:38 nia Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -46,6 +46,11 @@ CONFIGURE_ENV+=              bigendian=yes
 .  endif
 .endif
 
+# fails otherwise due to movz/movn in assembler code
+.if ${MACHINE_ARCH:Mmips64*}
+CFLAGS.NetBSD+=                -march=mips4
+.endif
+
 # altivec support is detected at runtime, and only code that is gated
 # on the runtime detection can use it.  The code in ffmpeg that is
 # gated on the runtime detection doesn't need -maltivec -mabi=altivec.

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.35 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.36
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.35      Tue Sep 17 07:56:47 2024
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Thu Apr 17 14:21:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2024/09/17 07:56:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.36 2025/04/17 14:21:38 nia Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -59,6 +59,11 @@ BUILDLINK_TRANSFORM+=        rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
 .endif
 
+# fails otherwise due to movz/movn in assembler code
+.if ${MACHINE_ARCH:Mmips64*}
+CFLAGS.NetBSD+=                -march=mips4
+.endif
+
 .if ${MACHINE_PLATFORM:MDarwin-1[2-9].*-*} || ${MACHINE_PLATFORM:MDarwin-2*}
 CONFIGURE_ARGS+=       --enable-opencl
 .endif

Index: pkgsrc/multimedia/ffmpeg5/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg5/Makefile.common:1.13 pkgsrc/multimedia/ffmpeg5/Makefile.common:1.14
--- pkgsrc/multimedia/ffmpeg5/Makefile.common:1.13      Tue Sep 17 07:34:31 2024
+++ pkgsrc/multimedia/ffmpeg5/Makefile.common   Thu Apr 17 14:21:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2024/09/17 07:34:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2025/04/17 14:21:38 nia Exp $
 # used by multimedia/ffmpeg5/Makefile
 # used by multimedia/ffplay5/Makefile
 
@@ -45,6 +45,11 @@ CONFIGURE_ENV+=              bigendian=yes
 .  endif
 .endif
 
+# fails otherwise due to movz/movn in assembler code
+.if ${MACHINE_ARCH:Mmips64*}
+CFLAGS.NetBSD+=                -march=mips4
+.endif
+
 # altivec support is detected at runtime, and only code that is gated
 # on the runtime detection can use it.  The code in ffmpeg that is
 # gated on the runtime detection doesn't need -maltivec -mabi=altivec.

Index: pkgsrc/multimedia/ffmpeg7/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg7/Makefile.common:1.10 pkgsrc/multimedia/ffmpeg7/Makefile.common:1.11
--- pkgsrc/multimedia/ffmpeg7/Makefile.common:1.10      Mon Mar  3 16:14:24 2025
+++ pkgsrc/multimedia/ffmpeg7/Makefile.common   Thu Apr 17 14:21:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2025/03/03 16:14:24 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2025/04/17 14:21:38 nia Exp $
 # used by multimedia/ffmpeg7/Makefile
 # used by multimedia/ffplay7/Makefile
 
@@ -53,6 +53,11 @@ CONFIGURE_ENV+=              bigendian=yes
 .  endif
 .endif
 
+# fails otherwise due to movz/movn in assembler code
+.if ${MACHINE_ARCH:Mmips64*}
+CFLAGS.NetBSD+=                -march=mips4
+.endif
+
 # altivec support is detected at runtime, and only code that is gated
 # on the runtime detection can use it.  The code in ffmpeg that is
 # gated on the runtime detection doesn't need -maltivec -mabi=altivec.