CVS commit: pkgsrc/multimedia/ffmpeg5

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 26 03:17:31 UTC 2024

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

Log Message:
multimedia/ffmpeg5: Move cross-build stuff to Makefile.common.

ffplay5 cross-build needs this too.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg5/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg5/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/ffmpeg5/Makefile
diff -u pkgsrc/multimedia/ffmpeg5/Makefile:1.29 pkgsrc/multimedia/ffmpeg5/Makefile:1.30
--- pkgsrc/multimedia/ffmpeg5/Makefile:1.29     Fri Jan 26 03:17:07 2024
+++ pkgsrc/multimedia/ffmpeg5/Makefile  Fri Jan 26 03:17:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/01/26 03:17:07 riastradh Exp $
+# $NetBSD: Makefile,v 1.30 2024/01/26 03:17:31 riastradh Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg5/}
 PKGREVISION=   1
@@ -18,17 +18,6 @@ INSTALLATION_DIRS=   lib/ffmpeg5 share/doc
 CONFIGURE_ARGS+=       --enable-rpath
 .endif
 
-.if ${USE_CROSS_COMPILE:U:tl} == yes
-CONFIGURE_ARGS+=       --enable-cross-compile
-CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}
-CONFIGURE_ARGS+=       --host-ld=${NATIVE_CC:Q}
-CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS}
-.  include "../../mk/endian.mk"
-.  if ${MACHINE_ENDIAN} == "big"
-CONFIGURE_ENV+=                bigendian=yes
-.  endif
-.endif
-
 PRINT_PLIST_AWK+=      /html/ { $$0 = "$${PLIST.doc}" $$0 }
 
 TEST_TARGET=   check

Index: pkgsrc/multimedia/ffmpeg5/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg5/Makefile.common:1.8 pkgsrc/multimedia/ffmpeg5/Makefile.common:1.9
--- pkgsrc/multimedia/ffmpeg5/Makefile.common:1.8       Mon Nov 13 15:40:34 2023
+++ pkgsrc/multimedia/ffmpeg5/Makefile.common   Fri Jan 26 03:17:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2023/11/13 15:40:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2024/01/26 03:17:31 riastradh Exp $
 # used by multimedia/ffmpeg5/Makefile
 # used by multimedia/ffplay5/Makefile
 
@@ -34,6 +34,17 @@ CONFIGURE_ARGS+=     --libdir=${PREFIX}/lib/
 CONFIGURE_ARGS+=       --shlibdir=${PREFIX}/lib/ffmpeg5
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg5
 
+.if ${USE_CROSS_COMPILE:U:tl} == yes
+CONFIGURE_ARGS+=       --enable-cross-compile
+CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}
+CONFIGURE_ARGS+=       --host-ld=${NATIVE_CC:Q}
+CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS:Q}
+.  include "../../mk/endian.mk"
+.  if ${MACHINE_ENDIAN} == "big"
+CONFIGURE_ENV+=                bigendian=yes
+.  endif
+.endif
+
 .if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
 CONFIGURE_ARGS+=       --enable-opencl
 .endif