Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package mediastreamer2 for openSUSE:Factory 
checked in at 2024-03-14 17:44:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old)
 and      /work/SRC/openSUSE:Factory/.mediastreamer2.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mediastreamer2"

Thu Mar 14 17:44:55 2024 rev:71 rq:1157865 version:5.3.26

Changes:
--------
--- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes    
2024-02-23 16:47:43.320542212 +0100
+++ /work/SRC/openSUSE:Factory/.mediastreamer2.new.1905/mediastreamer2.changes  
2024-03-14 17:46:23.820333740 +0100
@@ -1,0 +2,5 @@
+Thu Mar  7 07:02:26 UTC 2024 - Paolo Stivanin <[email protected]>
+
+- Update to 5.3.26 (no changelog).
+
+-------------------------------------------------------------------
@@ -4,0 +10,18 @@
+
+-------------------------------------------------------------------
+Mon Jan 15 09:16:41 UTC 2024 - Paolo Stivanin <[email protected]>
+
+- Update to 5.3.7:
+  ADDED:
+    * AV1 codec added
+    * SRTP GCM mode
+    * Add MS_FILTER_IS_HW_ACCELERATED MSFilter flag to advertise 
hw-accelerated codecs
+    * Dummy codec, to avoid fatal errors when a encoder/decoder is not 
available
+    * Double SRTP encryption (experimental)
+  CHANGED:
+    * Removed legacy platform abstraction code, now provided by bctoolbox.
+    * Various optimisations for video processing on Android platform
+  FIXED:
+    * Fix buffer overflow in GenericPLC filter.
+    * Issue with H264 decoding of malformed RTP streams
+- Rebase patches.

Old:
----
  mediastreamer2-5.2.98.tar.bz2

New:
----
  mediastreamer2-5.3.26.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mediastreamer2.spec ++++++
--- /var/tmp/diff_new_pack.CTw6Hf/_old  2024-03-14 17:46:25.028378173 +0100
+++ /var/tmp/diff_new_pack.CTw6Hf/_new  2024-03-14 17:46:25.028378173 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mediastreamer2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,8 @@
 #
 
 
-%define sobase  libmediastreamer
-%define sover   11
-
 Name:           mediastreamer2
-Version:        5.2.98
+Version:        5.3.26
 Release:        0
 Summary:        Audio/Video real-time streaming
 License:        AGPL-3.0-or-later
@@ -34,12 +31,12 @@
 %if 0%{?suse_version} >= 1600
 BuildRequires:  liboqs-devel
 # At the time of writing (22/Dec/2023), PQCE is only available on Tumbleweed.
-BuildRequires:  postquantumcryptoengine-devel
+BuildRequires:  postquantumcryptoengine-devel >= 5.3.0~git.20230802
 %endif
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  bcmatroska2-devel >= 0.23
 BuildRequires:  broadvoice16-devel
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.22
 BuildRequires:  doxygen
 BuildRequires:  gawk
 BuildRequires:  gcc-c++
@@ -88,15 +85,6 @@
 streaming and processing. It is written in pure C and based upon the
 oRTP library.
 
-%package -n %{sobase}%{sover}
-Summary:        Audio/video real-time streaming library, base part
-Group:          System/Libraries
-
-%description -n %{sobase}%{sover}
-Mediastreamer2 is a library to make audio and video real-time
-streaming and processing. It is written in pure C and based upon the
-oRTP library.
-
 %package doc
 Summary:        Documentation for the mediastreamer2 library
 Group:          Documentation/HTML
@@ -113,7 +101,6 @@
 Summary:        Headers and libraries for the mediastreamer2 library
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-Requires:       %{sobase}%{sover} = %{version}
 Requires:       bcmatroska2-devel
 
 %description devel
@@ -143,35 +130,30 @@
     -DENABLE_QT_GL=ON \
 %endif
 %endif
