Accepting request 508348 from home:kfreitag:branches:multimedia:libs

- Add patch from upstream that prevents crashes of apps in some 
  circumstances, as reported on openSUSE ML. 
  a3188e301b

OBS-URL: https://build.opensuse.org/request/show/508348
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libmlt?expand=0&rev=69
This commit is contained in:
Dave Plater 2017-07-05 13:23:23 +00:00 committed by Git OBS Bridge
parent fc702c699f
commit 5ccb61716c
3 changed files with 35 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 5 12:29:54 UTC 2017 - klaas.freitag@suse.com
- Add patch from upstream that prevents crashes of apps in some
circumstances, as reported on openSUSE ML.
https://github.com/mltframework/mlt/commit/a3188e301b5a9a1f25dbb98a510e366363348e64
-------------------------------------------------------------------
Fri Jun 9 14:06:51 UTC 2017 - davejplater@gmail.com

View File

@ -45,6 +45,8 @@ Patch1: libmlt-0.8.2-vdpau.patch
# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
Patch2: use-recommended-freetype-include.patch
Patch3: 6c658e5d8cd11933bf799a2a985aa4b24cfbcb60.patch
# PATCH-FIX-UPSTREAM remove superflous close to avoid crashes in for example kdenlive
Patch4: rem_close.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: ladspa-devel
@ -233,6 +235,7 @@ This package is needed to use MLT from Python.
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# To complement libmlt-0.8.0-vdpau.patch.
# When vdpau support is not compiled it will break the code. Doesn't matter because the code will not be used anyway.

25
rem_close.patch Normal file
View File

@ -0,0 +1,25 @@
From a3188e301b5a9a1f25dbb98a510e366363348e64 Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
Date: Sun, 19 Feb 2017 12:50:59 -0800
Subject: [PATCH] Allow Mlt::Repository to be deleted without bad side effect.
mlt_repository_close() is run by mlt_factory_close() when called either
directly, which requires all Mlt objects to be destroyed prior, or
atexit().
---
src/mlt++/MltRepository.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp
index 47a598bc..45522e40 100644
--- a/src/mlt++/MltRepository.cpp
+++ b/src/mlt++/MltRepository.cpp
@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository repository ) :
Repository::~Repository( )
{
- if ( instance )
- mlt_repository_close( instance );
instance = NULL;
}