CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May 22 19:42:40 UTC 2025

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

Log Message:
ffmpeg[3-7]: Fix building on n64 mips.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/ffmpeg5/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/ffmpeg6/Makefile.common
cvs rdiff -u -r1.11 -r1.12 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.45 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.46
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.45      Thu Apr 17 14:21:38 2025
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Thu May 22 19:42:39 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2025/04/17 14:21:38 nia Exp $
+# $NetBSD: Makefile.common,v 1.46 2025/05/22 19:42:39 nia Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -47,7 +47,7 @@ CONFIGURE_ENV+=               bigendian=yes
 .endif
 
 # fails otherwise due to movz/movn in assembler code
-.if ${MACHINE_ARCH:Mmips64*}
+.if ${MACHINE_ARCH:Mmips64*} || ${MACHINE_ARCH:Mmipsn64*}
 CFLAGS.NetBSD+=                -march=mips4
 .endif
 

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.36 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.37
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.36      Thu Apr 17 14:21:38 2025
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Thu May 22 19:42:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2025/04/17 14:21:38 nia Exp $
+# $NetBSD: Makefile.common,v 1.37 2025/05/22 19:42:40 nia Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -60,7 +60,7 @@ BUILDLINK_TRANSFORM+= rm:-mabi=altivec
 .endif
 
 # fails otherwise due to movz/movn in assembler code
-.if ${MACHINE_ARCH:Mmips64*}
+.if ${MACHINE_ARCH:Mmips64*} || ${MACHINE_ARCH:Mmipsn64*}
 CFLAGS.NetBSD+=                -march=mips4
 .endif
 

Index: pkgsrc/multimedia/ffmpeg5/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg5/Makefile.common:1.14 pkgsrc/multimedia/ffmpeg5/Makefile.common:1.15
--- pkgsrc/multimedia/ffmpeg5/Makefile.common:1.14      Thu Apr 17 14:21:38 2025
+++ pkgsrc/multimedia/ffmpeg5/Makefile.common   Thu May 22 19:42:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2025/04/17 14:21:38 nia Exp $
+# $NetBSD: Makefile.common,v 1.15 2025/05/22 19:42:40 nia Exp $
 # used by multimedia/ffmpeg5/Makefile
 # used by multimedia/ffplay5/Makefile
 
@@ -46,7 +46,7 @@ CONFIGURE_ENV+=               bigendian=yes
 .endif
 
 # fails otherwise due to movz/movn in assembler code
-.if ${MACHINE_ARCH:Mmips64*}
+.if ${MACHINE_ARCH:Mmips64*} || ${MACHINE_ARCH:Mmipsn64*}
 CFLAGS.NetBSD+=                -march=mips4
 .endif
 

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.12 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.13
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.12      Thu Apr 17 10:00:17 2025
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Thu May 22 19:42:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2025/04/17 10:00:17 nia Exp $
+# $NetBSD: Makefile.common,v 1.13 2025/05/22 19:42:40 nia Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
@@ -53,7 +53,7 @@ CONFIGURE_ENV+=               bigendian=yes
 .endif
 
 # fails otherwise due to movz/movn in assembler code
-.if ${MACHINE_ARCH:Mmips64*}
+.if ${MACHINE_ARCH:Mmips64*} || ${MACHINE_ARCH:Mmipsn64*}
 CFLAGS.NetBSD+=                -march=mips4
 .endif
 

Index: pkgsrc/multimedia/ffmpeg7/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg7/Makefile.common:1.11 pkgsrc/multimedia/ffmpeg7/Makefile.common:1.12
--- pkgsrc/multimedia/ffmpeg7/Makefile.common:1.11      Thu Apr 17 14:21:38 2025
+++ pkgsrc/multimedia/ffmpeg7/Makefile.common   Thu May 22 19:42:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2025/04/17 14:21:38 nia Exp $
+# $NetBSD: Makefile.common,v 1.12 2025/05/22 19:42:40 nia Exp $
 # used by multimedia/ffmpeg7/Makefile
 # used by multimedia/ffplay7/Makefile
 
@@ -54,7 +54,7 @@ CONFIGURE_ENV+=               bigendian=yes
 .endif
 
 # fails otherwise due to movz/movn in assembler code
-.if ${MACHINE_ARCH:Mmips64*}
+.if ${MACHINE_ARCH:Mmips64*} || ${MACHINE_ARCH:Mmipsn64*}
 CFLAGS.NetBSD+=                -march=mips4
 .endif