Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2024-10-29 14:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Tue Oct 29 14:32:35 2024 rev:183 rq:1218807 version:4.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2024-10-01 17:16:35.557670984 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.2020/blender.changes 2024-10-29 14:33:18.172926684 +0100 @@ -1,0 +2,9 @@ +Fri Oct 25 21:18:53 UTC 2024 - Marcus Rueckert <mrueck...@suse.de> + +- Update to 4.2.3 + https://www.blender.org/download/lts/4-2/ +- refreshed patches: + cmake_manpage_fix.patch + ffmpeg-7-1.patch + +------------------------------------------------------------------- Old: ---- blender-4.2.2.tar.xz blender-4.2.2.tar.xz.md5sum blender-assets-4.2.2.tar.xz New: ---- blender-4.2.3.tar.xz blender-4.2.3.tar.xz.md5sum blender-assets-4.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.3cXNGH/_old 2024-10-29 14:33:23.401143315 +0100 +++ /var/tmp/diff_new_pack.3cXNGH/_new 2024-10-29 14:33:23.405143481 +0100 @@ -77,7 +77,7 @@ %bcond_with openxr Name: blender -Version: 4.2.2 +Version: 4.2.3 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3cXNGH/_old 2024-10-29 14:33:23.497147293 +0100 +++ /var/tmp/diff_new_pack.3cXNGH/_new 2024-10-29 14:33:23.501147459 +0100 @@ -1,7 +1,7 @@ <services> <service name="obs_scm" mode="manual"> - <param name="revision">v4.2.2</param> - <param name="version">4.2.2</param> + <param name="revision">v4.2.3</param> + <param name="version">4.2.3</param> <param name="url">https://projects.blender.org/blender/blender-assets.git</param> <param name="scm">git</param> <param name="lfs">enable</param> ++++++ blender-4.2.2.tar.xz -> blender-4.2.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/blender/blender-4.2.2.tar.xz /work/SRC/openSUSE:Factory/.blender.new.2020/blender-4.2.3.tar.xz differ: char 26, line 1 ++++++ blender-4.2.2.tar.xz.md5sum -> blender-4.2.3.tar.xz.md5sum ++++++ --- /work/SRC/openSUSE:Factory/blender/blender-4.2.2.tar.xz.md5sum 2024-10-01 17:16:35.509668983 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.2020/blender-4.2.3.tar.xz.md5sum 2024-10-29 14:33:18.088923203 +0100 @@ -1 +1 @@ -9ce6c50a51162aca1c46758b941228ff blender-4.2.2.tar.xz +0fb14e18299b76f6dbf7b0bb99c27e67 blender-4.2.3.tar.xz ++++++ blender-assets-4.2.2.tar.xz -> blender-assets-4.2.3.tar.xz ++++++ ++++++ cmake_manpage_fix.patch ++++++ --- /var/tmp/diff_new_pack.3cXNGH/_old 2024-10-29 14:33:23.665154254 +0100 +++ /var/tmp/diff_new_pack.3cXNGH/_new 2024-10-29 14:33:23.669154420 +0100 @@ -1,8 +1,8 @@ -diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt -index 7e3235e2641..3a6c33996da 100644 ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -1894,7 +1894,7 @@ detect_leaks=0\"\n\ +Index: blender-4.2.3/source/creator/CMakeLists.txt +=================================================================== +--- blender-4.2.3.orig/source/creator/CMakeLists.txt ++++ blender-4.2.3/source/creator/CMakeLists.txt +@@ -1925,7 +1925,7 @@ detect_leaks=0\"\n\ execute_process(\n\ COMMAND\n\ $\{PYTHON_EXECUTABLE\} $\{MANPAGE_GEN\}\n\ ++++++ ffmpeg-7-1.patch ++++++ --- /var/tmp/diff_new_pack.3cXNGH/_old 2024-10-29 14:33:23.681154917 +0100 +++ /var/tmp/diff_new_pack.3cXNGH/_new 2024-10-29 14:33:23.685155083 +0100 @@ -13,12 +13,12 @@ source/blender/imbuf/intern/anim_movie.cc | 11 +++++------ 2 files changed, 14 insertions(+), 6 deletions(-) -diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h -index 91ea1701db6..78778482e8d 100644 ---- a/intern/ffmpeg/ffmpeg_compat.h -+++ b/intern/ffmpeg/ffmpeg_compat.h -@@ -141,6 +141,15 @@ int64_t av_get_frame_duration_in_pts_units(const AVFrame *picture) - #endif +Index: blender-4.2.3/intern/ffmpeg/ffmpeg_compat.h +=================================================================== +--- blender-4.2.3.orig/intern/ffmpeg/ffmpeg_compat.h ++++ blender-4.2.3/intern/ffmpeg/ffmpeg_compat.h +@@ -161,6 +161,15 @@ FFMPEG_INLINE size_t ffmpeg_get_buffer_a + return align; } +FFMPEG_INLINE @@ -33,11 +33,11 @@ /* -------------------------------------------------------------------- */ /** \name Deinterlace code block * -diff --git a/source/blender/imbuf/intern/anim_movie.cc b/source/blender/imbuf/intern/anim_movie.cc -index 3d51969dd46..bb07a8bb14c 100644 ---- a/source/blender/imbuf/intern/anim_movie.cc -+++ b/source/blender/imbuf/intern/anim_movie.cc -@@ -653,7 +653,7 @@ static void ffmpeg_decode_store_frame_pts(ImBufAnim *anim) +Index: blender-4.2.3/source/blender/imbuf/intern/anim_movie.cc +=================================================================== +--- blender-4.2.3.orig/source/blender/imbuf/intern/anim_movie.cc ++++ blender-4.2.3/source/blender/imbuf/intern/anim_movie.cc +@@ -657,7 +657,7 @@ static void ffmpeg_decode_store_frame_pt { anim->cur_pts = av_get_pts_from_frame(anim->pFrame); @@ -46,7 +46,7 @@ anim->cur_key_frame_pts = anim->cur_pts; } -@@ -1032,11 +1032,10 @@ static int ffmpeg_seek_to_key_frame(ImBufAnim *anim, +@@ -1036,11 +1036,10 @@ static int ffmpeg_seek_to_key_frame(ImBu AVFormatContext *format_ctx = anim->pFormatCtx; @@ -62,7 +62,4 @@ av_log(anim->pFormatCtx, AV_LOG_DEBUG, "Adjusted final seek seek_pos = %" PRId64 "\n", --- -2.30.2 - ++++++ series ++++++ --- /var/tmp/diff_new_pack.3cXNGH/_old 2024-10-29 14:33:23.745157569 +0100 +++ /var/tmp/diff_new_pack.3cXNGH/_new 2024-10-29 14:33:23.749157735 +0100 @@ -4,4 +4,6 @@ Add_missing_system_error_handler.patch # PATCH-FIX-UPSTREAM https://projects.blender.org/blender/blender/pulls/115320 cmake_manpage_fix.patch +# PATCH-FIX-UPSTREAM https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/blob/main/ffmpeg-7-1.patch?ref_type=heads +ffmpeg-7-1.patch
