net/mediastreamer: Update to 5.2.94

Approved by:		bofh (maintainer, by private message)
Differential Revision:	https://reviews.freebsd.org/D41227

8 files changed, 28 insertions, 21 deletions

diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 5414ab642426..2f526208019b 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mediastreamer
-DISTVERSION=	5.2.37
-PORTREVISION=	2
+DISTVERSION=	5.2.94
 CATEGORIES=	net
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -21,7 +20,6 @@ USE_GITLAB=	yes
 GL_SITE=	https://gitlab.linphone.org/BC
 GL_ACCOUNT=	public
 GL_PROJECT=	${PORTNAME}2
-GL_TAGNAME=	bd8ef7b1e5377c8c9598f8d53cac942deae6befc
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
diff --git a/net/mediastreamer/distinfo b/net/mediastreamer/distinfo
index 6c53d29b3b1c..2ba470d18dc5 100644
--- a/net/mediastreamer/distinfo
+++ b/net/mediastreamer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679147868
-SHA256 (public-mediastreamer2-bd8ef7b1e5377c8c9598f8d53cac942deae6befc_GL0.tar.gz) = 5a2265f2847001be85194894666cfdeec35be6af8e0322cf22230bfecd8da5eb
-SIZE (public-mediastreamer2-bd8ef7b1e5377c8c9598f8d53cac942deae6befc_GL0.tar.gz) = 25309923
+TIMESTAMP = 1690560106
+SHA256 (mediastreamer2-5.2.94.tar.bz2) = ae44d252f95c41e754960197a51a1b178d5fc04d2f5df574c3fd024359bb3c6c
+SIZE (mediastreamer2-5.2.94.tar.bz2) = 22833409
diff --git a/net/mediastreamer/files/patch-src-base-msfactory.c b/net/mediastreamer/files/patch-src-base-msfactory.c
index 04b25a942550..65cd155bb714 100644
--- a/net/mediastreamer/files/patch-src-base-msfactory.c
+++ b/net/mediastreamer/files/patch-src-base-msfactory.c
@@ -1,6 +1,6 @@
---- src/base/msfactory.c.orig	2022-06-10 12:50:07 UTC
+--- src/base/msfactory.c.orig	2023-07-27 14:00:34 UTC
 +++ src/base/msfactory.c
-@@ -20,11 +20,10 @@
+@@ -23,11 +23,10 @@
  #ifdef HAVE_CONFIG_H
  #include "mediastreamer-config.h"
  #include "gitversion.h"
@@ -13,7 +13,7 @@
  
  #ifndef MS2_GIT_VERSION
  #define MS2_GIT_VERSION "unknown"
