From c78bf3b30fe0bda2bb4e394aa134c1dc7e5a9084 Mon Sep 17 00:00:00 2001 From: Bart van Deenen Date: Sun, 30 Aug 2020 12:29:33 +0200 Subject: [PATCH] melt 6.22.1 patches removed, version updated, nothing else. Verified to work with Kdenlive --- srcpkgs/mlt/patches/cdefs.patch | 12 --------- srcpkgs/mlt/patches/qt5-5.15.0.patch | 40 ---------------------------- srcpkgs/mlt/template | 4 +-- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/mlt/patches/cdefs.patch delete mode 100644 srcpkgs/mlt/patches/qt5-5.15.0.patch diff --git a/srcpkgs/mlt/patches/cdefs.patch b/srcpkgs/mlt/patches/cdefs.patch deleted file mode 100644 index 73068f2ec1d..00000000000 --- a/srcpkgs/mlt/patches/cdefs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/modules/plus/ebur128/queue/sys/queue.h.orig 2020-01-18 21:31:21.319025308 +0100 -+++ src/modules/plus/ebur128/queue/sys/queue.h 2020-01-18 21:31:40.808858531 +0100 -@@ -33,7 +33,9 @@ - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - -+#ifdef __GLIBC__ - #include -+#endif - - /* - * This file defines four types of data structures: singly-linked lists, diff --git a/srcpkgs/mlt/patches/qt5-5.15.0.patch b/srcpkgs/mlt/patches/qt5-5.15.0.patch deleted file mode 100644 index 35151677b19..00000000000 --- a/srcpkgs/mlt/patches/qt5-5.15.0.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- src/modules/qt/producer_qtext.cpp 2020-02-16 23:31:58.000000000 +0100 -+++ src/modules/qt/producer_qtext.cpp 2020-07-28 06:18:44.995745573 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- src/modules/qt/kdenlivetitle_wrapper.cpp 2020-02-16 23:31:58.000000000 +0100 -+++ src/modules/qt/kdenlivetitle_wrapper.cpp 2020-07-28 06:21:45.582754889 +0200 -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - #include - #include ---- src/modules/qt/graph.h 2020-02-16 23:31:58.000000000 +0100 -+++ src/modules/qt/graph.h 2020-07-28 06:22:36.848757534 +0200 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include - - void setup_graph_painter( QPainter& p, QRectF& rect, mlt_properties filter_properties ); ---- src/modules/qt/filter_qtext.cpp 2020-02-16 23:31:58.000000000 +0100 -+++ src/modules/qt/filter_qtext.cpp 2020-07-28 06:23:09.603759224 +0200 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - - static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale ) diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 1579a5b21dd..ff3931a2f9a 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -1,6 +1,6 @@ # Template file for 'mlt' pkgname=mlt -version=6.20.0 +version=6.22.1 revision=1 build_style=gnu-configure configure_args="--enable-gpl --enable-gpl3 --disable-swfdec --without-kde @@ -17,7 +17,7 @@ maintainer="Diogo Leal " license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://mltframework.org/" distfiles="https://github.com/mltframework/mlt/archive/v${version}.tar.gz" -checksum=ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd +checksum=a3debdf0b8811f0d20c902cc3df3d05dad7d3ff36d1db16c0a7338d0d5989998 CFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1" CXXFLAGS+=" -DHAVE_STRTOD_L=1 -DHAVE_LOCALE_H=1"