Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mediastreamer2 for openSUSE:Factory checked in at 2023-06-29 17:28:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old) and /work/SRC/openSUSE:Factory/.mediastreamer2.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mediastreamer2" Thu Jun 29 17:28:26 2023 rev:64 rq:1095757 version:5.2.73 Changes: -------- --- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes 2023-04-07 18:17:28.492942473 +0200 +++ /work/SRC/openSUSE:Factory/.mediastreamer2.new.13546/mediastreamer2.changes 2023-06-29 17:28:44.766406145 +0200 @@ -1,0 +2,6 @@ +Wed Jun 28 06:37:28 UTC 2023 - Paolo Stivanin <[email protected]> + +- Update to 5.2.73 (no changelog) +- Rebase fix-build-ffmpeg5.patch + +------------------------------------------------------------------- Old: ---- mediastreamer2-5.2.49.tar.bz2 New: ---- mediastreamer2-5.2.73.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediastreamer2.spec ++++++ --- /var/tmp/diff_new_pack.vxzIPI/_old 2023-06-29 17:28:46.454416033 +0200 +++ /var/tmp/diff_new_pack.vxzIPI/_new 2023-06-29 17:28:46.498416290 +0200 @@ -20,7 +20,7 @@ %define sover 11 Name: mediastreamer2 -Version: 5.2.49 +Version: 5.2.73 Release: 0 Summary: Audio/Video real-time streaming License: AGPL-3.0-or-later ++++++ fix-build-ffmpeg5.patch ++++++ --- /var/tmp/diff_new_pack.vxzIPI/_old 2023-06-29 17:28:46.806418095 +0200 +++ /var/tmp/diff_new_pack.vxzIPI/_new 2023-06-29 17:28:46.838418282 +0200 @@ -1,8 +1,7 @@ -diff --git a/src/utils/ffmpeg-priv.c b/src/utils/ffmpeg-priv.c -index a3a801a9..9d696f17 100644 ---- a/src/utils/ffmpeg-priv.c -+++ b/src/utils/ffmpeg-priv.c -@@ -23,31 +23,22 @@ +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 @@ #ifndef HAVE_FUN_avcodec_encode_video2 int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { @@ -45,11 +44,11 @@ #endif -diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h -index 18338201..3ffeb088 100644 ---- a/src/utils/ffmpeg-priv.h -+++ b/src/utils/ffmpeg-priv.h -@@ -79,6 +79,29 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, +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); } @@ -79,7 +78,7 @@ #endif #if HAVE_AVCODEC_OLD_CODEC_IDS #include <libavcodec/old_codec_ids.h> -@@ -119,11 +142,6 @@ extern "C" { +@@ -120,11 +143,6 @@ int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr); #endif @@ -91,11 +90,11 @@ #ifndef HAVE_FUN_avcodec_open2 /**/ int avcodec_open2 (AVCodecContext *avctx, AVCodec *codec, AVDictionary **options); #endif -diff --git a/src/utils/jpgloader-ffmpeg.c b/src/utils/jpgloader-ffmpeg.c -index 62cf41db..9952fab7 100644 ---- a/src/utils/jpgloader-ffmpeg.c -+++ b/src/utils/jpgloader-ffmpeg.c -@@ -75,7 +75,6 @@ mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){ +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 @@ return NULL; } @@ -103,24 +102,23 @@ if (avcodec_open2(&av_context,codec,NULL)<0){ ms_error("jpeg2yuv: avcodec_open failed"); return NULL; -diff --git a/src/videofilters/ffmpegjpegwriter.c b/src/videofilters/ffmpegjpegwriter.c -index 5ee16b8d..8d1638f6 100644 ---- a/src/videofilters/ffmpegjpegwriter.c -+++ b/src/videofilters/ffmpegjpegwriter.c -@@ -174,7 +174,7 @@ static void jpg_process(MSFilter *f){ - sws_freeContext(sws_ctx); - - av_frame_unref(s->pict); -- avpicture_fill((AVPicture*)s->pict,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height); -+ av_image_fill_arrays(s->pict->data,s->pict->linesize,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height, 1); - packet.data=comp_buf; - packet.size=(int)comp_buf_sz; - packet.pts = frame_ts; -diff --git a/src/videofilters/h264dec.cpp b/src/videofilters/h264dec.cpp -index e3cd82cc..bed94bb0 100644 ---- a/src/videofilters/h264dec.cpp -+++ b/src/videofilters/h264dec.cpp -@@ -66,17 +66,15 @@ typedef struct _DecData{ +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 @@ + sws_freeContext(sws_ctx); + + av_frame_unref(s->pict); +- avpicture_fill((AVPicture *)s->pict, (uint8_t *)jpegm->b_rptr, avctx->pix_fmt, avctx->width, avctx->height); ++ av_image_fill_arrays(s->pict->data,s->pict->linesize,(uint8_t*)jpegm->b_rptr,avctx->pix_fmt,avctx->width,avctx->height, 1); + 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){ @@ -139,7 +137,7 @@ error=avcodec_open2(&d->av_context,codec, NULL); if (error!=0){ ms_fatal("avcodec_open() failed."); -@@ -164,7 +162,7 @@ static mblk_t *get_as_yuvmsg(MSFilter *f, DecData *s, AVFrame *orig){ +@@ -165,7 +163,7 @@ 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) @@ -148,11 +146,11 @@ #endif return yuv_msg; } -diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c -index d5dbcaa2..2b223349 100644 ---- a/src/videofilters/videodec.c -+++ b/src/videofilters/videodec.c -@@ -69,7 +69,6 @@ static void dec_init(MSFilter *f, enum CodecID cid){ +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); ms_ffmpeg_check_init(); @@ -160,7 +158,7 @@ s->allocator = ms_yuv_buf_allocator_new(); s->av_codec=NULL; s->codec=cid; -@@ -661,7 +660,7 @@ static mblk_t *get_as_yuvmsg(MSFilter *f, DecState *s, AVFrame *orig){ +@@ -662,7 +661,7 @@ #endif ms_error("%s: error in ms_sws_scale().",f->desc->name); } @@ -169,11 +167,11 @@ return yuv_msg; } /* Bitmasks to select bits of a byte from low side */ -diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c -index 42d3a05e..7e3575d4 100644 ---- a/src/videofilters/videoenc.c -+++ b/src/videofilters/videoenc.c -@@ -128,7 +128,6 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +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 @@ void ms_ffmpeg_check_init(){ if(!avcodec_initialized){ @@ -181,7 +179,7 @@ avcodec_initialized=TRUE; #ifdef ENABLE_LOG_FFMPEG av_log_set_level(AV_LOG_WARNING); -@@ -268,7 +267,6 @@ static void prepare(EncState *s){ +@@ -269,7 +268,6 @@ AVCodecContext *c=&s->av_context; const int max_br_vbv=128000; @@ -189,7 +187,7 @@ if (s->codec==CODEC_ID_MJPEG) { ms_message("Codec bitrate set to %i",(int)c->bit_rate); -@@ -332,7 +330,6 @@ static void prepare_h263(EncState *s){ +@@ -333,7 +331,6 @@ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) c->rtp_mode = 1; #endif @@ -197,7 +195,7 @@ if (s->profile==0){ s->codec=CODEC_ID_H263; }else{ -@@ -815,7 +812,7 @@ static void process_frame(MSFilter *f, mblk_t *inm){ +@@ -816,7 +813,7 @@ ms_yuv_buf_init_from_mblk(&yuv, inm); /* convert image if necessary */ av_frame_unref(s->pict); @@ -206,4 +204,5 @@ /* timestamp used by ffmpeg, unset here */ s->pict->pts=AV_NOPTS_VALUE; +Only in b/src/videofilters: videoenc.c.orig ++++++ mediastreamer2-5.2.49.tar.bz2 -> mediastreamer2-5.2.73.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2-5.2.49.tar.bz2 /work/SRC/openSUSE:Factory/.mediastreamer2.new.13546/mediastreamer2-5.2.73.tar.bz2 differ: char 11, line 1 ++++++ set_current_version.patch ++++++ --- /var/tmp/diff_new_pack.vxzIPI/_old 2023-06-29 17:28:47.202420415 +0200 +++ /var/tmp/diff_new_pack.vxzIPI/_new 2023-06-29 17:28:47.238420626 +0200 @@ -5,7 +5,7 @@ endif() -project(mediastreamer2 VERSION 5.2.0 LANGUAGES C CXX) -+project(mediastreamer2 VERSION 5.2.49 LANGUAGES C CXX) ++project(mediastreamer2 VERSION 5.2.73 LANGUAGES C CXX) if(WIN32) if( NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
