CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Taylor R Campbell" <riastradh%netbsd.org@localhost>
Date: Sat, 27 Jan 2024 02:54:37 +0000

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 27 02:54:37 UTC 2024

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile Makefile.common
        pkgsrc/multimedia/ffmpeg3: Makefile Makefile.common
        pkgsrc/multimedia/ffmpeg4: Makefile Makefile.common
        pkgsrc/multimedia/ffmpeg5: Makefile Makefile.common
        pkgsrc/multimedia/ffmpeg6: Makefile Makefile.common
        pkgsrc/multimedia/ffplay2: Makefile
        pkgsrc/multimedia/ffplay3: Makefile
        pkgsrc/multimedia/ffplay4: Makefile
        pkgsrc/multimedia/ffplay5: Makefile
        pkgsrc/multimedia/ffplay6: Makefile

Log Message:
multimedia/ffmpeg*: powerpc altivec fix is not cross-only

Revbump so new _native_ powerpc builds will get this fix too.

Add a comment explaining why we do this.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.95 -r1.96 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.84 -r1.85 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.31 -r1.32 pkgsrc/multimedia/ffmpeg5/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg5/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg6/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg6/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/multimedia/ffplay2/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/multimedia/ffplay3/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/multimedia/ffplay4/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/ffplay5/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffplay6/Makefile

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

Modified files:

Index: pkgsrc/multimedia/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.95 pkgsrc/multimedia/ffmpeg2/Makefile:1.96
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.95     Sat Jan 27 02:51:31 2024
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2024/01/27 02:51:31 riastradh Exp $
+# $NetBSD: Makefile,v 1.96 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   14
+PKGREVISION=   15
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v2.x)

Index: pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.68 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.69
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.68      Sat Jan 27 02:51:31 2024
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Sat Jan 27 02:54:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.68 2024/01/27 02:51:31 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.69 2024/01/27 02:54:36 riastradh Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -43,10 +43,19 @@ CONFIGURE_ARGS+=    --target-os=${LOWER_OPS
 .  if ${MACHINE_ENDIAN} == "big"
 CONFIGURE_ENV+=                bigendian=yes
 .  endif
-.  if !empty(MACHINE_ARCH:Mpowerpc*)
+.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.
+# But passing -maltivec -mabi=altivec tells the compiler that _any_
+# code, whether or not gated on runtime detection, can be done with
+# altivec -- and the compiler will quietly take advantage of this,
+# e.g. to zero-initialize objects on the stack.  This doesn't work too
+# well on powerpc CPUs without altivec, so nix the arguments.
+.if !empty(MACHINE_ARCH:Mpowerpc*)
 BUILDLINK_TRANSFORM+=  rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
-.  endif
 .endif
 
 PLIST_VARS+=           opencl

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.95 pkgsrc/multimedia/ffmpeg3/Makefile:1.96
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.95     Sat Jan 27 02:52:37 2024
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2024/01/27 02:52:37 riastradh Exp $
+# $NetBSD: Makefile,v 1.96 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   16
+PKGREVISION=   17
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v3.x)

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.42 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.43
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.42      Sat Jan 27 02:52:37 2024
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Sat Jan 27 02:54:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2024/01/27 02:52:37 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.43 2024/01/27 02:54:36 riastradh Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -43,10 +43,19 @@ CONFIGURE_ARGS+=    --target-os=${LOWER_OPS
 .  if ${MACHINE_ENDIAN} == "big"
 CONFIGURE_ENV+=                bigendian=yes
 .  endif
-.  if !empty(MACHINE_ARCH:Mpowerpc*)
+.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.
+# But passing -maltivec -mabi=altivec tells the compiler that _any_
+# code, whether or not gated on runtime detection, can be done with
+# altivec -- and the compiler will quietly take advantage of this,
+# e.g. to zero-initialize objects on the stack.  This doesn't work too
+# well on powerpc CPUs without altivec, so nix the arguments.
+.if !empty(MACHINE_ARCH:Mpowerpc*)
 BUILDLINK_TRANSFORM+=  rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
-.  endif
 .endif
 
 PLIST_VARS+=           opencl

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.84 pkgsrc/multimedia/ffmpeg4/Makefile:1.85
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.84     Sat Jan 27 02:52:49 2024
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2024/01/27 02:52:49 riastradh Exp $
+# $NetBSD: Makefile,v 1.85 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   7
+PKGREVISION=   8
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.33 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.34
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.33      Sat Jan 27 02:52:49 2024
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Sat Jan 27 02:54:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2024/01/27 02:52:49 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.34 2024/01/27 02:54:36 riastradh Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -44,10 +44,19 @@ CONFIGURE_ARGS+=    --target-os=${LOWER_OPS
 .  if ${MACHINE_ENDIAN} == "big"
 CONFIGURE_ENV+=                bigendian=yes
 .  endif
-.  if !empty(MACHINE_ARCH:Mpowerpc*)
+.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.
+# But passing -maltivec -mabi=altivec tells the compiler that _any_
+# code, whether or not gated on runtime detection, can be done with
+# altivec -- and the compiler will quietly take advantage of this,
+# e.g. to zero-initialize objects on the stack.  This doesn't work too
+# well on powerpc CPUs without altivec, so nix the arguments.
+.if !empty(MACHINE_ARCH:Mpowerpc*)
 BUILDLINK_TRANSFORM+=  rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
-.  endif
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)

Index: pkgsrc/multimedia/ffmpeg5/Makefile
diff -u pkgsrc/multimedia/ffmpeg5/Makefile:1.31 pkgsrc/multimedia/ffmpeg5/Makefile:1.32
--- pkgsrc/multimedia/ffmpeg5/Makefile:1.31     Sat Jan 27 02:10:34 2024
+++ pkgsrc/multimedia/ffmpeg5/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2024/01/27 02:10:34 riastradh Exp $
+# $NetBSD: Makefile,v 1.32 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg5/}
-PKGREVISION=   2
+PKGREVISION=   3
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v5.x)

