FreeBSD Bugzilla – Attachment 241767 Details for
Bug 270314
net/mediastreamer: Fails to build with FFmpeg 6.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for mediastreamer
ffmpeg4-mediastreamer.patch (text/plain), 1.44 KB, created by
Daniel Engberg
on 2023-04-26 13:51:23 UTC
(
hide
)
Description:
Patch for mediastreamer
Filename:
MIME Type:
Creator:
Daniel Engberg
Created:
2023-04-26 13:51:23 UTC
Size:
1.44 KB
patch
obsolete
>diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile >index c8df780f67d3..8dac2aae79f2 100644 >--- a/net/mediastreamer/Makefile >+++ b/net/mediastreamer/Makefile >@@ -53,7 +53,7 @@ VIDEOOPT_DESC= Video options > QTGL_DESC= Qt OpenGL rendering support > > FFMPEG_IMPLIES= VIDEO >-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg >+FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 > FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG > G726_LIB_DEPENDS= libspandsp.so:comms/spandsp > G726_CMAKE_BOOL= ENABLE_G726 >@@ -97,6 +97,8 @@ XVIDEO_LDFLAGS= -L${LOCALBASE}/lib -lX11 > post-patch: > @${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \ > ${WRKSRC}/cmake/FindGSM.cmake ${WRKSRC}/src/audiofilters/gsm.c >+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ >+ ${PATCH_WRKSRC}/CMakeLists.txt > .if ${CHOSEN_COMPILER_TYPE} == gcc > @${REINPLACE_CMD} '/-Wno-format-truncation/d' ${WRKSRC}/CMakeLists.txt > .endif >diff --git a/net/mediastreamer/files/patch-CMakeLists.txt b/net/mediastreamer/files/patch-CMakeLists.txt >new file mode 100644 >index 000000000000..af4f8c14d640 >--- /dev/null >+++ b/net/mediastreamer/files/patch-CMakeLists.txt >@@ -0,0 +1,10 @@ >+--- CMakeLists.txt.orig 2023-04-25 11:15:51 UTC >++++ CMakeLists.txt >+@@ -260,6 +260,7 @@ if(ENABLE_VIDEO) >+ add_definitions(-DVIDEO_ENABLED) >+ endif() >+ if(ENABLE_FFMPEG) >++ set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") >+ find_package(FFMpeg REQUIRED) >+ else() >+ add_definitions(-DNO_FFMPEG)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 270314
: 241767