Accepting request 983898 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/983898 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmlt?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
d08bf00e54
@ -0,0 +1,37 @@
|
||||
From 92e4cda6ee2b24e45d10415899ce4a2006fe65ba Mon Sep 17 00:00:00 2001
|
||||
From: Hans-Peter Jansen <hp@urpla.net>
|
||||
Date: Sun, 19 Jun 2022 22:58:02 +0200
|
||||
Subject: [PATCH] Supply a proper return value on non-void functions
|
||||
|
||||
---
|
||||
src/modules/plus/filter_sepia.c | 1 +
|
||||
src/modules/plus/filter_threshold.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/modules/plus/filter_sepia.c b/src/modules/plus/filter_sepia.c
|
||||
index 9634cf5..d2c4837 100644
|
||||
--- a/src/modules/plus/filter_sepia.c
|
||||
+++ b/src/modules/plus/filter_sepia.c
|
||||
@@ -55,6 +55,7 @@ static int do_slice_proc(int id, int index, int jobs, void* data)
|
||||
p[line_size - 1] = desc->u;
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
|
||||
diff --git a/src/modules/plus/filter_threshold.c b/src/modules/plus/filter_threshold.c
|
||||
index 2ab9b6a..3f31c54 100644
|
||||
--- a/src/modules/plus/filter_threshold.c
|
||||
+++ b/src/modules/plus/filter_threshold.c
|
||||
@@ -84,6 +84,7 @@ static int do_slice_proc(int id, int index, int jobs, void* data)
|
||||
}
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/** Get the images and apply the luminance of the mask to the alpha of the frame.
|
||||
--
|
||||
2.36.1
|
||||
|
||||
107
0001-fix-798-missing-function-returns.patch
Normal file
107
0001-fix-798-missing-function-returns.patch
Normal file
@ -0,0 +1,107 @@
|
||||
From 50bc133522cdf636928bda6b1b35541bf055c102 Mon Sep 17 00:00:00 2001
|
||||
From: Dan Dennedy <dan@dennedy.org>
|
||||
Date: Sun, 19 Jun 2022 14:01:15 -0700
|
||||
Subject: [PATCH] fix #798 missing function returns
|
||||
|
||||
---
|
||||
src/modules/core/filter_mirror.c | 1 +
|
||||
src/modules/core/filter_pillar_echo.c | 7 ++++---
|
||||
src/modules/kdenlive/filter_wave.c | 1 +
|
||||
src/modules/oldfilm/filter_tcolor.c | 1 +
|
||||
src/modules/plus/filter_invert.c | 1 +
|
||||
src/modules/plus/filter_spot_remover.c | 1 +
|
||||
6 files changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/modules/core/filter_mirror.c b/src/modules/core/filter_mirror.c
|
||||
index 5d584ad..9dd4530 100644
|
||||
--- a/src/modules/core/filter_mirror.c
|
||||
+++ b/src/modules/core/filter_mirror.c
|
||||
@@ -299,6 +299,7 @@ static int do_slice_proc(int id, int index, int jobs, void* data)
|
||||
}
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
|
||||
diff --git a/src/modules/core/filter_pillar_echo.c b/src/modules/core/filter_pillar_echo.c
|
||||
index a4f8ef8..ae3937c 100644
|
||||
--- a/src/modules/core/filter_pillar_echo.c
|
||||
+++ b/src/modules/core/filter_pillar_echo.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
- * filter_pillar_echo.c -- filter to interpolate pixels outside an area of interest
|
||||
- * Copyright (c) 2020-2021 Meltytech, LLC
|
||||
+ * filter_pillar_echo.c -- filter to interpolate pixels outside an area of
|
||||
+ * interest Copyright (c) 2020-2021 Meltytech, LLC
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -14,7 +14,7 @@
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "image_proc.h"
|
||||
@@ -159,6 +159,7 @@ static int scale_sliced_proc(int id, int index, int jobs, void* data)
|
||||
d += 4;
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/** Perform a bilinear scale from the rect inside the source to fill the destination
|
||||
diff --git a/src/modules/kdenlive/filter_wave.c b/src/modules/kdenlive/filter_wave.c
|
||||
index 91b625d..039ad3b 100644
|
||||
--- a/src/modules/kdenlive/filter_wave.c
|
||||
+++ b/src/modules/kdenlive/filter_wave.c
|
||||
@@ -78,6 +78,7 @@ static int do_wave_slice_proc(int id, int index, int jobs, void* data)
|
||||
*dst++ = getPoint(d->src, w, d->src_h, (x+decalX), (y+decalY), z);
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
|
||||
diff --git a/src/modules/oldfilm/filter_tcolor.c b/src/modules/oldfilm/filter_tcolor.c
|
||||
index b7dc2b2..aa55693 100644
|
||||
--- a/src/modules/oldfilm/filter_tcolor.c
|
||||
+++ b/src/modules/oldfilm/filter_tcolor.c
|
||||
@@ -51,6 +51,7 @@ static int do_slice_proc(int id, int index, int jobs, void* data)
|
||||
p[x+3] = CLAMP( ((double)p[x+3] - 127.0) * desc->over_cr + 127.0, 0, 255);
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
|
||||
diff --git a/src/modules/plus/filter_invert.c b/src/modules/plus/filter_invert.c
|
||||
index 28d072b..c524d96 100644
|
||||
--- a/src/modules/plus/filter_invert.c
|
||||
+++ b/src/modules/plus/filter_invert.c
|
||||
@@ -54,6 +54,7 @@ static int do_slice_proc(int id, int index, int jobs, void* data)
|
||||
p[x+1] = CLAMP(256 - p[x+1], min, max_chroma);
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
|
||||
diff --git a/src/modules/plus/filter_spot_remover.c b/src/modules/plus/filter_spot_remover.c
|
||||
index c87265b..d886285 100644
|
||||
--- a/src/modules/plus/filter_spot_remover.c
|
||||
+++ b/src/modules/plus/filter_spot_remover.c
|
||||
@@ -126,6 +126,7 @@ static int remove_spot_channel_proc(int id, int index, int jobs, void* data)
|
||||
p += step;
|
||||
}
|
||||
}
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,3 +1,88 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 27 15:54:21 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 7.6.0
|
||||
+ Framework:
|
||||
* Added `Mlt::Animation::next_key()` and `previous_key()` with
|
||||
error checking.
|
||||
* Fixed the `moduledir` and `mltdatadir` variables in the
|
||||
pkg-config file.
|
||||
* Removed calling `setlocale()` in `mlt_factory_init()` (moved
|
||||
to `melt` option `-setlocale`).
|
||||
* Added `mlt_properties_copy()` and `Mlt::Properties::copy()`.
|
||||
* Changed some primarily internal property names to consolidate
|
||||
on "consumer."
|
||||
as a prefix convention for all consumer properties copied to
|
||||
`mlt_frame`s.
|
||||
* Added consumer property `deinterlacer` to replace deprecated
|
||||
`deinterlace_method`.
|
||||
* Fixed full range color from producer to consumer.
|
||||
* Added `mlt_slices_size_slice()` helper function.
|
||||
* Fixed choppy playback due to large values in `frame_rate_num`
|
||||
or `frame_rate_den` in `mlt_consumer`.
|
||||
* Added performance optimization for a single slice in
|
||||
`mlt_slices`.
|
||||
+ Modules:
|
||||
* Added `audiolevelgraph` video filter to the `qt` module.
|
||||
* Added property `segment_gap` to the `audiospectrum` video
|
||||
filter.
|
||||
* Added `segments` property to the `audiolevelgraph` and
|
||||
`audiospectrum` filters.
|
||||
* Fixed loading image sequence with extended UTF-8 characters
|
||||
in the name of a folder for the `qimage` producer.
|
||||
* Fixed a crash in `avformat` producer if the `rotate` property
|
||||
is set after the first frame is fetched.
|
||||
* Added the `invert_mask` property to the `shape` video filter.
|
||||
* Changed `avformat` producer to normalize frame rates very
|
||||
close to non-integer broadcast frames 24/1.001, 30/1.001,
|
||||
and 60/1.001.
|
||||
* Converted the `chroma` and `chroma_hold` filters' `key`
|
||||
property to a proper color type.
|
||||
* Added slice threading to:
|
||||
- `avformat` producer (with FFmpeg v5)
|
||||
- `swsscale` (with FFmpeg v5)
|
||||
- `lift_gamma_gain`
|
||||
- `shape`
|
||||
- `charcoal`
|
||||
- `vignette`
|
||||
- `wave`
|
||||
- `threshold`
|
||||
- `tcolor`
|
||||
- `sepia`
|
||||
- `mirror`
|
||||
- `invert`
|
||||
- `grain`
|
||||
- `lines`
|
||||
- `spot_remover`
|
||||
* Improved the speed of the `oldfilm` filter.
|
||||
* Added a faster `box_blur` filter to the core module and
|
||||
deprecated the `boxblur` filter in the kdenlive module.
|
||||
* Fixed preview scaling for the `avfilter.gblur` filter.
|
||||
* Fixed incorrect text overlap in `kdenlivetitle` producer.
|
||||
* Improved audio synchronization in `avformat` when playing
|
||||
in reverse.
|
||||
* Added much more service metadata (documentation).
|
||||
* Fixed full range 10-bit video input in `avformat` producer.
|
||||
* Fixed full range color handling in:
|
||||
- `avformat` producer
|
||||
- `avcolor_space`
|
||||
- `brightness`
|
||||
- `resize`
|
||||
- `luma` transition
|
||||
- `movit.convert`
|
||||
- `charcoal`
|
||||
- `invert`
|
||||
- `shape`
|
||||
* Fixed identifying unsupported colorspaces in `avformat`
|
||||
producer.
|
||||
* Fixed preserving the alpha channel in the `avfilter.fspp`
|
||||
filter.
|
||||
+ Other
|
||||
* Some CMake fixes.
|
||||
- Add upstream fixes:
|
||||
* 0001-fix-798-missing-function-returns.patch
|
||||
* 0001-Supply-a-proper-return-value-on-non-void-functions.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 7 08:12:10 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
|
||||
|
||||
|
||||
12
libmlt.spec
12
libmlt.spec
@ -18,22 +18,25 @@
|
||||
|
||||
%define _name mlt
|
||||
%define libname lib%{_name}
|
||||
%define lversion 7.4.0
|
||||
%define lversion 7.6.0
|
||||
%define sover 7
|
||||
%define lib_pkgname %{libname}-%{sover}-%{sover}
|
||||
%define _name_pp %{_name}++
|
||||
%define libname_pp lib%{_name_pp}
|
||||
%define sover_pp 7
|
||||
%define lversion_pp 7.4.0
|
||||
%define lversion_pp 7.6.0
|
||||
%define libpp_pkgname %{libname_pp}-%{sover_pp}-%{sover_pp}
|
||||
Name: %{libname}
|
||||
Version: 7.4.0
|
||||
Version: 7.6.0
|
||||
Release: 0
|
||||
Summary: Multimedia framework for television broadcasting
|
||||
License: GPL-3.0-or-later
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://www.mltframework.org
|
||||
Source0: https://github.com/mltframework/mlt/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM -- Missing return values in non-void functions
|
||||
Patch0: 0001-fix-798-missing-function-returns.patch
|
||||
Patch1: 0001-Supply-a-proper-return-value-on-non-void-functions.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -172,8 +175,7 @@ transcoders and web streamers.
|
||||
This package contains python bindings.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%autopatch -p1
|
||||
%autosetup -p1 -n %{_name}-%{version}
|
||||
|
||||
%build
|
||||
# WARNING: building opencv module causes multicore issues - boo#1068792
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:17c19843ffdbca66777aaadf39acb11829fd930eaded92f768cbcb8ae59a5f37
|
||||
size 1206316
|
||||
3
mlt-7.6.0.tar.gz
Normal file
3
mlt-7.6.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:49f3c7902432a5a873ebce8406d901ac73623ff3dba7265b6e8b55cfe8220201
|
||||
size 1217853
|
||||
Loading…
x
Reference in New Issue
Block a user