git: 8c506cacbf9e - main - net/mediastreamer: Update version 5.2.94=>5.4.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Mar 2025 09:18:04 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8c506cacbf9e29fecc654679054fd429d64ef490
commit 8c506cacbf9e29fecc654679054fd429d64ef490
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2025-03-26 21:47:39 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2025-03-27 09:17:06 +0000
net/mediastreamer: Update version 5.2.94=>5.4.2
Changelog: https://gitlab.linphone.org/BC/public/mediastreamer2/-/tags/5.4.2
Sponsored by: Cybermancer Infosec
---
net/mediastreamer/Makefile | 17 +-
net/mediastreamer/distinfo | 6 +-
net/mediastreamer/files/patch-CMakeLists.txt | 12 +-
net/mediastreamer/files/patch-cmake-FindGLX.cmake | 13 -
net/mediastreamer/files/patch-src-base-msfactory.c | 25 +-
.../files/patch-src__audiofilters__oss.c | 293 ---------------------
.../patch-src_videofilters_ffmpegjpegwriter.c | 6 +-
.../files/patch-src_videofilters_mkv.cpp | 4 +-
net/mediastreamer/pkg-plist | 20 +-
9 files changed, 51 insertions(+), 345 deletions(-)
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 5bd2297e5efd..50c19d64d9f0 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mediastreamer
-DISTVERSION= 5.2.94
-PORTREVISION= 2
+DISTVERSION= 5.4.2
CATEGORIES= net
MAINTAINER= bofh@FreeBSD.org
@@ -10,11 +9,11 @@ WWW= https://www.linphone.org/technical-corner/mediastreamer2
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
+BUILD_DEPENDS= ${LOCALBASE}/lib/libbctoolbox.a:net/bctoolbox \
+ ${LOCALBASE}/lib/libbcunit.a:devel/bcunit \
+ ${LOCALBASE}/lib/libbzrtp.a:security/bzrtp \
+ ${LOCALBASE}/lib/libortp.a:net/ortp
+LIB_DEPENDS= libsrtp2.so:net/libsrtp2
USES= cmake compiler gnome python:build sqlite
USE_GITLAB= yes
@@ -49,8 +48,8 @@ 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
+VIDEOOPT_DESC= Video options
FFMPEG_IMPLIES= VIDEO
FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4
@@ -65,7 +64,7 @@ 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_BUILD_DEPENDS= ${LOCALBASE}/lib/libbcmatroska2.a:multimedia/bcmatroska2
MATROSKA_CMAKE_BOOL= ENABLE_MKV
OPUS_LIB_DEPENDS= libopus.so:audio/opus
OPUS_CMAKE_BOOL= ENABLE_OPUS
diff --git a/net/mediastreamer/distinfo b/net/mediastreamer/distinfo
index 2ba470d18dc5..3ace08c5f3fc 100644
--- a/net/mediastreamer/distinfo
+++ b/net/mediastreamer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690560106
-SHA256 (mediastreamer2-5.2.94.tar.bz2) = ae44d252f95c41e754960197a51a1b178d5fc04d2f5df574c3fd024359bb3c6c
-SIZE (mediastreamer2-5.2.94.tar.bz2) = 22833409
+TIMESTAMP = 1743025301
+SHA256 (mediastreamer2-5.4.2.tar.bz2) = 0e5ed64d0280cecbe242885a969f7e87730d0d68223961057050b7bbb3a16b4f
+SIZE (mediastreamer2-5.4.2.tar.bz2) = 24020577
diff --git a/net/mediastreamer/files/patch-CMakeLists.txt b/net/mediastreamer/files/patch-CMakeLists.txt
index af4f8c14d640..0f08f4a5a4ba 100644
--- a/net/mediastreamer/files/patch-CMakeLists.txt
+++ b/net/mediastreamer/files/patch-CMakeLists.txt
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig 2023-04-25 11:15:51 UTC
+--- CMakeLists.txt.orig 2025-03-19 09:21:16 UTC
+++ CMakeLists.txt
-@@ -260,6 +260,7 @@ if(ENABLE_VIDEO)
+@@ -161,6 +161,7 @@ test_big_endian(WORDS_BIGENDIAN)
+ include(TestBigEndian)
+ test_big_endian(WORDS_BIGENDIAN)
+
++find_package(OpenSSL REQUIRED)
+ find_package(BCToolbox 5.3.0 REQUIRED OPTIONAL_COMPONENTS tester)
+ find_package(Ortp 5.3.0 REQUIRED)
+
+@@ -239,6 +240,7 @@ if(ENABLE_FFMPEG)
add_definitions(-DVIDEO_ENABLED)
endif()
if(ENABLE_FFMPEG)
diff --git a/net/mediastreamer/files/patch-cmake-FindGLX.cmake b/net/mediastreamer/files/patch-cmake-FindGLX.cmake
deleted file mode 100644
index 48c566f767bc..000000000000
--- a/net/mediastreamer/files/patch-cmake-FindGLX.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/FindGLX.cmake.orig 2017-04-06 09:27:56 UTC
-+++ cmake/FindGLX.cmake
-@@ -39,8 +39,8 @@ find_path(GLX_INCLUDE_DIRS
- PATH_SUFFIXES include
- )
- if(GLX_INCLUDE_DIRS)
-- check_include_file(GL/gl.h HAVE_GL_GL_H)
-- check_include_file(GL/glx.h HAVE_GL_GLX_H)
-+ check_include_file(GL/gl.h HAVE_GL_GL_H "-I${GLX_INCLUDE_DIRS}")
-+ check_include_file(GL/glx.h HAVE_GL_GLX_H "-I${GLX_INCLUDE_DIRS}")
- endif()
-
- find_library(GL_LIBRARY
diff --git a/net/mediastreamer/files/patch-src-base-msfactory.c b/net/mediastreamer/files/patch-src-base-msfactory.c
index 65cd155bb714..fef6060ad1e9 100644
--- a/net/mediastreamer/files/patch-src-base-msfactory.c
+++ b/net/mediastreamer/files/patch-src-base-msfactory.c
@@ -1,29 +1,24 @@
---- src/base/msfactory.c.orig 2023-07-27 14:00:34 UTC
+--- src/base/msfactory.c.orig 2025-03-26 19:56:49 UTC
+++ src/base/msfactory.c
@@ -23,11 +23,10 @@
#ifdef HAVE_CONFIG_H
- #include "mediastreamer-config.h"
#include "gitversion.h"
+ #include "mediastreamer-config.h"
-#else
+#endif
- # ifndef MEDIASTREAMER_VERSION
- # define MEDIASTREAMER_VERSION "unknown"
- # endif
+ #ifndef MEDIASTREAMER_VERSION
+ #define MEDIASTREAMER_VERSION "unknown"
+ #endif
-#endif
#ifndef MS2_GIT_VERSION
#define MS2_GIT_VERSION "unknown"
-@@ -197,7 +196,7 @@ void ms_factory_init(MSFactory *obj){
- GetNativeSystemInfo( &sysinfo );
+@@ -198,7 +197,7 @@ void ms_factory_init(MSFactory *obj) {
+ GetNativeSystemInfo(&sysinfo);
num_cpu = sysinfo.dwNumberOfProcessors;
-#elif __APPLE__ || __linux__
-+#elif __APPLE__ || __linux || __DragonFly__ || __FreeBSD__
- num_cpu = sysconf( _SC_NPROCESSORS_CONF); /*check the number of processors configured, not just the one that are currently active.*/
++#elif __APPLE__ || __linux__ || __DragonFly__ || __FreeBSD__
+ num_cpu = sysconf(_SC_NPROCESSORS_CONF); /*check the number of processors configured, not just the one that are
+ currently active.*/
#elif __QNX__
- num_cpu = _syspage_ptr->num_cpu;
-@@ -1166,4 +1165,3 @@ const MSList *ms_factory_get_filter_decs(const MSFacto
- const MSList *ms_factory_get_filter_decs(const MSFactory *factory) {
- return factory->desc_list;
- }
--
diff --git a/net/mediastreamer/files/patch-src__audiofilters__oss.c b/net/mediastreamer/files/patch-src__audiofilters__oss.c
deleted file mode 100644
index 6d01141ba8b5..000000000000
--- a/net/mediastreamer/files/patch-src__audiofilters__oss.c
+++ /dev/null
@@ -1,293 +0,0 @@
---- src/audiofilters/oss.c.orig 2023-07-27 14:00:34 UTC
-+++ src/audiofilters/oss.c
-@@ -38,95 +38,65 @@ MSFilter *ms_oss_write_new(MSSndCard *card);
- MSFilter *ms_oss_write_new(MSSndCard *card);
-
-
--static int configure_fd(int fd, int bits,int stereo, int rate, int *minsz)
-+static int configure_fd(int fd, int bits,int stereo, int rate, int *minsz, int *mindly)
- {
-- int p=0,cond=0;
-- int i=0;
-- int min_size=0,blocksize=512;
-+ int p=0;
-+ int min_size=0, blocksize=0;
-+ int smp_size = bits / 8;
- int err;
-
-- //g_message("opening sound device");
-- /* unset nonblocking mode */
-- /* We wanted non blocking open but now put it back to normal ; thanks Xine !*/
-- fcntl(fd, F_SETFL, fcntl(fd, F_GETFL)&~O_NONBLOCK);
-+ err = 1;
-+ ioctl(fd, FIONBIO, &err);
-
-- /* reset is maybe not needed but takes time*/
-- /*ioctl(fd, SNDCTL_DSP_RESET, 0); */
-+ switch (bits) {
-+ case 16:
-+ p=AFMT_S16_NE;
-+ break;
-+ default:
-+ close(fd);
-+ return (-1);
-+ }
-
-- p=AFMT_S16_NE;
--
- err=ioctl(fd,SNDCTL_DSP_SETFMT,&p);
- if (err<0){
- ms_warning("oss_open: can't set sample format:%s.",strerror(errno));
-+ close(fd);
-+ return (-1);
- }
-
--
-- p = bits; /* 16 bits */
-- err=ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &p);
-- if (err<0){
-- ms_warning("oss_open: can't set sample size to %i:%s.",bits,strerror(errno));
-- }
--
- p = rate; /* rate in khz*/
- err=ioctl(fd, SNDCTL_DSP_SPEED, &p);
-- if (err<0){
-+ if (err<0 || p != rate){
- ms_warning("oss_open: can't set sample rate to %i:%s.",rate,strerror(errno));
-+ close(fd);
-+ return (-1);
- }
-
- p = stereo; /* stereo or not */
- err=ioctl(fd, SNDCTL_DSP_STEREO, &p);
- if (err<0){
- ms_warning("oss_open: can't set mono/stereo mode:%s.",strerror(errno));
-+ close(fd);
-+ return (-1);
- }
-
-- if (rate==16000) blocksize=4096; /* oss emulation is not very good at 16khz */
-- else blocksize=blocksize*(rate/8000);
--
-- ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &min_size);
--
-- /**
-- * first try SNDCTL_DSP_SETFRAGMENT
-- */
-- if (min_size>blocksize) {
-- int size_selector=0;
-- int frag;
-- while ((blocksize >> size_selector) != 1)size_selector++; /*compute selector blocksize = 1<< size_selector*/
-- frag = (2 << 16) | (size_selector);
-- if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag) == -1) {
-- ms_warning("This OSS driver does not support trying SNDCTL_DSP_SETFRAGMENT");
-- ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &min_size);
--
-- /* try to subdivide BLKSIZE to reach block size if necessary */
-- if (min_size>blocksize)
-- {
-- cond=1;
-- p=min_size/blocksize;
-- while(cond)
-- {
-- i=ioctl(fd, SNDCTL_DSP_SUBDIVIDE, &p);
-- ms_message("subdivide bloc min_size [%i] block_size [%i] said error=%i,errno=%i\n",min_size,blocksize,i,errno);
-- if ((i!=0) || (p==1)) cond=0;
-- else p=p/2;
-- }
-- }
-- ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &min_size);
-- } else {
-- /*it's working*/
-- min_size=1 << (frag&0x0FFFF);
-- ms_message("Max fragment=%x, size selector=%x block size=%i",frag>>16,frag&0x0FFFF,min_size);
-- }
-+ err=ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &min_size);
-+ if (err<0){
-+ close(fd);
-+ return (-1);
- }
-
-- if (min_size>blocksize)
-- {
-- ms_warning("dsp block size set to %i.",min_size);
-- }else{
-- /* no need to access the card with less latency than needed*/
-- min_size=blocksize;
-+ /* compute a 20ms buffer by default */
-+ blocksize = (rate / 50) * smp_size;
-+ if (stereo) {
-+ blocksize *= 2;
-+ smp_size *= 2;
- }
-+ if (blocksize > min_size)
-+ blocksize = min_size;
-
- ms_message("/dev/dsp opened: rate=%i,bits=%i,stereo=%i blocksize=%i.",
-- rate,bits,stereo,min_size);
-+ rate,bits,stereo,blocksize);
-
- /* start recording !!! Alex */
- {
-@@ -136,7 +106,8 @@ static int configure_fd(int fd, int bits,int stereo, i
- res=ioctl(fd, SNDCTL_DSP_SETTRIGGER, &fl);
- if (res<0) ms_warning("OSS_TRIGGER: %s",strerror(errno));
- }
-- *minsz=min_size;
-+ *minsz=blocksize;
-+ *mindly = ((uint64_t)1000000 * (uint64_t)blocksize) / (uint64_t)(2 * rate * smp_size);
- return fd;
- }
-
-@@ -157,23 +128,23 @@ typedef struct OssData{
- bool_t stereo;
- } OssData;
-
--static void oss_open(OssData* d, int *minsz){
-+static void oss_open(OssData* d, int *minsz, int *mindly){
- int fd=open(d->pcmdev,O_RDWR|O_NONBLOCK);
- if (fd>0) {
-- d->pcmfd_read=d->pcmfd_write=configure_fd(fd, d->bits, d->stereo, d->rate, minsz);
-+ d->pcmfd_read=d->pcmfd_write=configure_fd(fd, d->bits, d->stereo, d->rate, minsz, mindly);
- return ;
- }
- ms_warning ("Cannot open a single fd in rw mode for [%s] trying to open two",d->pcmdev);
-
- d->pcmfd_read=open(d->pcmdev,O_RDONLY|O_NONBLOCK);
- if (d->pcmfd_read > 0) {
-- d->pcmfd_read=configure_fd(d->pcmfd_read, d->bits, d->stereo, d->rate, minsz);
-+ d->pcmfd_read=configure_fd(d->pcmfd_read, d->bits, d->stereo, d->rate, minsz, mindly);
- } else {
- ms_error("Cannot open fd in ro mode for [%s]",d->pcmdev);
- }
- d->pcmfd_write=open(d->pcmdev,O_WRONLY|O_NONBLOCK);
- if (d->pcmfd_write > 0) {
-- d->pcmfd_write=configure_fd(d->pcmfd_write, d->bits, d->stereo, d->rate, minsz);
-+ d->pcmfd_write=configure_fd(d->pcmfd_write, d->bits, d->stereo, d->rate, minsz, mindly);
- } else {
- ms_error("Cannot open fd in wr mode for [%s]",d->pcmdev);
- }
-@@ -328,61 +299,78 @@ static void * oss_thread(void *p){
- MSSndCard *card=(MSSndCard*)p;
- OssData *d=(OssData*)card->data;
- int bsize=0;
-- uint8_t *rtmpbuff=NULL;
-- uint8_t *wtmpbuff=NULL;
-+ int mindly=1000;
-+ uint8_t *tmpbuff;
- int err;
-- mblk_t *rm=NULL;
-- bool_t did_read=FALSE;
-
-- oss_open(d,&bsize);
-- if (d->pcmfd_read>=0){
-- rtmpbuff=(uint8_t*)alloca(bsize);
-- }
-- if (d->pcmfd_write>=0){
-- wtmpbuff=(uint8_t*)alloca(bsize);
-- }
-+ oss_open(d,&bsize,&mindly);
-+
-+ tmpbuff=(uint8_t*)alloca(bsize);
-+
- while(d->read_started || d->write_started){
-- did_read=FALSE;
-- if (d->pcmfd_read>=0){
-+ while (d->pcmfd_read>=0){
- if (d->read_started){
-- if (rm==NULL) rm=allocb(bsize,0);
-- err=read(d->pcmfd_read,rm->b_wptr,bsize);
-+ err=read(d->pcmfd_read,tmpbuff,bsize);
- if (err<0){
-- ms_warning("Fail to read %i bytes from soundcard: %s",
-- bsize,strerror(errno));
-- }else{
-- did_read=TRUE;
-+ if (errno != EWOULDBLOCK) {
-+ ms_warning("Fail to read %i bytes from soundcard: %s",
-+ bsize,strerror(errno));
-+ }
-+ break;
-+ }else if (err>0) {
-+ mblk_t *rm=allocb(err,0);
-+ memcpy(rm->b_wptr,tmpbuff,err);
- rm->b_wptr+=err;
- ms_mutex_lock(&d->mutex);
- putq(&d->rq,rm);
- ms_mutex_unlock(&d->mutex);
-- rm=NULL;
-+ } else {
-+ break;
- }
- }else {
- /* case where we have no reader filtern the read is performed for synchronisation */
-- int sz = read(d->pcmfd_read,rtmpbuff,bsize);
-- if( sz==-1) ms_warning("sound device read error %s ",strerror(errno));
-- else did_read=TRUE;
-+ int sz = read(d->pcmfd_read,tmpbuff,bsize);
-+ if(sz<0){
-+ ms_warning("sound device read error %s ",strerror(errno));
-+ break;
-+ }
- }
- }
-- if (d->pcmfd_write>=0){
-- if (d->write_started){
-- err=ms_bufferizer_read(d->bufferizer,wtmpbuff,bsize);
-+
-+ while (d->pcmfd_write>=0){
-+ struct audio_buf_info ai;
-+ int bufsize;
-+ if (ioctl(d->pcmfd_write, SNDCTL_DSP_GETOSPACE, &ai) < 0)
-+ break;
-+ bufsize = ai.fragstotal * ai.fragsize - ai.bytes;
-+ if (bufsize >= (2 * bsize)){
-+ /* wait for buffer to empty */
-+ break;
-+ }else if (d->write_started){
-+ ms_mutex_lock(&d->mutex);
-+ err=ms_bufferizer_read(d->bufferizer,tmpbuff,bsize);
-+ ms_mutex_unlock(&d->mutex);
- if (err==bsize){
-- err=write(d->pcmfd_write,wtmpbuff,bsize);
-+ err=write(d->pcmfd_write,tmpbuff,bsize);
- if (err<0){
- ms_warning("Fail to write %i bytes from soundcard: %s",
-- bsize,strerror(errno));
-+ bsize,strerror(errno));
-+ break;
- }
-+ } else {
-+ break;
- }
- }else {
- int sz;
-- memset(wtmpbuff,0,bsize);
-- sz = write(d->pcmfd_write,wtmpbuff,bsize);
-- if( sz!=bsize) ms_warning("sound device write returned %i !",sz);
-+ memset(tmpbuff,0,bsize);
-+ sz = write(d->pcmfd_write,tmpbuff,bsize);
-+ if(sz!=bsize) {
-+ ms_warning("sound device write returned %i !",sz);
-+ break;
-+ }
- }
- }
-- if (!did_read) usleep(20000); /*avoid 100%cpu loop for nothing*/
-+ usleep(mindly);
- }
- if (d->pcmfd_read==d->pcmfd_write && d->pcmfd_read>=0 ) {
- close(d->pcmfd_read);
-@@ -510,10 +498,10 @@ static MSFilterMethod oss_methods[]={
- }
-
- static MSFilterMethod oss_methods[]={
-- { MS_FILTER_SET_SAMPLE_RATE , set_rate },
-+ { MS_FILTER_SET_SAMPLE_RATE , set_rate },
- { MS_FILTER_GET_SAMPLE_RATE , get_rate },
- { MS_FILTER_SET_NCHANNELS , set_nchannels },
-- { 0 , NULL }
-+ { 0 , NULL }
- };
-
- MSFilterDesc oss_read_desc={
diff --git a/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c b/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c
index f8df3ce722a1..b3f7cdf13fee 100644
--- a/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c
+++ b/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c
@@ -1,10 +1,10 @@
---- src/videofilters/ffmpegjpegwriter.c.orig 2023-07-28 18:41:49 UTC
+--- src/videofilters/ffmpegjpegwriter.c.orig 2025-03-19 09:21:16 UTC
+++ src/videofilters/ffmpegjpegwriter.c
-@@ -213,6 +213,7 @@ static void jpg_process_frame_task(void *obj) {
+@@ -211,6 +211,7 @@ static bool_t jpg_process_frame_task(void *obj) {
freemsg(jpegm);
}
+end:
freemsg(m);
+ return TRUE;
}
-
diff --git a/net/mediastreamer/files/patch-src_videofilters_mkv.cpp b/net/mediastreamer/files/patch-src_videofilters_mkv.cpp
index 7063e607f8c0..e531a67f1090 100644
--- a/net/mediastreamer/files/patch-src_videofilters_mkv.cpp
+++ b/net/mediastreamer/files/patch-src_videofilters_mkv.cpp
@@ -1,6 +1,6 @@
---- src/videofilters/mkv.cpp.orig 2023-07-27 14:00:34 UTC
+--- src/videofilters/mkv.cpp.orig 2025-03-23 22:01:21 UTC
+++ src/videofilters/mkv.cpp
-@@ -1647,7 +1647,7 @@ static matroska_block *matroska_write_block(Matroska *
+@@ -1690,7 +1690,7 @@ static matroska_block *matroska_write_block(Matroska *
codecPrivateElt = (ebml_binary *)EBML_MasterAddElt(blockGroup, &MATROSKA_ContextCodecState, FALSE);
EBML_BinarySetData(codecPrivateElt, codecPrivateData, codecPrivateDataSize);
}
diff --git a/net/mediastreamer/pkg-plist b/net/mediastreamer/pkg-plist
index 34848fc7af76..dff5c40ee926 100644
--- a/net/mediastreamer/pkg-plist
+++ b/net/mediastreamer/pkg-plist
@@ -14,6 +14,7 @@ include/OpenGL/README.md
include/OpenGL/angle_windowsstore.h
include/mediastreamer2/allfilters.h
include/mediastreamer2/android_utils.h
+include/mediastreamer2/baudot.h
include/mediastreamer2/bitratecontrol.h
include/mediastreamer2/bits_rw.h
include/mediastreamer2/box-plot.h
@@ -50,11 +51,13 @@ include/mediastreamer2/msmediarecorder.h
include/mediastreamer2/msmire.h
include/mediastreamer2/msogl.h
include/mediastreamer2/msogl_functions.h
+include/mediastreamer2/mspacketrouter.h
include/mediastreamer2/mspcapfileplayer.h
include/mediastreamer2/msqrcodereader.h
include/mediastreamer2/msqueue.h
include/mediastreamer2/msrtp.h
include/mediastreamer2/msrtt4103.h
+include/mediastreamer2/msscreensharing.h
include/mediastreamer2/mssndcard.h
include/mediastreamer2/mstee.h
include/mediastreamer2/msticker.h
@@ -67,7 +70,6 @@ include/mediastreamer2/msvideo.h
include/mediastreamer2/msvideoout.h
include/mediastreamer2/msvideopresets.h
include/mediastreamer2/msvideoqualitycontroller.h
-include/mediastreamer2/msvideorouter.h
include/mediastreamer2/msvolume.h
include/mediastreamer2/mswebcam.h
include/mediastreamer2/qualityindicator.h
@@ -76,11 +78,19 @@ 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
+lib/libmediastreamer2.a
+lib/mediastreamer/plugins/libmsqogl.a
+share/Mediastreamer2/cmake/FindFFMpeg.cmake
+share/Mediastreamer2/cmake/FindGSM.cmake
+share/Mediastreamer2/cmake/FindOpus.cmake
+share/Mediastreamer2/cmake/FindSRTP.cmake
+share/Mediastreamer2/cmake/FindSpeex.cmake
+share/Mediastreamer2/cmake/FindSpeexDSP.cmake
+share/Mediastreamer2/cmake/FindTheora.cmake
+share/Mediastreamer2/cmake/FindV4L.cmake
+share/Mediastreamer2/cmake/FindVPX.cmake
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
+share/images/nowebcamCIF.jpg