-    -DENABLE_STATIC=NO \
+    -DBUILD_SHARED_LIBS=ON \
     -DENABLE_STRICT=NO
 %cmake_build
 
 %install
 %cmake_install
 
+mkdir -p %{buildroot}/%{_libdir}/mediastreamer/plugins
 mkdir -p %{buildroot}%{_docdir}/%{name}/
 mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \
   %{buildroot}%{_docdir}/%{name}/
 
-%post -n %{sobase}%{sover} -p /sbin/ldconfig
-%postun -n %{sobase}%{sover} -p /sbin/ldconfig
-
 %files
 %license LICENSE.txt
-%{_bindir}/mediastream
-%{_bindir}/mkvstream
-%if 0%{?suse_version} >= 1600
-%ifarch x86_64
+%{_bindir}/mediastreamer2-mediastream
+%{_bindir}/mediastreamer2-mkvstream
 %dir %{_libdir}/mediastreamer
 %dir %{_libdir}/mediastreamer/plugins
+%if 0%{?suse_version} >= 1600
+%ifarch x86_64
 %{_libdir}/mediastreamer/plugins/libmsqogl.so
 %endif
 %endif
 
-%files -n %{sobase}%{sover}
-%{_libdir}/%{sobase}.so.%{sover}*
-
 %files doc
 %doc README.md
 %dir %{_docdir}/%{name}/
@@ -200,9 +182,9 @@
 %{_includedir}/OpenGL/LICENSE
 %{_includedir}/OpenGL/README.md
 %{_includedir}/OpenGL/angle_windowsstore.h
-%{_bindir}/mediastreamer2_tester
-%{_libdir}/libmediastreamer.so
-%{_datadir}/mediastreamer2_tester/
+%{_bindir}/mediastreamer2-tester
+%{_libdir}/libmediastreamer2.so
+%{_datadir}/mediastreamer2-tester/
 %{_datadir}/Mediastreamer2/
 %{_libdir}/pkgconfig/mediastreamer.pc
 

++++++ fix-build-ffmpeg5.patch ++++++
--- /var/tmp/diff_new_pack.CTw6Hf/_old  2024-03-14 17:46:25.048378908 +0100
+++ /var/tmp/diff_new_pack.CTw6Hf/_new  2024-03-14 17:46:25.052379055 +0100
@@ -1,34 +1,38 @@
-diff -ru a/src/utils/ffmpeg-priv.c b/src/utils/ffmpeg-priv.c
---- a/src/utils/ffmpeg-priv.c  2023-06-14 09:45:13.000000000 +0200
-+++ b/src/utils/ffmpeg-priv.c  2023-06-28 09:33:18.234674791 +0200
-@@ -24,31 +24,22 @@
+Index: mediastreamer2-5.3.4/src/utils/ffmpeg-priv.c
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/utils/ffmpeg-priv.c
++++ mediastreamer2-5.3.4/src/utils/ffmpeg-priv.c
+@@ -23,29 +23,22 @@
  
  #ifndef HAVE_FUN_avcodec_encode_video2
- int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const 
AVFrame *frame, int *got_packet_ptr) {
--      int error=avcodec_encode_video(avctx, avpkt->data, avpkt->size,frame);
--      if (error<0){
+ int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, const 
AVFrame *frame, int *got_packet_ptr) {
+-      int error = avcodec_encode_video(avctx, avpkt->data, avpkt->size, 
frame);
+-      if (error < 0) {
 -              return error;
--      }else{
--              if (error>0) {
--                      *got_packet_ptr=1;
--                      avpkt->size=error;
--              }else *got_packet_ptr=0;
+-      } else {
+-              if (error > 0) {
+-                      *got_packet_ptr = 1;
+-                      avpkt->size = error;
+-              } else *got_packet_ptr = 0;
 -      }
 -      return 0;
 -}
 -#endif
 +    int ret;
  
+-#ifndef HAVE_FUN_avcodec_get_context_defaults3 /**/
+-int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec) {
+-      avcodec_get_context_defaults(s);
+-      return 0;
+-}
 +    *got_packet_ptr = 0;
