Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Apr 2023 12:04:00 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: 89fef4d90408 - main - graphics/wdune: Move to FFmpeg 4
Message-ID:  <202304271204.33RC40Bs046180@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=89fef4d904086fa7d15c87885f6e59041f2c86a0

commit 89fef4d904086fa7d15c87885f6e59041f2c86a0
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-04-27 09:46:41 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-04-27 12:01:42 +0000

    graphics/wdune: Move to FFmpeg 4
    
    Fails to build with FFmpeg 6
    
    PR:             270212
    Approved by:    portmgr (blanket, build fix)
    Sponsored by:   Blinkinblox
---
 graphics/wdune/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/graphics/wdune/Makefile b/graphics/wdune/Makefile
index 404521d1654c..9f059cba4aff 100644
--- a/graphics/wdune/Makefile
+++ b/graphics/wdune/Makefile
@@ -18,19 +18,19 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libmpfr.so:math/mpfr \
 		libosdCPU.so:graphics/opensubdiv \
 		libpng.so:graphics/png \
-		libswresample.so:multimedia/ffmpeg
+		libswresample.so.3:multimedia/ffmpeg4
 
 USES=		compiler:c++11-lang gl jpeg motif sdl tar:bzip2 xorg
 USE_XORG=	x11 xft xi xmu xext xt
 USE_GL=		gl glu glut
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-optimization \
+CONFIGURE_ARGS=	--with-optimization \
 		--without-devil \
 		--with-cgalheaders \
 		--with-helpurl="${DOCSDIR}/index.html"
-CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 -D__FREEBSD__
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/ffmpeg4/include -I${LOCALBASE}/include/freetype2 -D__FREEBSD__
+LDFLAGS+=	-L${LOCALBASE}/ffmpeg4/lib -L${LOCALBASE}/lib
 
 CONFLICTS_INSTALL=	ocaml-dune
 



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