diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile index 5c18fbb38c86..96c7fcd72d67 100644 --- a/net/mediastreamer/Makefile +++ b/net/mediastreamer/Makefile @@ -1,98 +1,103 @@ PORTNAME= mediastreamer -PORTVERSION= 5.1.43 +DISTVERSION= 5.1.55 CATEGORIES= net MAINTAINER= bofh@FreeBSD.org COMMENT= Real-time audio and video streaming and processing LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \ libbzrtp.so:security/bzrtp \ libortp.so:net/ortp \ libspeexdsp.so:audio/speexdsp \ libsrtp2.so:net/libsrtp2 USES= cmake compiler gnome python:build sqlite USE_GITLAB= yes GL_SITE= https://gitlab.linphone.org/BC GL_ACCOUNT= public GL_PROJECT= ${PORTNAME}2 -GL_COMMIT= bdd96a6c47faeff1d88fff2bf64ec9274c0b2b9d +GL_COMMIT= a48ff7d92ddfdce17f47cf71b1867ed85fc826cd USE_GNOME= libxml2 USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ -DENABLE_ALSA=NO \ -DENABLE_BV16=NO \ -DENABLE_DOC=NO \ -DENABLE_JPEG=NO \ -DENABLE_OSS=YES \ -DENABLE_PULSEAUDIO=NO \ -DENABLE_STATIC=NO \ -DENABLE_STRICT=NO \ -DENABLE_TOOLS=NO \ -DENABLE_UNIT_TESTS=NO LDFLAGS+= -pthread OPTIONS_DEFINE= MATROSKA VIDEO -OPTIONS_DEFAULT= FFMPEG G729 GLX GSM MATROSKA OPUS SPEEX THEORA V4L \ - VIDEO VPX XVIDEO +OPTIONS_DEFAULT= FFMPEG G729 GLX GSM MATROSKA OPUS QTGL SPEEX THEORA \ + V4L VIDEO VPX XVIDEO OPTIONS_GROUP= AUDIOOPT VIDEOOPT OPTIONS_GROUP_AUDIOOPT= G726 G729 GSM OPUS SPEEX -OPTIONS_GROUP_VIDEOOPT= FFMPEG GLX THEORA V4L VPX XVIDEO +OPTIONS_GROUP_VIDEOOPT= FFMPEG GLX QTGL THEORA V4L VPX XVIDEO OPTIONS_SUB= yes AUDIOOPT_DESC= Audio options G726_DESC= G.726 codec support G729_DESC= G.729 codec support VIDEOOPT_DESC= Video options +QTGL_DESC= Qt OpenGL rendering support FFMPEG_IMPLIES= VIDEO FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG G726_LIB_DEPENDS= libspandsp.so:comms/spandsp G726_CMAKE_BOOL= ENABLE_G726 G729_LIB_DEPENDS= libbcg729.so:audio/bcg729 G729_CMAKE_BOOL= ENABLE_G729 GLX_IMPLIES= VIDEO GLX_USES= gl GLX_USE= GL=gl,glew GLX_CMAKE_BOOL= ENABLE_GL ENABLE_GLX GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CMAKE_BOOL= ENABLE_GSM MATROSKA_LIB_DEPENDS= libbcmatroska2.so:multimedia/bcmatroska2 MATROSKA_CMAKE_BOOL= ENABLE_MKV OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CMAKE_BOOL= ENABLE_OPUS +QTGL_IMPLIES= VIDEO +QTGL_USES= qt:5 +QTGL_USE= QT=core,declarative,gui,network,buildtools_build,qmake_build +QTGL_CMAKE_BOOL= ENABLE_QT_GL SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CMAKE_BOOL= ENABLE_SPEEX_CODEC THEORA_IMPLIES= VIDEO THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CMAKE_BOOL= ENABLE_THEORA V4L_IMPLIES= VIDEO V4L_BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CMAKE_BOOL= ENABLE_V4L VIDEO_CMAKE_BOOL= ENABLE_VIDEO VPX_IMPLIES= VIDEO VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CMAKE_BOOL= ENABLE_VPX XVIDEO_IMPLIES= VIDEO XVIDEO_USES= xorg XVIDEO_USE= XORG=x11,xorgproto,xv XVIDEO_CMAKE_BOOL= ENABLE_X11 ENABLE_XV XVIDEO_LDFLAGS= -L${LOCALBASE}/lib -lX11 .include post-patch: @${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \ ${WRKSRC}/cmake/FindGSM.cmake ${WRKSRC}/src/audiofilters/gsm.c .if ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} '/-Wno-format-truncation/d' ${WRKSRC}/CMakeLists.txt .endif .include diff --git a/net/mediastreamer/distinfo b/net/mediastreamer/distinfo index 1372c9d7af13..f8b16b92d768 100644 --- a/net/mediastreamer/distinfo +++ b/net/mediastreamer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655325691 -SHA256 (public-mediastreamer2-bdd96a6c47faeff1d88fff2bf64ec9274c0b2b9d_GL0.tar.gz) = 656e7dbb65d3f7b1773e178193f7d44226820d32b5cb6478afc89191e3d8a182 -SIZE (public-mediastreamer2-bdd96a6c47faeff1d88fff2bf64ec9274c0b2b9d_GL0.tar.gz) = 25309406 +TIMESTAMP = 1661322319 +SHA256 (public-mediastreamer2-a48ff7d92ddfdce17f47cf71b1867ed85fc826cd_GL0.tar.gz) = 68cd1a45af7d07774c830c8f0e545b3af1b98d80aca25f517434d01c793f44b0 +SIZE (public-mediastreamer2-a48ff7d92ddfdce17f47cf71b1867ed85fc826cd_GL0.tar.gz) = 25305400 diff --git a/net/mediastreamer/pkg-plist b/net/mediastreamer/pkg-plist index cb58ca82cfac..242af03464ac 100644 --- a/net/mediastreamer/pkg-plist +++ b/net/mediastreamer/pkg-plist @@ -1,85 +1,86 @@ include/OpenGL/EGL/egl.h include/OpenGL/EGL/eglext.h include/OpenGL/EGL/eglplatform.h include/OpenGL/GLES2/gl2.h include/OpenGL/GLES2/gl2ext.h include/OpenGL/GLES2/gl2platform.h include/OpenGL/GLES3/gl3.h include/OpenGL/GLES3/gl31.h include/OpenGL/GLES3/gl32.h include/OpenGL/GLES3/gl3platform.h include/OpenGL/KHR/khrplatform.h include/OpenGL/LICENSE include/OpenGL/README.md include/OpenGL/angle_windowsstore.h include/mediastreamer2/allfilters.h include/mediastreamer2/android_utils.h include/mediastreamer2/bitratecontrol.h include/mediastreamer2/bits_rw.h include/mediastreamer2/box-plot.h include/mediastreamer2/devices.h include/mediastreamer2/dsptools.h include/mediastreamer2/dtls_srtp.h include/mediastreamer2/dtmfgen.h include/mediastreamer2/flowcontrol.h include/mediastreamer2/formats.h include/mediastreamer2/ice.h include/mediastreamer2/mediastream.h include/mediastreamer2/ms_srtp.h include/mediastreamer2/msanalysedisplay.h include/mediastreamer2/msasync.h include/mediastreamer2/msaudiomixer.h include/mediastreamer2/mschanadapter.h include/mediastreamer2/mscodecutils.h include/mediastreamer2/mscommon.h include/mediastreamer2/msconference.h include/mediastreamer2/msequalizer.h include/mediastreamer2/mseventqueue.h include/mediastreamer2/msextdisplay.h include/mediastreamer2/msfactory.h include/mediastreamer2/msfileplayer.h include/mediastreamer2/msfilerec.h include/mediastreamer2/msfilter.h include/mediastreamer2/msgenericplc.h include/mediastreamer2/msinterfaces.h include/mediastreamer2/msitc.h include/mediastreamer2/msjava.h include/mediastreamer2/msjpegwriter.h include/mediastreamer2/msmediaplayer.h include/mediastreamer2/msmediarecorder.h include/mediastreamer2/msmire.h include/mediastreamer2/msogl.h include/mediastreamer2/msogl_functions.h include/mediastreamer2/mspcapfileplayer.h include/mediastreamer2/msqrcodereader.h include/mediastreamer2/msqueue.h include/mediastreamer2/msrtp.h include/mediastreamer2/msrtt4103.h include/mediastreamer2/mssndcard.h include/mediastreamer2/mstee.h include/mediastreamer2/msticker.h include/mediastreamer2/mstonedetector.h include/mediastreamer2/msudp.h include/mediastreamer2/msutils.h include/mediastreamer2/msv4l.h include/mediastreamer2/msvaddtx.h include/mediastreamer2/msvideo.h include/mediastreamer2/msvideoout.h include/mediastreamer2/msvideopresets.h include/mediastreamer2/msvideoqualitycontroller.h include/mediastreamer2/msvideoswitcher.h include/mediastreamer2/msvolume.h include/mediastreamer2/mswebcam.h include/mediastreamer2/qualityindicator.h include/mediastreamer2/rfc3984.h include/mediastreamer2/stun.h include/mediastreamer2/upnp_igd.h include/mediastreamer2/x11_helper.h include/mediastreamer2/zrtp.h lib/libmediastreamer.so lib/libmediastreamer.so.11 +%%QTGL%%lib/mediastreamer/plugins/libmsqogl.so share/Mediastreamer2/cmake/Mediastreamer2Config.cmake share/Mediastreamer2/cmake/Mediastreamer2ConfigVersion.cmake share/Mediastreamer2/cmake/Mediastreamer2Targets-%%CMAKE_BUILD_TYPE%%.cmake share/Mediastreamer2/cmake/Mediastreamer2Targets.cmake %%VIDEO%%share/images/nowebcamCIF.jpg