- 
++ 
 +    ret = avcodec_send_frame(avctx, frame);
 +    if (ret < 0)
 +        return ret;
  
--#ifndef HAVE_FUN_avcodec_get_context_defaults3 /**/
--int avcodec_get_context_defaults3 (AVCodecContext *s, AVCodec *codec) {
--      avcodec_get_context_defaults(s);
--      return 0;
+-AVCodecContext *avcodec_alloc_context3(AVCodec *codec) {
+-      return avcodec_alloc_context();
 -}
 +    ret = avcodec_receive_packet(avctx, avpkt);
 +    if (!ret)
@@ -36,21 +40,18 @@
 +    if (ret == AVERROR(EAGAIN))
 +        return 0;
  
--AVCodecContext *avcodec_alloc_context3(AVCodec *codec){
--      return avcodec_alloc_context();
 +    return ret;
- }
--
++}
  #endif
  
- 
-Only in b/src/utils: ffmpeg-priv.c.orig
-diff -ru a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h
---- a/src/utils/ffmpeg-priv.h  2023-06-14 09:45:13.000000000 +0200
-+++ b/src/utils/ffmpeg-priv.h  2023-06-28 09:33:18.238674814 +0200
-@@ -80,6 +80,29 @@
-                          AVPacket *avpkt){
-       return avcodec_decode_video(avctx,picture, 
got_picture_ptr,avpkt->data,avpkt->size);
+ #ifndef HAVE_FUN_avcodec_open2 /**/
+Index: mediastreamer2-5.3.4/src/utils/ffmpeg-priv.h
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/utils/ffmpeg-priv.h
++++ mediastreamer2-5.3.4/src/utils/ffmpeg-priv.h
+@@ -76,6 +76,29 @@ static inline int
+ avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int 
*got_picture_ptr, AVPacket *avpkt) {
+       return avcodec_decode_video(avctx, picture, got_picture_ptr, 
avpkt->data, avpkt->size);
  }
 +#else
 +static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame 
*frame, int *got_frame, AVPacket *pkt)
@@ -78,35 +79,35 @@
  #endif
  #if HAVE_AVCODEC_OLD_CODEC_IDS
  #include <libavcodec/old_codec_ids.h>
-@@ -120,11 +143,6 @@
- int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const 
AVFrame *frame, int *got_packet_ptr);
+@@ -116,11 +139,6 @@ extern "C" {
+ int avcodec_encode_video2(AVCodecContext *avctx, AVPacket *avpkt, const 
AVFrame *frame, int *got_packet_ptr);
  #endif
  
 -#ifndef HAVE_FUN_avcodec_get_context_defaults3 /**/
--int avcodec_get_context_defaults3 (AVCodecContext *s, AVCodec *codec);
+-int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec);
 -AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
 -#endif
 -
  #ifndef HAVE_FUN_avcodec_open2 /**/
- int avcodec_open2 (AVCodecContext *avctx, AVCodec *codec, AVDictionary 
**options);
+ int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary 
**options);
  #endif
-Only in b/src/utils: ffmpeg-priv.h.orig
-diff -ru a/src/utils/jpgloader-ffmpeg.c b/src/utils/jpgloader-ffmpeg.c
---- a/src/utils/jpgloader-ffmpeg.c     2023-06-14 09:45:13.000000000 +0200
-+++ b/src/utils/jpgloader-ffmpeg.c     2023-06-28 09:33:18.238674814 +0200
-@@ -76,7 +76,6 @@
+Index: mediastreamer2-5.3.4/src/utils/jpgloader-ffmpeg.c
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/utils/jpgloader-ffmpeg.c
++++ mediastreamer2-5.3.4/src/utils/jpgloader-ffmpeg.c
+@@ -76,7 +76,6 @@ mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bu
                return NULL;
        }
  
