CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Nov  9 16:31:18 UTC 2023

Modified Files:
        pkgsrc/multimedia/ffmpeg2: Makefile Makefile.common options.mk
        pkgsrc/multimedia/ffmpeg3: Makefile options.mk
        pkgsrc/multimedia/ffmpeg4: Makefile options.mk
        pkgsrc/multimedia/ffmpeg5: Makefile options.mk
        pkgsrc/multimedia/ffmpeg6: Makefile options.mk

Log Message:
ffmpeg[2-6]: Fixes for Darwin/powerpc.

- Do not universally --enable-rpath (it might not be supported)

- Limit nasm dependency to x86.

- Do not enable X11 as a default option.
  This isn't technically a fix, just a sensemaking improvement.
  X11 support in ffmpeg is used to capture video from an X display,
  Darwin users are unlikely to be running an X server as their primary
  display.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.91 -r1.92 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.80 -r1.81 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/ffmpeg4/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/multimedia/ffmpeg5/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg5/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg6/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ffmpeg6/options.mk

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.91 pkgsrc/multimedia/ffmpeg2/Makefile:1.92
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.91     Wed Nov  8 13:20:14 2023
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Thu Nov  9 16:31:18 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2023/11/08 13:20:14 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2023/11/09 16:31:18 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=   11
+PKGREVISION=   12
 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.66 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.67
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.66      Tue Jun  6 12:41:59 2023
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Thu Nov  9 16:31:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2023/06/06 12:41:59 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.67 2023/11/09 16:31:18 nia Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -63,8 +63,10 @@ SUBST_SED.sunwspro+= -e "s/-std=c99/-xc9
 SUBST_SED.sunwspro+=   -e "s/-Wl,-rpath-link,/-L /g"
 .endif
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 #TOOL_DEPENDS+=        yasm>=0.7.2:../../devel/yasm
 TOOL_DEPENDS+=         nasm>=2.13:../../devel/nasm
+.endif
 
 REPLACE_PERL+= doc/texi2pod.pl
 REPLACE_SH+=   configure version.sh

Index: pkgsrc/multimedia/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.21 pkgsrc/multimedia/ffmpeg2/options.mk:1.22
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.21   Fri Sep 30 07:38:28 2022
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Thu Nov  9 16:31:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2022/09/30 07:38:28 adam Exp $
+# $NetBSD: options.mk,v 1.22 2023/11/09 16:31:18 nia Exp $
 
 # Global and legacy options
 
@@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS=        ass bluray doc fa
                        lame libvpx opencore-amr opus pulseaudio rtmp \
                        speex theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \
-                       opus speex theora vorbis x11 x264 x265 xvid
+                       opus speex theora vorbis x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
 
@@ -33,6 +33,10 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=        vaapi
 .endif
 
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=        x11
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # Fontconfig

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.91 pkgsrc/multimedia/ffmpeg3/Makefile:1.92
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.91     Wed Nov  8 13:20:15 2023
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Thu Nov  9 16:31:18 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2023/11/08 13:20:15 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2023/11/09 16:31:18 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=   13
+PKGREVISION=   14
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v3.x)
@@ -9,7 +9,6 @@ COMMENT=        Decoding, encoding and streamin
 CONFIGURE_ARGS+=       --enable-avfilter
 CONFIGURE_ARGS+=       --enable-avresample
 CONFIGURE_ARGS+=       --enable-postproc
-CONFIGURE_ARGS+=       --enable-rpath
 CONFIGURE_ARGS+=       --disable-ffplay
 
 INSTALLATION_DIRS=     lib/ffmpeg3 share/doc/ffmpeg3 share/examples/ffmpeg3
@@ -19,6 +18,10 @@ CONF_FILES+= ${PREFIX}/share/examples/ff
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${_USE_RPATH:tl} != "no"
+CONFIGURE_ARGS+=       --enable-rpath
+.endif
+
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ARGS+=       --enable-cross-compile
 CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.21 pkgsrc/multimedia/ffmpeg3/options.mk:1.22
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.21   Fri Sep 30 07:21:46 2022
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Thu Nov  9 16:31:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2022/09/30 07:21:46 adam Exp $
+# $NetBSD: options.mk,v 1.22 2023/11/09 16:31:18 nia Exp $
 
 # Global and legacy options
 
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS=        ass bluray doc fd
                        lame libvpx opencore-amr opus pulseaudio rpi rtmp \
                        speex tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \
-                       opus speex theora vorbis x11 x264 x265 xvid
+                       opus speex theora vorbis x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
 
@@ -31,6 +31,10 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=        vaapi
 .endif
 
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=        x11
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # Fontconfig

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.80 pkgsrc/multimedia/ffmpeg4/Makefile:1.81
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.80     Wed Nov  8 13:20:15 2023
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Thu Nov  9 16:31:18 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2023/11/08 13:20:15 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2023/11/09 16:31:18 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   4
+PKGREVISION=   5
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)
@@ -9,13 +9,16 @@ COMMENT=      Decoding, encoding and streamin
 CONFIGURE_ARGS+=       --enable-avfilter
 CONFIGURE_ARGS+=       --enable-avresample
 CONFIGURE_ARGS+=       --enable-postproc
