Accepting request 1069875 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/1069875 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmlt?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6393055e3b
39
0001-Fix-compilation-with-Werror-return-type.patch
Normal file
39
0001-Fix-compilation-with-Werror-return-type.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 295f95261a56151243ff9b35ea41d8baa741734e Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
|
||||
Date: Tue, 7 Mar 2023 07:16:30 +0100
|
||||
Subject: [PATCH] Fix compilation with -Werror=return-type
|
||||
|
||||
---
|
||||
src/modules/avformat/common_swr.c | 2 +-
|
||||
src/modules/avformat/common_swr.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/modules/avformat/common_swr.c b/src/modules/avformat/common_swr.c
|
||||
index e30b017..3be0043 100644
|
||||
--- a/src/modules/avformat/common_swr.c
|
||||
+++ b/src/modules/avformat/common_swr.c
|
||||
@@ -106,7 +106,7 @@ int mlt_configure_swr_context( mlt_service service, mlt_swr_private_data *pdata
|
||||
return error;
|
||||
}
|
||||
|
||||
-int mlt_free_swr_context( mlt_swr_private_data *pdata )
|
||||
+void mlt_free_swr_context( mlt_swr_private_data *pdata )
|
||||
{
|
||||
if( pdata )
|
||||
{
|
||||
diff --git a/src/modules/avformat/common_swr.h b/src/modules/avformat/common_swr.h
|
||||
index 229975e..bc592e0 100644
|
||||
--- a/src/modules/avformat/common_swr.h
|
||||
+++ b/src/modules/avformat/common_swr.h
|
||||
@@ -39,7 +39,7 @@ typedef struct
|
||||
} mlt_swr_private_data;
|
||||
|
||||
int mlt_configure_swr_context( mlt_service service, mlt_swr_private_data *pdata );
|
||||
-int mlt_free_swr_context( mlt_swr_private_data *pdata );
|
||||
+void mlt_free_swr_context( mlt_swr_private_data *pdata );
|
||||
|
||||
|
||||
#endif // COMMON_H
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,3 +1,63 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 6 21:05:37 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 7.14.0
|
||||
Framework:
|
||||
* Added functions to get detailed info about a producer more
|
||||
directly
|
||||
* Added functions to add normalizer links to chains
|
||||
* Changed locale_t to mlt_locale_t to avoid redefinition on
|
||||
some systems (e.g. clang/llvm on win32).
|
||||
* Fixed the value provided with event "consumer-thread-join"
|
||||
to be mlt_event_data_thread as documented.
|
||||
* Fixed mlt_image_format_planes() for mlt_image_yuv420p.
|
||||
Modules
|
||||
* Added a swresample link to the avformat module.
|
||||
* Added a resample link to the resample module.
|
||||
* Fixed compatibility of avformat module with FFmpeg version 6.
|
||||
* Fixed rotoscoping filter when request image size different
|
||||
than profile.
|
||||
* Fixed timeremap link breaking crop filter.
|
||||
* Fixed audio/video sync in avformat producer when the video
|
||||
start time is not 0.
|
||||
* Improved seeking on a WMA audio file in avformat producer.
|
||||
* Optimization to set AVDISCARD_ALL on disinterested streams
|
||||
in avformat producer.
|
||||
* Added separate demuxing thread in avformat producer.
|
||||
* Added filtergraph property to the avformat producer.
|
||||
* Fixed filter movit.convert's CPU image converter in
|
||||
mlt_tractor and mlt_frame_clone().
|
||||
* Fixed using movit module with mlt_chain.
|
||||
* Fixed 10-bit full range YUV color input with Movit.
|
||||
* Fixed aspect ratio issues in qtblend filter transform.
|
||||
* Fixed the movit.luma transition.
|
||||
* Changed the qglsl consumer to use an OpenGL core profile
|
||||
version 3.2 context to make it compatible with recent
|
||||
Movit versions.
|
||||
* Upgraded glaxnimate git submodule to version 0.5.2.
|
||||
* Fixed xml producer incorrectly adds a path prefix to
|
||||
a consumer producer.
|
||||
* Fixed using opencv.tracker filter with mlt_chain.
|
||||
* Added interlace-aware chroma conversion from
|
||||
mlt_image_yuv422 to yuv420p in the avformat consumer.
|
||||
* Added the speed_map property to the timeremap link.
|
||||
* Fixed the loader producer not injecting the consumer producer
|
||||
when a xml producer changes the frame rate.
|
||||
* Fixed 'loader' producer corrupts the profile colorspace and
|
||||
description when it injects a consumer producer.
|
||||
* Added a loader-nogl producer to the core module based on
|
||||
loader but prevents adding movit-based filters.
|
||||
* Changed count producer to take an optional string argument
|
||||
with the name of a loader producer.
|
||||
* Fixed yadif deinterlace not working in a mlt_chain.
|
||||
* Fixed the bob, weave, greedy, onefield deinterlace filter
|
||||
methods on x86-64 architecture.
|
||||
Other:
|
||||
* Fixed SWIG python shadow functions for mlt7.
|
||||
* Added CMake build option MOD_GLAXNIMATE_QT6.
|
||||
- Add compilation fix:
|
||||
* 0001-Fix-compilation-with-Werror-return-type.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 20 10:38:23 UTC 2022 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
30
libmlt.spec
30
libmlt.spec
@ -18,28 +18,25 @@
|
||||
|
||||
%define _name mlt
|
||||
%define libname lib%{_name}
|
||||
%define lversion 7.12.0
|
||||
%define lversion 7.14.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.12.0
|
||||
%define lversion_pp 7.14.0
|
||||
%define libpp_pkgname %{libname_pp}-%{sover_pp}-%{sover_pp}
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
|
||||
# Qt 6 is not available in Leap 15.3
|
||||
%bcond_without Qt6
|
||||
# The glaxnimate module fails to build on 15.3
|
||||
%bcond_without glaxnimate
|
||||
%endif
|
||||
Name: %{libname}
|
||||
Version: 7.12.0
|
||||
Version: 7.14.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/releases/download/v%{version}/mlt-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-Fix-compilation-with-Werror-return-type.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -69,9 +66,7 @@ BuildRequires: pkgconfig(frei0r)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(jack)
|
||||
%if %{with glaxnimate}
|
||||
BuildRequires: pkgconfig(libarchive)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libavcodec) >= 58
|
||||
BuildRequires: pkgconfig(libavdevice) >= 58
|
||||
BuildRequires: pkgconfig(libavformat) >= 58
|
||||
@ -88,6 +83,8 @@ BuildRequires: pkgconfig(opencv4)
|
||||
BuildRequires: pkgconfig(pango)
|
||||
BuildRequires: pkgconfig(pangoft2)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
BuildRequires: pkgconfig(rtaudio)
|
||||
BuildRequires: pkgconfig(rubberband)
|
||||
BuildRequires: pkgconfig(samplerate)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
BuildRequires: pkgconfig(sox)
|
||||
@ -230,9 +227,8 @@ export CC=gcc-10 CXX=g++-10
|
||||
-DGPL3=ON \
|
||||
-DSWIG_PYTHON=ON \
|
||||
-DCMAKE_SKIP_RPATH=1 \
|
||||
%if %{with glaxnimate}
|
||||
-DMOD_GLAXNIMATE=ON \
|
||||
%endif
|
||||
-DMOD_GLAXNIMATE_QT6=ON \
|
||||
%if %{with Qt6}
|
||||
-DMOD_QT6=ON
|
||||
%endif
|
||||
@ -265,10 +261,8 @@ popd
|
||||
# remove dupes
|
||||
%fdupes %{buildroot}%{_datadir}/mlt-%{sover}
|
||||
|
||||
%post -n %{lib_pkgname} -p /sbin/ldconfig
|
||||
%postun -n %{lib_pkgname} -p /sbin/ldconfig
|
||||
%post -n %{libpp_pkgname} -p /sbin/ldconfig
|
||||
%postun -n %{libpp_pkgname} -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets -n %{lib_pkgname}
|
||||
%ldconfig_scriptlets -n %{libpp_pkgname}
|
||||
|
||||
%files -n %{lib_pkgname}
|
||||
%{_libdir}/lib%{_name}-%{sover}.so.%{sover}
|
||||
@ -297,13 +291,17 @@ popd
|
||||
%license GPLv3 COPYING GPL
|
||||
%{_libdir}/%{_name}-%{sover}
|
||||
%dir %{_datadir}/%{_name}-%{sover}/
|
||||
%{_datadir}/%{_name}-%{sover}/chain_normalizers.ini
|
||||
%exclude %{_libdir}/%{_name}-%{sover}/libmltglaxnimate-qt6.so
|
||||
%exclude %{_libdir}/%{_name}-%{sover}/libmltqt6.so
|
||||
|
||||
%if %{with Qt6}
|
||||
%files -n %{libname}%{sover}-module-qt6
|
||||
%dir %{_libdir}/%{_name}-%{sover}
|
||||
%{_libdir}/%{_name}-%{sover}/libmltglaxnimate-qt6.so
|
||||
%{_libdir}/%{_name}-%{sover}/libmltqt6.so
|
||||
%dir %{_datadir}/%{_name}-%{sover}/
|
||||
%{_datadir}/%{_name}-%{sover}/glaxnimate-qt6/
|
||||
%{_datadir}/%{_name}-%{sover}/qt6/
|
||||
%endif
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:48b385e83cbd5bf68bfc88631273868fbee36a41b3b7e2acd97f12b095b0083c
|
||||
size 1481720
|
||||
3
mlt-7.14.0.tar.gz
Normal file
3
mlt-7.14.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a7e83ed5e30f3f2d073d172c9d886310d8a73dbd2ee850ad44e3c43a9ab6394
|
||||
size 1509786
|
||||
Loading…
x
Reference in New Issue
Block a user