git: a62d83a6772a - main - cad/opencascade*: Move to FFmpeg 4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Apr 2023 12:03:52 UTC
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a62d83a6772af22ab2d4542ac4ecf6aaac6d1a58 commit a62d83a6772af22ab2d4542ac4ecf6aaac6d1a58 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 09:24:43 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-04-27 12:01:41 +0000 cad/opencascade*: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270197 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- cad/opencascade/Makefile | 6 ++++-- cad/opencascade740/Makefile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b2155bf56e84..1dea4e5fb78a 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -86,9 +86,11 @@ OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \ VE=${PORTVERSION:R} VER=${DISTVERSION:C/-beta//} -FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON +FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON \ + -D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \ + -D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4 FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libtheoraenc.so:multimedia/libtheora \ libunistring.so:devel/libunistring \ libvdpau.so:multimedia/libvdpau \ diff --git a/cad/opencascade740/Makefile b/cad/opencascade740/Makefile index 72e9bf9d58b7..1b3e554f92b1 100644 --- a/cad/opencascade740/Makefile +++ b/cad/opencascade740/Makefile @@ -63,9 +63,11 @@ OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \ VE=${PORTVERSION:R:R} VER=${PORTVERSION} -FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON +FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON \ + -D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \ + -D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4 FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON -D3RDPARTY_FREETYPE_DIR=${LOCALBASE}