-CONFIGURE_ARGS+=       --enable-rpath
 CONFIGURE_ARGS+=       --disable-ffplay
 
 INSTALLATION_DIRS=     lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${_USE_RPATH:tl} != "no"
+CONFIGURE_ARGS+=       --enable-rpath
+.endif
+
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ARGS+=       --enable-cross-compile
 CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.18 pkgsrc/multimedia/ffmpeg4/options.mk:1.19
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.18   Tue Sep 27 20:57:54 2022
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Thu Nov  9 16:31:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2022/09/27 20:57:54 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2023/11/09 16:31:18 nia Exp $
 
 # Global and legacy options
 
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS=        ass av1 bluray do
                        lame libvpx libwebp opencore-amr opus pulseaudio rpi rtmp \
                        speex tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= ass av1 bluray freetype fontconfig gnutls lame \
-                       libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid
+                       libvpx libwebp opus speex theora vorbis x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
 
@@ -30,6 +30,10 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=        vaapi
 .endif
 
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=        x11
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # Fontconfig

Index: pkgsrc/multimedia/ffmpeg5/Makefile
diff -u pkgsrc/multimedia/ffmpeg5/Makefile:1.24 pkgsrc/multimedia/ffmpeg5/Makefile:1.25
--- pkgsrc/multimedia/ffmpeg5/Makefile:1.24     Wed Nov  8 13:20:15 2023
+++ pkgsrc/multimedia/ffmpeg5/Makefile  Thu Nov  9 16:31:18 2023
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.24 2023/11/08 13:20:15 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/11/09 16:31:18 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg5/}
-PKGREVISION=   6
+PKGREVISION=   7
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v5.x)
 
 CONFIGURE_ARGS+=       --enable-avfilter
 CONFIGURE_ARGS+=       --enable-postproc
-CONFIGURE_ARGS+=       --enable-rpath
 CONFIGURE_ARGS+=       --disable-ffplay
 
 INSTALLATION_DIRS=     lib/ffmpeg5 share/doc/ffmpeg5
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${_USE_RPATH:tl} != "no"
+CONFIGURE_ARGS+=       --enable-rpath
+.endif
+
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ARGS+=       --enable-cross-compile
 CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}

Index: pkgsrc/multimedia/ffmpeg5/options.mk
diff -u pkgsrc/multimedia/ffmpeg5/options.mk:1.6 pkgsrc/multimedia/ffmpeg5/options.mk:1.7
--- pkgsrc/multimedia/ffmpeg5/options.mk:1.6    Fri Mar 10 21:40:28 2023
+++ pkgsrc/multimedia/ffmpeg5/options.mk        Thu Nov  9 16:31:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/03/10 21:40:28 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2023/11/09 16:31:18 nia Exp $
 
 # Global and legacy options
 
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS=        ass aom bluray do
                        lame libvpx libwebp opencore-amr opus pulseaudio rav1e rpi rtmp \
                        speex tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= ass aom bluray freetype fontconfig gnutls lame \
-                       libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid
+                       libvpx libwebp opus speex theora vorbis x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS=       av1:aom
 
@@ -30,6 +30,10 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=        vaapi
 .endif
 
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=        x11
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # Fontconfig

Index: pkgsrc/multimedia/ffmpeg6/Makefile
diff -u pkgsrc/multimedia/ffmpeg6/Makefile:1.5 pkgsrc/multimedia/ffmpeg6/Makefile:1.6
--- pkgsrc/multimedia/ffmpeg6/Makefile:1.5      Wed Nov  8 13:20:15 2023
+++ pkgsrc/multimedia/ffmpeg6/Makefile  Thu Nov  9 16:31:18 2023
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.5 2023/11/08 13:20:15 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2023/11/09 16:31:18 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg6/}
-PKGREVISION=   4
+PKGREVISION=   5
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v6.x)
 
 CONFIGURE_ARGS+=       --enable-avfilter
 CONFIGURE_ARGS+=       --enable-postproc
-CONFIGURE_ARGS+=       --enable-rpath
 CONFIGURE_ARGS+=       --disable-ffplay
 
 INSTALLATION_DIRS=     lib/ffmpeg6 share/doc/ffmpeg6
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${_USE_RPATH:tl} != "no"
+CONFIGURE_ARGS+=       --enable-rpath
+.endif
+
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 CONFIGURE_ARGS+=       --enable-cross-compile
 CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}

Index: pkgsrc/multimedia/ffmpeg6/options.mk
diff -u pkgsrc/multimedia/ffmpeg6/options.mk:1.1 pkgsrc/multimedia/ffmpeg6/options.mk:1.2
--- pkgsrc/multimedia/ffmpeg6/options.mk:1.1    Fri Jun  2 16:44:06 2023
+++ pkgsrc/multimedia/ffmpeg6/options.mk        Thu Nov  9 16:31:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2023/06/02 16:44:06 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2023/11/09 16:31:18 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ffmpeg6
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS=  ass aom bluray do
                        lame libvpx libwebp opencore-amr opus pulseaudio rav1e rpi rtmp \
                        speex tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS= ass aom bluray freetype fontconfig gnutls lame \
-                       libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid
+                       libvpx libwebp opus speex theora vorbis x264 x265 xvid
 
 PLIST_VARS+=           doc
 
@@ -26,6 +26,10 @@ PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=        vaapi
 .endif
 
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=        x11
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 # Fontconfig