Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2023 14:07:57 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 94c3887a35b0 - main - multimedia/gstreamer1-libav: drop broken FFMPEG=off after e3b732b4791c
Message-ID:  <202303181407.32IE7vVq094672@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=94c3887a35b0154dd3eacfcbe6c05a419984d1e8

commit 94c3887a35b0154dd3eacfcbe6c05a419984d1e8
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-03-18 14:02:34 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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 <bsd.port.options.mk>
-
-.if empty(PORT_OPTIONS:MFFMPEG)
-LDFLAGS_aarch64=	-Wl,-z,notext
-.endif
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303181407.32IE7vVq094672>