Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ffmpeg-6 for openSUSE:Factory
checked in at 2023-08-02 16:48:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg-6 (Old)
and /work/SRC/openSUSE:Factory/.ffmpeg-6.new.22712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg-6"
Wed Aug 2 16:48:00 2023 rev:3 rq:1101527 version:6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg-6/ffmpeg-6.changes 2023-04-10
20:17:06.953005511 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-6.new.22712/ffmpeg-6.changes
2023-08-02 16:48:08.320508985 +0200
@@ -1,0 +2,9 @@
+Mon Jul 31 09:05:39 UTC 2023 - llyyr <llyyr.pub...@gmail.com>
+
+- Bump required libplacebo version to v6.292.0 or newer for TW
+- Temporarily demote deprecation errors to deprecation warnings
+ for vf_libplacebo
+- Add upstream patches to fix build with libplacebo v6:
+ * 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
+
+-------------------------------------------------------------------
New:
----
0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffmpeg-6.spec ++++++
--- /var/tmp/diff_new_pack.tXvs3k/_old 2023-08-02 16:48:09.208514386 +0200
+++ /var/tmp/diff_new_pack.tXvs3k/_new 2023-08-02 16:48:09.216514435 +0200
@@ -104,6 +104,7 @@
Patch3: ffmpeg-codec-choice.diff
Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
Patch5: work-around-abi-break.patch
+Patch6: 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
Patch10: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
@@ -185,7 +186,11 @@
BuildRequires: pkgconfig(vidstab) >= 0.98
%endif
%if %{with vulkan}
-BuildRequires: pkgconfig(libplacebo) >= 4.192.0
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires: pkgconfig(libplacebo) >= 6.292.0
+%else
+BuildRequires: (pkgconfig(libplacebo) >= 4.192.0 with pkgconfig (libplacebo)
< 6.292.0)
+%endif
BuildRequires: pkgconfig(shaderc)
BuildRequires: pkgconfig(vulkan) >= 1.2.189
%endif
@@ -524,7 +529,18 @@
break compatibility without any notice.
%prep
-%autosetup -a6 -p1 -n %_name-%version
+%setup -a6 -n %_name-%version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch10 -p1
+%patch91 -p1
+# Remove when packaging ffmpeg 6.1
+if pkg-config --atleast-version 6 libplacebo; then
+%patch6 -p1
+fi
%build
%ifarch %ix86 %arm
++++++ 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff ++++++
diff --git a/doc/filters.texi b/doc/filters.texi
index 47e92b9269..129c7b6cbf 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -16242,9 +16242,6 @@ Disable linear light scaling.
@item disable_builtin
Disable built-in GPU sampling (forces LUT).
-@item force_icc_lut
-Force the use of a full ICC 3DLUT for gamut mapping.
-
@item disable_fbos
Forcibly disable FBOs, resulting in loss of almost all functionality, but
offering the maximum possible speed.
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 7cd495de26..3a40a528d8 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -97,7 +97,6 @@ typedef struct LibplaceboContext {
float polar_cutoff;
int disable_linear;
int disable_builtin;
- int force_icc_lut;
int force_dither;
int disable_fbos;
@@ -137,6 +136,7 @@ typedef struct LibplaceboContext {
float desat_exp;
int gamut_warning;
int gamut_clipping;
+ int force_icc_lut;
/* pl_dither_params */
int dithering;
@@ -458,7 +458,6 @@ static int process_frames(AVFilterContext *avctx, AVFrame
*out, AVFrame *in)
.polar_cutoff = s->polar_cutoff,
.disable_linear_scaling = s->disable_linear,
.disable_builtin_scalers = s->disable_builtin,
- .force_icc_lut = s->force_icc_lut,
.force_dither = s->force_dither,
.disable_fbos = s->disable_fbos,
};
@@ -847,7 +846,9 @@ static const AVOption libplacebo_options[] = {
{ "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff),
AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC },
{ "disable_linear", "Disable linear scaling", OFFSET(disable_linear),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
{ "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
- { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping",
OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+#if FF_API_LIBPLACEBO_OPTS
+ { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
+#endif
{ "force_dither", "Force dithering", OFFSET(force_dither),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
{ "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos),
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
{ NULL },
