From nobody Sat Mar 18 14:07:57 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 4Pf2rs22DZz3ycZq; Sat, 18 Mar 2023 14:07:57 +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 4Pf2rs1Wjzz4G6g; Sat, 18 Mar 2023 14:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679148477; 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=v+9xB4rrD1vyCypF3Sb4+X2344B5LGBJUgaqXUyUztA=; b=CuJnWYC8mLDhP6FJk1dAaVpd03piG6ioCGOYTIZGpr4ieLBg0LEB7hJSFNLoQNase93NuO JnDSk2abWTW7vKjuET5FLQd1W0RbEMUflg03Pn+GxMuwYs4sNSRmIoaY4ThAMIicPpNiYT KDXR+sEjBN6rtDgFpnAmz3Z1jSSyE5HhGfToNjN8jiEwgZ2eBvCNjq8H6ENEBFwNg8ONos gse9NJuXmFYR6+LrNgc4co/CB44lwI6Upm8Govj7mKbipPHy/ev43niG3RT7eXoMCGg7K3 OXrol1UidQqX7zAIoZn5IB3EUIjVny17Z2JI0iFfVv8K1gPMbHWc0xPbBOprTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679148477; 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=v+9xB4rrD1vyCypF3Sb4+X2344B5LGBJUgaqXUyUztA=; b=Nnq55N3z2hEudTZogb+2p1xX1Ncgat1vk4mgqKBaHS7p+tgDHpNnfIk8BCITfrGD5f8vy+ eh0mPP9qwQytLLKtwRixC7cBiML6QxBlRHFByla3Xk0BUCtkAqoRFgccnL+PjMN25smK8I M8eN7vfGMt6BuBkfTMHNU0gZN60iBgxKxktsZiZ7SQtmb3wFv2BLtTyOMDfXck19lpcE0y zxG30dXyClekIucxy6W+P+mqa1FEpXausaa5IsF5QiUN/17XsBm2pe35bO20+k/4l8k/pF Z2CXBHkWYtg9OmqUcA06VwU3WZCrowHTwSEQR64Q1vV/j1hlb3BbuKIV/pg5/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679148477; a=rsa-sha256; cv=none; b=g9j01vTb5eMWS4/kIplMiHWW2AInYBOW5yEuPnDBVAe0hNxa5Ug5jImwznvcdTCwGeU6oB zve1TfLCFAP4U2Gg4Sp//6Y4kr8a9k9vVtmAqP+KIwhQ/cmTHuqG4EBMyEshXJ04buP6gf 3aq3Xtpp9V08JS8bg5GZJJxkfsCbsjv7ABOAa6PGKtLPlVNgkMx6KLNaidYuXm5l//miwY rvGkAfVPcuR1mqFbkMKMRIY3kWUqlhZ9EnCZmhlKIrtT4QMIVHGQ372yDB9fakPY1TjFVi 7iw6UI5djPXcU7iG48vEsnLaZIP2P7/Dq+PFjakYa27lrIkLmTahkvG77Co6og== 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 4Pf2rs0b8Tz18jF; Sat, 18 Mar 2023 14:07:57 +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 32IE7vEP094673; Sat, 18 Mar 2023 14:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32IE7vVq094672; Sat, 18 Mar 2023 14:07:57 GMT (envelope-from git) Date: Sat, 18 Mar 2023 14:07:57 GMT Message-Id: <202303181407.32IE7vVq094672@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: 94c3887a35b0 - main - multimedia/gstreamer1-libav: drop broken FFMPEG=off after e3b732b4791c 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: 94c3887a35b0154dd3eacfcbe6c05a419984d1e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=94c3887a35b0154dd3eacfcbe6c05a419984d1e8 commit 94c3887a35b0154dd3eacfcbe6c05a419984d1e8 Author: Jan Beich AuthorDate: 2023-03-18 14:02:34 +0000 Commit: Jan Beich CommitDate: 2023-03-18 14:07:48 +0000 multimedia/gstreamer1-libav: drop broken FFMPEG=off after e3b732b4791c meson.build:21:0: ERROR: Neither a subproject directory nor a FFmpeg.wrap file was found. This reverts commit 15b98e4752ce0e01d31d21102fa325f30ae59668. --- multimedia/gstreamer1-libav/Makefile | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile index 69c00c29f4d0..ab189229e585 100644 --- a/multimedia/gstreamer1-libav/Makefile +++ b/multimedia/gstreamer1-libav/Makefile @@ -12,7 +12,8 @@ LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= orc>=0.4.16:devel/orc -LIB_DEPENDS= liborc-0.4.so:devel/orc +LIB_DEPENDS= liborc-0.4.so:devel/orc \ + libavcodec.so:multimedia/ffmpeg PORTSCOUT= limitw:1,even @@ -22,19 +23,4 @@ USE_GNOME= glib20 BINARY_ALIAS= python3=${PYTHON_VERSION} -OPTIONS_DEFINE= FFMPEG -OPTIONS_DEFAULT=FFMPEG - -FFMPEG_DESC?= Use system ffmpeg instead of internal libav -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -FFMPEG_BUILD_DEPENDS_OFF= nasm:devel/nasm -FFMPEG_MAKE_ENV_OFF= V=1 -FFMPEG_VARS_OFF+= NOPRECIOUSMAKEVARS=yes # ARCH - -.include - -.if empty(PORT_OPTIONS:MFFMPEG) -LDFLAGS_aarch64= -Wl,-z,notext -.endif - .include