From nobody Mon Aug 21 18:01:38 2023 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 4RV0fV4C61z4r75y; Mon, 21 Aug 2023 18:01:38 +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 4RV0fV3Wjqz4GKk; Mon, 21 Aug 2023 18:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640898; 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=Y14bSKNHoIe/6zMOCd9V3PCiaty/6WZkNQCJ0J9xh8w=; b=DXxnTKn1F7AqBoHLkL69/38aqvqRW22rnD/OTq3OqgSRfKtK24/q72DjiXKFinJNnN/fWT e2reCnT+ScDg2488rEVD6WYZV6tuO8EB0FopqeVDo3gJhdE+9fTSdn53vK4BBvDANUe7PU VpoMXy818ZPN+quHc8HBuFp8mv6ogJKimpMcA7k6S6oQQrypGZ02+jg/107FtfVFAxdhbL w62LCWJ2hdx7EKqH2rRAd1wpCMRxwjS2L87Y5GYer39vl5E6No+UzMQ216FT29EWytHh+y 51PgZEqQLmJrj9AfXDIIvp5jO9LNYyzaKR2NaUrd3CRMvGAbpkrhYA21m3RBnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692640898; 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=Y14bSKNHoIe/6zMOCd9V3PCiaty/6WZkNQCJ0J9xh8w=; b=QPR3l3Je8LNGP9OrWLL0sagfUxhVxJIj+NRXiHkMKZ7ts4htj/6rGrDVHYrmO2jxXd96TA eZ2gCXjeC1XZ6TniLkBGntAAvsDKpfYRvnQB5J4Dd/IvTmyCQtgvrxz+HMe3hSDIM9d1kH wLgO/QJjd99iA8xeMBsDWssGLQo3FvT5Qz55bBWTH1BzZLtTBFi21kKSyqnRRZXfkHzSym UzgFmSHfaG4JH81h7KR0CEJfA4/Gggt2u9wrCcH5E6TommSKUtIIbZRzrYtSnI/mlIOuns BxT8N+v9/jsyfzWJVtZf1BCOjHI22OMHGVNVqwyfd9AtZllnJKAwYAI09Fiovg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692640898; a=rsa-sha256; cv=none; b=rKK6ElM88RjbB7R9a8I0nZrJhEA45qN1a/KFbWM7aQ4EdniX/vZSU0yUuXkzzwKgeIcMtJ vOliXqIgesSb4C1eGl3wUt8OUmH5GTKcP4gZNYG0rRQyVky1pZoDswLf8RjT9NFKih4etX xzZOWTRRidwgZvMfPAK583ewdAxJaqhalcLNSk7CIYtASPAsXEc1mS0DpsoEmNbC8L0k0k ZKrN/qqIAGV7GuRKvWtzJMNtWHcfmU3crzEd1OMGV1lK2EVWu1vjTf/MflSx6JT8VqmNLE rPa41a8NA94YZ+X/EeywF6dHZLRhlJmUnaPT7nHy7Mcx/Y5kDTvDKiRZdZ2EwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RV0fV2bRZzWT1; Mon, 21 Aug 2023 18:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LI1clv094216; Mon, 21 Aug 2023 18:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LI1cJl094213; Mon, 21 Aug 2023 18:01:38 GMT (envelope-from git) Date: Mon, 21 Aug 2023 18:01:38 GMT Message-Id: <202308211801.37LI1cJl094213@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: dc0885f512ed - main - Mk/bsd.gecko.mk: update ffmpeg dependency after 685e477b 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc0885f512edc7c15207e4d13c6b762de3827004 Auto-Submitted: auto-generated The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc0885f512edc7c15207e4d13c6b762de3827004 commit dc0885f512edc7c15207e4d13c6b762de3827004 Author: Christoph Moench-Tegeder AuthorDate: 2023-08-21 17:59:57 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-08-21 17:59:57 +0000 Mk/bsd.gecko.mk: update ffmpeg dependency after 685e477b the esr-geckos only support the older ffmpeg --- Mk/bsd.gecko.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 0eb9c8b841c2..6f639b6928f1 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -239,7 +239,11 @@ MOZ_OPTIONS+= --disable-dbus . if ${PORT_OPTIONS:MFFMPEG} # dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp -RUN_DEPENDS+= ffmpeg>=0.8,1:multimedia/ffmpeg +. if ${MOZILLA_VER:R:R} < 112 +RUN_DEPENDS+= ffmpeg4>=4.4:multimedia/ffmpeg4 +. else +RUN_DEPENDS+= ffmpeg>=6.0,1:multimedia/ffmpeg +. endif . endif . if ${PORT_OPTIONS:MLIBPROXY}