diff options
Diffstat (limited to 'deps/mlt/patches')
-rw-r--r-- | deps/mlt/patches/mlt_glibc226.patch | 28 | ||||
-rw-r--r-- | deps/mlt/patches/mlt_repository_close.patch | 25 |
2 files changed, 53 insertions, 0 deletions
diff --git a/deps/mlt/patches/mlt_glibc226.patch b/deps/mlt/patches/mlt_glibc226.patch new file mode 100644 index 0000000..255a604 --- /dev/null +++ b/deps/mlt/patches/mlt_glibc226.patch @@ -0,0 +1,28 @@ +From 2377c8665f93f87aa86fabbfd8e596572aacdf6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 7 Aug 2017 18:41:07 +0200 +Subject: [PATCH] mlt_property.h: Replace include xlocale.h by locale.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +xlocale.h was removed in glibc 2.26 + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + src/framework/mlt_property.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h +index 404d513f..156e0734 100644 +--- a/src/framework/mlt_property.h ++++ b/src/framework/mlt_property.h +@@ -31,7 +31,7 @@ + #endif + + #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) +-#include <xlocale.h> ++#include <locale.h> + #else + typedef char* locale_t; + #endif diff --git a/deps/mlt/patches/mlt_repository_close.patch b/deps/mlt/patches/mlt_repository_close.patch new file mode 100644 index 0000000..3711cce --- /dev/null +++ b/deps/mlt/patches/mlt_repository_close.patch @@ -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; + } + |