--      avcodec_get_context_defaults3(&av_context,NULL);
-       if (avcodec_open2(&av_context,codec,NULL)<0){
+-      avcodec_get_context_defaults3(&av_context, NULL);
+       if (avcodec_open2(&av_context, codec, NULL) < 0) {
                ms_error("jpeg2yuv: avcodec_open failed");
                return NULL;
-Only in b/src/utils: jpgloader-ffmpeg.c.orig
-diff -ru a/src/videofilters/ffmpegjpegwriter.c 
b/src/videofilters/ffmpegjpegwriter.c
---- a/src/videofilters/ffmpegjpegwriter.c      2023-06-14 09:45:13.000000000 
+0200
-+++ b/src/videofilters/ffmpegjpegwriter.c      2023-06-28 09:34:02.362930213 
+0200
-@@ -192,7 +192,7 @@
+Index: mediastreamer2-5.3.4/src/videofilters/ffmpegjpegwriter.c
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/videofilters/ffmpegjpegwriter.c
++++ mediastreamer2-5.3.4/src/videofilters/ffmpegjpegwriter.c
+@@ -190,7 +190,7 @@ static void jpg_process_frame_task(void
                sws_freeContext(sws_ctx);
  
                av_frame_unref(s->pict);
@@ -115,94 +116,95 @@
                packet.data = comp_buf;
                packet.size = (int)comp_buf_sz;
                packet.pts = frame_ts;
-diff -ru a/src/videofilters/h264dec.cpp b/src/videofilters/h264dec.cpp
---- a/src/videofilters/h264dec.cpp     2023-06-14 09:45:13.000000000 +0200
-+++ b/src/videofilters/h264dec.cpp     2023-06-28 09:33:18.238674814 +0200
-@@ -67,17 +67,15 @@
- static void ffmpeg_init(void){
-       static bool_t done=FALSE;
-       if (!done){
+Index: mediastreamer2-5.3.4/src/videofilters/h264dec.cpp
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/videofilters/h264dec.cpp
++++ mediastreamer2-5.3.4/src/videofilters/h264dec.cpp
+@@ -66,17 +66,15 @@ typedef struct _DecData {
+ static void ffmpeg_init(void) {
+       static bool_t done = FALSE;
+       if (!done) {
 -              avcodec_register_all();
-               done=TRUE;
+               done = TRUE;
        }
  }
  
- static void dec_open(DecData *d){
+ static void dec_open(DecData *d) {
 -      AVCodec *codec;
 +      const AVCodec *codec;
        int error;
-       codec=avcodec_find_decoder(CODEC_ID_H264);
-       if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
+       codec = avcodec_find_decoder(CODEC_ID_H264);
+       if (codec == NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
 -      avcodec_get_context_defaults3(&d->av_context, NULL);
-       error=avcodec_open2(&d->av_context,codec, NULL);
-       if (error!=0){
+       error = avcodec_open2(&d->av_context, codec, NULL);
+       if (error != 0) {
                ms_fatal("avcodec_open() failed.");
-@@ -165,7 +163,7 @@
-               ms_error("%s: error in sws_scale().",f->desc->name);
+@@ -162,7 +160,7 @@ static mblk_t *get_as_yuvmsg(MSFilter *f
+               ms_error("%s: error in sws_scale().", f->desc->name);
        }
- #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50,43,0) // backward 
compatibility with Debian Squeeze (6.0)
+ #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 43, 0) // backward 
compatibility with Debian Squeeze (6.0)
 -      mblk_set_timestamp_info(yuv_msg, (uint32_t)orig->pkt_pts);
-+      mblk_set_timestamp_info(yuv_msg, (uint32_t)orig->pts);
++  mblk_set_timestamp_info(yuv_msg, (uint32_t)orig->pts);
  #endif
        return yuv_msg;
  }
-Only in b/src/videofilters: h264dec.cpp.orig
-diff -ru a/src/videofilters/videodec.c b/src/videofilters/videodec.c
---- a/src/videofilters/videodec.c      2023-06-14 09:45:13.000000000 +0200
-+++ b/src/videofilters/videodec.c      2023-06-28 09:33:18.238674814 +0200
-@@ -70,7 +70,6 @@
-       DecState *s=(DecState *)ms_new0(DecState,1);
+Index: mediastreamer2-5.3.4/src/videofilters/videodec.c
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/videofilters/videodec.c
++++ mediastreamer2-5.3.4/src/videofilters/videodec.c
+@@ -67,7 +67,6 @@ static void dec_init(MSFilter *f, enum C
+       DecState *s = (DecState *)ms_new0(DecState, 1);
        ms_ffmpeg_check_init();
  
 -      avcodec_get_context_defaults3(&s->av_context, NULL);
        s->allocator = ms_yuv_buf_allocator_new();
-       s->av_codec=NULL;
-       s->codec=cid;
-@@ -662,7 +661,7 @@
+       s->av_codec = NULL;
+       s->codec = cid;
+@@ -591,7 +590,7 @@ static mblk_t *get_as_yuvmsg(MSFilter *f
  #endif
-               ms_error("%s: error in ms_sws_scale().",f->desc->name);
+               ms_error("%s: error in ms_sws_scale().", f->desc->name);
        }
 -      mblk_set_timestamp_info(yuv_msg, (uint32_t)orig->pkt_pts);
 +      mblk_set_timestamp_info(yuv_msg, (uint32_t)orig->pts);
        return yuv_msg;
  }
  /* Bitmasks to select bits of a byte from low side */
-Only in b/src/videofilters: videodec.c.orig
-diff -ru a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
---- a/src/videofilters/videoenc.c      2023-06-14 09:45:13.000000000 +0200
-+++ b/src/videofilters/videoenc.c      2023-06-28 09:33:18.238674814 +0200
-@@ -129,7 +129,6 @@
+Index: mediastreamer2-5.3.4/src/videofilters/videoenc.c
+===================================================================
+--- mediastreamer2-5.3.4.orig/src/videofilters/videoenc.c
++++ mediastreamer2-5.3.4/src/videofilters/videoenc.c
+@@ -109,7 +109,6 @@ void ms_ffmpeg_log_callback(void *ptr, i
  
- void ms_ffmpeg_check_init(){
-       if(!avcodec_initialized){
+ void ms_ffmpeg_check_init() {
+       if (!avcodec_initialized) {
 -              avcodec_register_all();
-               avcodec_initialized=TRUE;
+               avcodec_initialized = TRUE;
  #ifdef ENABLE_LOG_FFMPEG
                av_log_set_level(AV_LOG_WARNING);
-@@ -269,7 +268,6 @@
-       AVCodecContext *c=&s->av_context;
-       const int max_br_vbv=128000;
+@@ -250,7 +249,6 @@ static void prepare(EncState *s) {
+       AVCodecContext *c = &s->av_context;
+       const int max_br_vbv = 128000;
  
 -      avcodec_get_context_defaults3(c, NULL);
-       if (s->codec==CODEC_ID_MJPEG)
-       {
-               ms_message("Codec bitrate set to %i",(int)c->bit_rate);
-@@ -333,7 +331,6 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         c->rtp_mode = 1;
- #endif
--      c->rtp_payload_size = s->mtu/2;
-       if (s->profile==0){
-               s->codec=CODEC_ID_H263;
-       }else{
-@@ -816,7 +813,7 @@
+       if (s->codec == CODEC_ID_MJPEG) {
+               ms_message("Codec bitrate set to %i", (int)c->bit_rate);
+               c->width = s->vconf.vsize.width;
+@@ -312,7 +310,6 @@ static void prepare_h263(EncState *s) {
+ #if LIBAVCODEC_VERSION_INT < ((52 << 16) + (0 << 8) + 0)
+       c->rtp_mode = 1;
+ #endif
+-      c->rtp_payload_size = s->mtu / 2;
+       if (s->profile == 0) {
+               s->codec = CODEC_ID_H263;
+       } else {
+@@ -787,7 +784,7 @@ static void process_frame(MSFilter *f, m
        ms_yuv_buf_init_from_mblk(&yuv, inm);
        /* convert image if necessary */
        av_frame_unref(s->pict);
--      
avpicture_fill((AVPicture*)s->pict,yuv.planes[0],c->pix_fmt,c->width,c->height);
-+      
av_image_fill_arrays(s->pict->data,s->pict->linesize,yuv.planes[0],c->pix_fmt,c->width,c->height,1);
+-      avpicture_fill((AVPicture *)s->pict, yuv.planes[0], c->pix_fmt, 
c->width, c->height);
++  
av_image_fill_arrays(s->pict->data,s->pict->linesize,yuv.planes[0],c->pix_fmt,c->width,c->height,1);
  
        /* timestamp used by ffmpeg, unset here */
-       s->pict->pts=AV_NOPTS_VALUE;
-Only in b/src/videofilters: videoenc.c.orig
+       s->pict->pts = AV_NOPTS_VALUE;
+
 

++++++ fix-srtp2-linphone.patch ++++++
--- /var/tmp/diff_new_pack.CTw6Hf/_old  2024-03-14 17:46:25.064379497 +0100
+++ /var/tmp/diff_new_pack.CTw6Hf/_new  2024-03-14 17:46:25.064379497 +0100
@@ -1,36 +1,36 @@
-Index: mediastreamer2-5.2.30/cmake/FindSRTP.cmake
+Index: mediastreamer2-5.3.4/cmake/FindSRTP.cmake
 ===================================================================
---- mediastreamer2-5.2.30.orig/cmake/FindSRTP.cmake
-+++ mediastreamer2-5.2.30/cmake/FindSRTP.cmake
-@@ -31,7 +31,7 @@ set(_SRTP_ROOT_PATHS
- )
+--- mediastreamer2-5.3.4.orig/cmake/FindSRTP.cmake
++++ mediastreamer2-5.3.4/cmake/FindSRTP.cmake
+@@ -61,7 +61,7 @@ else()
+       set(_SRTP_ROOT_PATHS ${CMAKE_INSTALL_PREFIX})
  
- find_path(SRTP2_INCLUDE_DIRS
--      NAMES srtp2/srtp.h
-+      NAMES srtp2-linphone/srtp.h
-       HINTS _SRTP_ROOT_PATHS
-       PATH_SUFFIXES include
- )
-@@ -41,7 +41,7 @@ if(SRTP2_INCLUDE_DIRS)
-       set(SRTP_INCLUDE_DIRS ${SRTP2_INCLUDE_DIRS})
-       set(SRTP_VERSION 2)
-       find_library(SRTP_LIBRARIES
--              NAMES srtp2
-+              NAMES srtp2-linphone
+       find_path(_SRTP_INCLUDE_DIRS
+-              NAMES srtp2/srtp.h
++              NAMES srtp2-linphone/srtp.h
                HINTS ${_SRTP_ROOT_PATHS}
-               PATH_SUFFIXES bin lib
+               PATH_SUFFIXES include
        )
-Index: mediastreamer2-5.2.30/src/utils/srtp_prefix.h
+@@ -69,7 +69,7 @@ else()
+       if(_SRTP_INCLUDE_DIRS)
+               set(SRTP_VERSION 2)
+               find_library(_SRTP_LIBRARY
+-                      NAMES srtp2
++                      NAMES srtp2-linphone
+                       HINTS ${_SRTP_ROOT_PATHS}
+                       PATH_SUFFIXES bin lib
+               )
+Index: mediastreamer2-5.3.4/src/utils/srtp_prefix.h
 ===================================================================
---- mediastreamer2-5.2.30.orig/src/utils/srtp_prefix.h
-+++ mediastreamer2-5.2.30/src/utils/srtp_prefix.h
+--- mediastreamer2-5.3.4.orig/src/utils/srtp_prefix.h
++++ mediastreamer2-5.3.4/src/utils/srtp_prefix.h
 @@ -30,7 +30,7 @@
- #elif SRTP_VERSION==1
+ #elif SRTP_VERSION == 1
  #include <srtp/srtp.h>
  #else
 -#include <srtp2/srtp.h>
 +#include <srtp2-linphone/srtp.h>
  #endif
  
- #if SRTP_VERSION==2
+ #if SRTP_VERSION == 2
 

++++++ mediastreamer2-5.2.98.tar.bz2 -> mediastreamer2-5.3.26.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2-5.2.98.tar.bz2 
/work/SRC/openSUSE:Factory/.mediastreamer2.new.1905/mediastreamer2-5.3.26.tar.bz2
 differ: char 11, line 1

++++++ mediastreamer2-fix-pkgconfig.patch ++++++
--- /var/tmp/diff_new_pack.CTw6Hf/_old  2024-03-14 17:46:25.104380968 +0100
+++ /var/tmp/diff_new_pack.CTw6Hf/_new  2024-03-14 17:46:25.104380968 +0100
@@ -1,8 +1,10 @@
---- mediastreamer2-5.2.6/CMakeLists.txt.orig   2023-01-04 13:43:30.797983393 
+0100
-+++ mediastreamer2-5.2.6/CMakeLists.txt        2023-01-04 13:44:42.302354270 
+0100
-@@ -136,6 +136,8 @@
- # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package 
(bctoolbox, ortp, etc.)
- # * DISABLE_SRTP_SEARCH: skip find_package() for SRTP.
+Index: mediastreamer2-5.3.7/CMakeLists.txt
+===================================================================
+--- mediastreamer2-5.3.7.orig/CMakeLists.txt
++++ mediastreamer2-5.3.7/CMakeLists.txt
+@@ -125,6 +125,8 @@ option(ENABLE_JPEG "Enable JPEG support"
+ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES 
"ENABLE_VIDEO" NO)
+ cmake_dependent_option(ENABLE_AV1 "Build mediastreamer2 with AV1 support." 
YES "ENABLE_VIDEO" NO)
  
 +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mediastreamer.pc.in 
${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc)
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc DESTINATION 
"${CMAKE_INSTALL_LIBDIR}/pkgconfig")

++++++ set_current_version.patch ++++++
--- /var/tmp/diff_new_pack.CTw6Hf/_old  2024-03-14 17:46:25.120381556 +0100
+++ /var/tmp/diff_new_pack.CTw6Hf/_new  2024-03-14 17:46:25.124381704 +0100
@@ -1,11 +1,13 @@
---- mediastreamer2-5.2.49/CMakeLists.txt.orig  2023-04-07 11:21:45.535261082 
+0200
-+++ mediastreamer2-5.2.49/CMakeLists.txt       2023-04-07 11:21:50.571286441 
+0200
-@@ -29,7 +29,7 @@
-     cmake_policy(SET CMP0077 NEW)
- endif()
+Index: mediastreamer2-5.3.7/CMakeLists.txt
+===================================================================
+--- mediastreamer2-5.3.7.orig/CMakeLists.txt
++++ mediastreamer2-5.3.7/CMakeLists.txt
+@@ -22,7 +22,7 @@
  
--project(mediastreamer2 VERSION 5.2.0 LANGUAGES C CXX)
-+project(mediastreamer2 VERSION 5.2.98 LANGUAGES C CXX)
+ cmake_minimum_required(VERSION 3.22)
+ 
+-project(Mediastreamer2 VERSION 5.3.0 LANGUAGES C CXX)
++project(Mediastreamer2 VERSION 5.3.26 LANGUAGES C CXX)
  
  if(WIN32)
      if( NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

Reply via email to