From nobody Tue Aug 09 16:19:38 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M2JDq1QHpz4YLqR; Tue, 9 Aug 2022 16:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M2JDq0lyCz4MrD; Tue, 9 Aug 2022 16:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660061979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DFpgLkTPM8EkeKDDpJQCyOeZJvCtCWt8FP3gWcErvns=; b=N0ExlcU5abE+90kyTvvjqgMlO8peLY//perf/ceb075njrjGtsqihhqZ2gVkqICSf4G67h 5QGPxLKYCbPjmTDImPrsdsJKb7HP7zJRSJEaroUC+UVhxQn6gqqyNHvaChFN57GDhUO1ss WkiI5zpdM/oSf1MQLSIOpUnEfvvGNjCZ5B6h7k0DixICuIjB0Bd9G+RTTKpgEwinwbyK+a WpidJlDiEpj6ZFxalHoVGVBjb5uWTaGcbeR9Jv7QdrYtrLIospj8ph7FhRuZq8YiI5gobx x9n8ZHetmZBR6iMdmLER/ET7iQiFyjbUb6oc3MTNSl69qASR91EZyyjfLSitHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M2JDp6p93zdB4; Tue, 9 Aug 2022 16:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 279GJcUC022038; Tue, 9 Aug 2022 16:19:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279GJcaE022037; Tue, 9 Aug 2022 16:19:38 GMT (envelope-from git) Date: Tue, 9 Aug 2022 16:19:38 GMT Message-Id: <202208091619.279GJcaE022037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 5768a81ec473 - main - multimedia/ffmpeg: group OPTIONS_DEFINE together after 8fb4d0364995 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5768a81ec4732e0a1a4fbdf3c620e0ac864079cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660061979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DFpgLkTPM8EkeKDDpJQCyOeZJvCtCWt8FP3gWcErvns=; b=Ww8d4WTvgNnqY8HwpIA6DarLSX1gtICEA66MAPDUjSxBOYDVjNcvZeF8yO9m8ueBqyqIcA E55CGSaymo+6+W+DaxPajMytetbhSTpDjSoV7I71NecKQ2gjXJ6hJzu/WkdR3yUBzK9g9L E2XtYx1D25fIKL6ODC4hGyXKxulq3ldBj6ceI3Kz0Moo987isXxvEfdDqy8y1XZ1bkL9QK rSevlK3S6ChttU3mmmLGV73AISRiZkuao1tRqzbenj0O26VH75Tr958GxGxsqSrz4CFId4 wrrDbtFrk4iiaHuHooJdSYERRomUYmFWLAf8HBZtxHWME/14FDTPe59FXwOVcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660061979; a=rsa-sha256; cv=none; b=fxhu3RTuF2BeeEF78PH/b+ptcRBHl3LLQnD8GuKNjjFyIuhuLj7xVrN3dAxmplYpcErE5X LWCNGtGA3L/fiukGBeChWfByV+AdiLPI/0de+/VPulCv4ixHSVwYfzIJCx3JHzSS8YoQsn QRYtC2gD3Y0i/HxdqzIbzKceU7on7z4euLDvuElRBwb3NWt23ImhTBfFVtJyS9QNFs/4Q9 X6dA2pKGvZGPyhEGKy+fhwv5t2++EceCHvlYym6YudWYNlxmeJi+3rPWJDOv82Oox2uuvo v1n31g40lDH80iuFeEGk40qIMMf7OP+5MJkGBYjdb5OntIB0UtIb8WniR5Ln3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5768a81ec4732e0a1a4fbdf3c620e0ac864079cf commit 5768a81ec4732e0a1a4fbdf3c620e0ac864079cf Author: Jan Beich AuthorDate: 2022-08-09 15:13:03 +0000 Commit: Jan Beich 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