Index: pkgsrc/multimedia/ffmpeg5/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg5/Makefile.common:1.11 pkgsrc/multimedia/ffmpeg5/Makefile.common:1.12
--- pkgsrc/multimedia/ffmpeg5/Makefile.common:1.11      Sat Jan 27 02:22:03 2024
+++ pkgsrc/multimedia/ffmpeg5/Makefile.common   Sat Jan 27 02:54:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2024/01/27 02:22:03 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.12 2024/01/27 02:54:36 riastradh Exp $
 # used by multimedia/ffmpeg5/Makefile
 # used by multimedia/ffplay5/Makefile
 
@@ -43,10 +43,19 @@ CONFIGURE_ARGS+=    --target-os=${LOWER_OPS
 .  if ${MACHINE_ENDIAN} == "big"
 CONFIGURE_ENV+=                bigendian=yes
 .  endif
-.  if !empty(MACHINE_ARCH:Mpowerpc*)
+.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.
+# But passing -maltivec -mabi=altivec tells the compiler that _any_
+# code, whether or not gated on runtime detection, can be done with
+# altivec -- and the compiler will quietly take advantage of this,
+# e.g. to zero-initialize objects on the stack.  This doesn't work too
+# well on powerpc CPUs without altivec, so nix the arguments.
+.if !empty(MACHINE_ARCH:Mpowerpc*)
 BUILDLINK_TRANSFORM+=  rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
-.  endif
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)

Index: pkgsrc/multimedia/ffmpeg6/Makefile
diff -u pkgsrc/multimedia/ffmpeg6/Makefile:1.10 pkgsrc/multimedia/ffmpeg6/Makefile:1.11
--- pkgsrc/multimedia/ffmpeg6/Makefile:1.10     Sat Jan 27 02:53:01 2024
+++ pkgsrc/multimedia/ffmpeg6/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2024/01/27 02:53:01 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg6/}
-PKGREVISION=   1
+PKGREVISION=   2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v6.x)

Index: pkgsrc/multimedia/ffmpeg6/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg6/Makefile.common:1.6 pkgsrc/multimedia/ffmpeg6/Makefile.common:1.7
--- pkgsrc/multimedia/ffmpeg6/Makefile.common:1.6       Sat Jan 27 02:53:01 2024
+++ pkgsrc/multimedia/ffmpeg6/Makefile.common   Sat Jan 27 02:54:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2024/01/27 02:53:01 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.7 2024/01/27 02:54:36 riastradh Exp $
 # used by multimedia/ffmpeg6/Makefile
 # used by multimedia/ffplay6/Makefile
 
