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-08-01 22:04:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.7232 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "blender" Thu Aug 1 22:04:02 2024 rev:181 rq:1191023 version:4.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2024-05-03 01:54:59.217158758 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.7232/blender.changes 2024-08-01 22:04:21.600294912 +0200 @@ -1,0 +2,38 @@ +Thu Aug 1 13:26:21 UTC 2024 - Marcus Rueckert <mrueckert@suse.de> + +- Import Arch linux patch for building with ffmpeg-7 + https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/blob/mai... + We do not need the 2nd patch as we are not using the intree copy + of audaspace on distros with ffmpeg-7 + +------------------------------------------------------------------- +Thu Jul 18 13:10:15 UTC 2024 - Marcus Rueckert <mrueckert@suse.de> + +- switch to autosetup + +------------------------------------------------------------------- +Thu Jul 18 13:07:20 UTC 2024 - Marcus Rueckert <mrueckert@suse.de> + +- The blender contrib repository was archived in May. + Probably in favor of https://extensions.blender.org/ + + If you want to get those extensions/addons back install them via + the new extensions manager. + + Remove all code for injecting more addons/extensions from the + build. + +------------------------------------------------------------------- +Thu Jul 18 12:22:34 UTC 2024 - Marcus Rueckert <mrueckert@suse.de> + +- put the contrib addons into addons_core + +------------------------------------------------------------------- +Wed Jul 17 23:04:23 UTC 2024 - Marcus Rueckert <mrueckert@suse.de> + +- Update to 4.2.0 + https://www.blender.org/download/releases/4-2/ + https://developer.blender.org/docs/release_notes/4.2/ +- bump BuildRequires for audaspace to 1.5 + +------------------------------------------------------------------- Old: ---- _service blender-4.1.1.tar.xz blender-4.1.1.tar.xz.md5sum blender-addons-contrib-4.1.1.tar.xz New: ---- blender-4.2.0.tar.xz blender-4.2.0.tar.xz.md5sum ffmpeg-7-1.patch BETA DEBUG BEGIN: New:- Import Arch linux patch for building with ffmpeg-7 https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/blob/mai... We do not need the 2nd patch as we are not using the intree copy BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.qHtt8t/_old 2024-08-01 22:04:24.000393901 +0200 +++ /var/tmp/diff_new_pack.qHtt8t/_new 2024-08-01 22:04:24.000393901 +0200 @@ -77,7 +77,7 @@ %bcond_with openxr Name: blender -Version: 4.1.1 +Version: 4.2.0 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later @@ -86,13 +86,6 @@ # Please leave the source url intact Source0: https://download.blender.org/source/%{name}-%{version}.tar.xz Source1: https://download.blender.org/source/%{name}-%{version}.tar.xz.md5sum -# if you have to comment in Source2 again, then you also have to fix the _service file to create the tarball again -# addons are included again in the source tarball -# https://projects.blender.org/blender/blender-addons.git -#Source2: %{name}-addons-%{version}.tar.xz -# addon contrib is not included in the source tarball -# https://projects.blender.org/blender/blender-addons-contrib.git -Source3: %{name}-addons-contrib-%{version}.tar.xz Source4: geeko.blend Source5: geeko.README Source6: geeko_example_scene.blend @@ -107,6 +100,8 @@ Patch1: Add_missing_system_error_handler.patch # PATCH-FIX-UPSTREAM https://projects.blender.org/blender/blender/pulls/115320 Patch2: cmake_manpage_fix.patch +# PATCH-FIX-UPSTREAM https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/blob/mai... +Patch3: ffmpeg-7-1.patch BuildRequires: %{py3pkg}-devel BuildRequires: %{py3pkg}-numpy-devel BuildRequires: %{py3pkg}-requests @@ -258,7 +253,7 @@ BuildRequires: OpenShadingLanguage-devel %endif %if %{with system_audaspace} -BuildRequires: pkgconfig(audaspace) >= 1.3 +BuildRequires: pkgconfig(audaspace) >= 1.5 Requires: audaspace-deviceplugin Requires: audaspace-fileplugin %endif @@ -310,16 +305,7 @@ md5sum -c %{SOURCE1} popd -%setup -q -a3 -%autopatch -p1 - -# integrate addons in source tree -#mkdir scripts/addons -for d in addons-contrib; do - mv blender-$d-%{version}/* scripts/addons - # wipe .gitea and .github - rm -r blender-$d-%{version} -done +%autosetup -p1 rm -rf extern/libopenjpeg %if %{with system_glew} @@ -505,7 +491,6 @@ %cmake_install # tidy some .dot {files,dirs} installation -rm %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/addons/rigify/.pep8 # Fix any .py files with shebangs and wrong permissions. find %{buildroot} -name "*.py" -perm 0644 -print0 | \ xargs -0r grep -l '^#!' | xargs -d'\n' chmod -f 0755; @@ -558,6 +543,7 @@ %dir %{_datadir}/%{name}/%{_version}/datafiles %exclude %{_datadir}/%{name}/%{_version}/datafiles/locale %exclude %{_docdir}/%{name}/geeko_example_scene.* +%{_datadir}/%{name}/%{_version}/extensions/ %{_datadir}/%{name}/%{_version}/scripts/ %{_datadir}/%{name}/%{_version}/datafiles/ %{_datadir}/applications/%{name}.desktop ++++++ blender-4.1.1.tar.xz -> blender-4.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/blender/blender-4.1.1.tar.xz /work/SRC/openSUSE:Factory/.blender.new.7232/blender-4.2.0.tar.xz differ: char 26, line 1 ++++++ blender-4.1.1.tar.xz.md5sum -> blender-4.2.0.tar.xz.md5sum ++++++ --- /work/SRC/openSUSE:Factory/blender/blender-4.1.1.tar.xz.md5sum 2024-05-03 01:54:59.185157597 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.7232/blender-4.2.0.tar.xz.md5sum 2024-08-01 22:04:21.592294582 +0200 @@ -1 +1 @@ -90a191f753ab48513ba23005e36be623 blender-4.1.1.tar.xz +258c795c7152f3360adc65187b25f9cc blender-4.2.0.tar.xz ++++++ ffmpeg-7-1.patch ++++++ From c72dbeafffa5b3262e90023e092bb1f9928d7079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com> Date: Tue, 14 May 2024 11:03:49 +0200 Subject: [PATCH] Add compatibility with FFMPEG 7.0 key_frame was deprecated then remove, we should use AV_FRAME_FLAG_KEY instead. read_seek2 and read_seek were internalized and can't be used anymore, so we check directly the return of av_seek_frame. --- intern/ffmpeg/ffmpeg_compat.h | 9 +++++++++ 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 } +FFMPEG_INLINE +bool av_get_cur_key_frame_pts(const AVFrame *picture) { +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 29, 100) + return (picture->flags & AV_FRAME_FLAG_KEY); +#else + return (picture->key_frame); +#endif +} + /* -------------------------------------------------------------------- */ /** \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) { anim->cur_pts = av_get_pts_from_frame(anim->pFrame); - if (anim->pFrame->key_frame) { + if (av_get_cur_key_frame_pts(anim->pFrame)) { anim->cur_key_frame_pts = anim->cur_pts; } @@ -1032,11 +1032,10 @@ static int ffmpeg_seek_to_key_frame(ImBufAnim *anim, AVFormatContext *format_ctx = anim->pFormatCtx; - if (format_ctx->iformat->read_seek2 || format_ctx->iformat->read_seek) { - ret = av_seek_frame(anim->pFormatCtx, anim->videoStream, seek_pos, AVSEEK_FLAG_BACKWARD); - } - else { - ret = ffmpeg_generic_seek_workaround(anim, &seek_pos, pts_to_search); + int ret = av_seek_frame(anim->pFormatCtx, anim->videoStream, seek_pos, AVSEEK_FLAG_BACKWARD); + + if (ret < 0) { + ret = ffmpeg_generic_seek_workaround(anim, &seek_pos, pts_to_search);\ av_log(anim->pFormatCtx, AV_LOG_DEBUG, "Adjusted final seek seek_pos = %" PRId64 "\n", -- 2.30.2