-@@ -194,7 +193,7 @@ void ms_factory_init(MSFactory *obj){
+@@ -197,7 +196,7 @@ void ms_factory_init(MSFactory *obj){
  	GetNativeSystemInfo( &sysinfo );
  
  	num_cpu = sysinfo.dwNumberOfProcessors;
@@ -22,7 +22,7 @@
  	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;
-@@ -1156,4 +1155,3 @@ const MSList *ms_factory_get_filter_decs(const MSFacto
+@@ -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
index 23abb375018e..6d01141ba8b5 100644
--- a/net/mediastreamer/files/patch-src__audiofilters__oss.c
+++ b/net/mediastreamer/files/patch-src__audiofilters__oss.c
@@ -1,6 +1,6 @@
---- src/audiofilters/oss.c.orig	2017-04-06 09:27:56 UTC
+--- src/audiofilters/oss.c.orig	2023-07-27 14:00:34 UTC
 +++ src/audiofilters/oss.c
-@@ -37,95 +37,65 @@ MSFilter *ms_oss_read_new(MSSndCard *card);
+@@ -38,95 +38,65 @@ MSFilter *ms_oss_write_new(MSSndCard *card);
  MSFilter *ms_oss_write_new(MSSndCard *card);
  
  
@@ -129,7 +129,7 @@
  
  	/* start recording !!! Alex */
  	{
-@@ -135,7 +105,8 @@ static int configure_fd(int fd, int bits,int stereo, i
+@@ -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));
  	}
@@ -139,7 +139,7 @@
  	return fd;
  }
  
-@@ -156,23 +127,23 @@ typedef struct OssData{
+@@ -157,23 +128,23 @@ typedef struct OssData{
  	bool_t stereo;
  } OssData;
  
@@ -167,7 +167,7 @@
  	} else {
  		ms_error("Cannot open fd in wr mode for [%s]",d->pcmdev);
  	}
-@@ -327,61 +298,78 @@ static void * oss_thread(void *p){
+@@ -328,61 +299,78 @@ static void * oss_thread(void *p){
  	MSSndCard *card=(MSSndCard*)p;
  	OssData *d=(OssData*)card->data;
  	int bsize=0;
@@ -278,7 +278,7 @@
  	}
  	if (d->pcmfd_read==d->pcmfd_write && d->pcmfd_read>=0 ) {
  		close(d->pcmfd_read);
-@@ -509,10 +497,10 @@ static int set_nchannels(MSFilter *f, void *arg){
+@@ -510,10 +498,10 @@ static MSFilterMethod oss_methods[]={
  }
  
  static MSFilterMethod oss_methods[]={
diff --git a/net/mediastreamer/files/patch-src__utils__dsptools.c b/net/mediastreamer/files/patch-src__utils__dsptools.c
index d7b0753e5980..0b751c65241c 100644
--- a/net/mediastreamer/files/patch-src__utils__dsptools.c
+++ b/net/mediastreamer/files/patch-src__utils__dsptools.c
@@ -1,6 +1,6 @@
---- src/utils/dsptools.c.orig	2022-06-10 12:50:07 UTC
+--- src/utils/dsptools.c.orig	2023-07-27 14:00:34 UTC
 +++ src/utils/dsptools.c
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
  #ifdef HAVE_ALLOCA_H
  #include <alloca.h>
  #else
diff --git a/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c b/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c
new file mode 100644
index 000000000000..f8df3ce722a1
--- /dev/null
+++ b/net/mediastreamer/files/patch-src_videofilters_ffmpegjpegwriter.c
@@ -0,0 +1,10 @@
+--- src/videofilters/ffmpegjpegwriter.c.orig	2023-07-28 18:41:49 UTC
++++ src/videofilters/ffmpegjpegwriter.c
+@@ -213,6 +213,7 @@ static void jpg_process_frame_task(void *obj) {
+ 		freemsg(jpegm);
+ 	}
+ 
++end:
+ 	freemsg(m);
+ }
+ 
diff --git a/net/mediastreamer/files/patch-src_videofilters_mkv.cpp b/net/mediastreamer/files/patch-src_videofilters_mkv.cpp
index 8c12a9bfd23c..7063e607f8c0 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	2022-06-15 21:27:54 UTC
+--- src/videofilters/mkv.cpp.orig	2023-07-27 14:00:34 UTC
 +++ src/videofilters/mkv.cpp
-@@ -1645,7 +1645,7 @@ static matroska_block *matroska_write_block(Matroska *
+@@ -1647,7 +1647,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 7c3a357dd91e..34848fc7af76 100644
--- a/net/mediastreamer/pkg-plist
+++ b/net/mediastreamer/pkg-plist
@@ -68,7 +68,6 @@ include/mediastreamer2/msvideoout.h
 include/mediastreamer2/msvideopresets.h
 include/mediastreamer2/msvideoqualitycontroller.h
 include/mediastreamer2/msvideorouter.h
-include/mediastreamer2/msvideoswitcher.h
 include/mediastreamer2/msvolume.h
 include/mediastreamer2/mswebcam.h
 include/mediastreamer2/qualityindicator.h