Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Apr 2023 12:04:10 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e7617d92c598 - main - multimedia/motion: Move to FFmpeg 4
Message-ID:  <202304271204.33RC4A5r046363@gitrepo.freebsd.org>

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

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

commit e7617d92c598c78e58423cc26e7351815ac3fad2
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-04-27 10:16:02 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-04-27 12:01:43 +0000

    multimedia/motion: Move to FFmpeg 4
    
    Fails to build with FFmpeg 6
    
    PR:             270295
    Approved by:    270194
    Sponsored by:   Blinkinblox
---
 multimedia/motion/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 7db84987c47a..3ea18cac70c9 100644
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -28,6 +28,11 @@ USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 
+CFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
+LDFLAGS+=	-L${LOCALBASE}/ffmpeg4/lib
+CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
+MAKE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
+
 # Standard bsd.port.mk variables
 SUB_FILES=	pkg-message
 
@@ -55,8 +60,9 @@ VIDEO_DESC=		Video capture driver (Netcam support only if none selected)
 WEBCAMD_DESC=		Webcams using webcamd
 
 BKTR_CONFIGURE_WITH=	bktr
-FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
-FFMPEG_CONFIGURE_ON=	--with-ffmpeg=${LOCALBASE}
+
+FFMPEG_LIB_DEPENDS=	libavformat.so.58:multimedia/ffmpeg4
+FFMPEG_CONFIGURE_ON=	--with-ffmpeg=${LOCALBASE}/ffmpeg4
 FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
 
 MYSQL_USES=		mysql



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