@@ -45,10 +45,19 @@ CONFIGURE_ARGS+=    --target-os=${LOWER_OPS
 .  if ${MACHINE_ENDIAN} == "big"
 CONFIGURE_ENV+=                bigendian=yes
 .  endif
-.  if !empty(MACHINE_ARCH:Mpowerpc*)
+.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.
+# But passing -maltivec -mabi=altivec tells the compiler that _any_
+# code, whether or not gated on runtime detection, can be done with
+# altivec -- and the compiler will quietly take advantage of this,
+# e.g. to zero-initialize objects on the stack.  This doesn't work too
+# well on powerpc CPUs without altivec, so nix the arguments.
+.if !empty(MACHINE_ARCH:Mpowerpc*)
 BUILDLINK_TRANSFORM+=  rm:-maltivec
 BUILDLINK_TRANSFORM+=  rm:-mabi=altivec
-.  endif
 .endif
 
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)

Index: pkgsrc/multimedia/ffplay2/Makefile
diff -u pkgsrc/multimedia/ffplay2/Makefile:1.36 pkgsrc/multimedia/ffplay2/Makefile:1.37
--- pkgsrc/multimedia/ffplay2/Makefile:1.36     Mon Jan 22 13:17:01 2024
+++ pkgsrc/multimedia/ffplay2/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2024/01/22 13:17:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay2/}
-PKGREVISION=   6
+PKGREVISION=   7
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

Index: pkgsrc/multimedia/ffplay3/Makefile
diff -u pkgsrc/multimedia/ffplay3/Makefile:1.39 pkgsrc/multimedia/ffplay3/Makefile:1.40
--- pkgsrc/multimedia/ffplay3/Makefile:1.39     Mon Jan 22 13:17:01 2024
+++ pkgsrc/multimedia/ffplay3/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2024/01/22 13:17:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay3/}
-PKGREVISION=   9
+PKGREVISION=   10
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

Index: pkgsrc/multimedia/ffplay4/Makefile
diff -u pkgsrc/multimedia/ffplay4/Makefile:1.36 pkgsrc/multimedia/ffplay4/Makefile:1.37
--- pkgsrc/multimedia/ffplay4/Makefile:1.36     Mon Jan 22 13:17:02 2024
+++ pkgsrc/multimedia/ffplay4/Makefile  Sat Jan 27 02:54:36 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2024/01/22 13:17:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2024/01/27 02:54:36 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay4/}
-PKGREVISION=   4
+PKGREVISION=   5
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

Index: pkgsrc/multimedia/ffplay5/Makefile
diff -u pkgsrc/multimedia/ffplay5/Makefile:1.21 pkgsrc/multimedia/ffplay5/Makefile:1.22
--- pkgsrc/multimedia/ffplay5/Makefile:1.21     Sat Jan 27 02:10:35 2024
+++ pkgsrc/multimedia/ffplay5/Makefile  Sat Jan 27 02:54:37 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2024/01/27 02:10:35 riastradh Exp $
+# $NetBSD: Makefile,v 1.22 2024/01/27 02:54:37 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay5/}
-PKGREVISION=   2
+PKGREVISION=   3
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

Index: pkgsrc/multimedia/ffplay6/Makefile
diff -u pkgsrc/multimedia/ffplay6/Makefile:1.5 pkgsrc/multimedia/ffplay6/Makefile:1.6
--- pkgsrc/multimedia/ffplay6/Makefile:1.5      Mon Jan 22 13:17:02 2024
+++ pkgsrc/multimedia/ffplay6/Makefile  Sat Jan 27 02:54:37 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2024/01/22 13:17:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2024/01/27 02:54:37 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffplay6/}
-PKGREVISION=   1
+PKGREVISION=   2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Simple SDL frontend for FFmpeg

Prev by Date: CVS commit: pkgsrc/multimedia/ffmpeg6
Next by Date: CVS commit: pkgsrc/audio/mpg123
Previous by Thread: CVS commit: pkgsrc/multimedia/ffmpeg6
Next by Thread: CVS commit: pkgsrc/audio/mpg123
Indexes:

Home | Main Index | Thread Index | Old Index