git: 5768a81ec473 - main - multimedia/ffmpeg: group OPTIONS_DEFINE together after 8fb4d0364995

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Tue, 09 Aug 2022 16:19:38 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5768a81ec4732e0a1a4fbdf3c620e0ac864079cf

commit 5768a81ec4732e0a1a4fbdf3c620e0ac864079cf
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-08-09 15:13:03 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-08-09 16:04:55 +0000

    multimedia/ffmpeg: group OPTIONS_DEFINE together after 8fb4d0364995
---
 multimedia/ffmpeg/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2d4955ad25e9..66d289f6cd0f 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -41,6 +41,9 @@ OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \
 		TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \
 		VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \
 		XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI
+# intel-media-sdk only for i386/amd64
+OPTIONS_DEFINE_amd64=	MFX
+OPTIONS_DEFINE_i386=	MFX
 
 OPTIONS_DEFAULT=	AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \
 			GNUTLS ICONV LAME LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \
@@ -50,10 +53,6 @@ OPTIONS_DEFAULT_amd64=	SVTAV1
 # i386 is too register-starved for LTO (PR257124)
 OPTIONS_EXCLUDE_i386=	LTO
 
-# intel-media-sdk only for i386/amd64
-OPTIONS_DEFINE_amd64=	MFX
-OPTIONS_DEFINE_i386=	MFX
-
 .if !exists(${.CURDIR:H:H}/multimedia/davs2)
 # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5985a1bf7233
 OPTIONS_EXCLUDE+=	DAVS2