1 |
commit: e95aae1b6e09fbeab95cae9f6595378662a8519d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 2 14:01:35 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 2 14:13:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95aae1b |
7 |
|
8 |
media-libs/mlt: Drop 6.20.0-r2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/749810 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
media-libs/mlt/Manifest | 1 - |
15 |
.../mlt/files/mlt-6.20.0-crash-in-composite.patch | 34 -- |
16 |
...-6.20.0-crash-w-unsupported-preview-scale.patch | 48 --- |
17 |
media-libs/mlt/files/mlt-6.20.0-musl-locale.patch | 34 -- |
18 |
media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch | 421 --------------------- |
19 |
.../mlt/files/mlt-6.20.0-nullpointer-crash.patch | 22 -- |
20 |
.../files/mlt-6.20.0-opencv-double-del-crash.patch | 21 - |
21 |
media-libs/mlt/files/mlt-6.20.0-opencv4.patch | 45 --- |
22 |
media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch | 49 --- |
23 |
media-libs/mlt/mlt-6.20.0-r2.ebuild | 208 ---------- |
24 |
10 files changed, 883 deletions(-) |
25 |
|
26 |
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest |
27 |
index 26e118a2458..a4e8eb5d916 100644 |
28 |
--- a/media-libs/mlt/Manifest |
29 |
+++ b/media-libs/mlt/Manifest |
30 |
@@ -1,2 +1 @@ |
31 |
-DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B 50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac SHA512 939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3 |
32 |
DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 |
33 |
|
34 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch b/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch |
35 |
deleted file mode 100644 |
36 |
index e5ae5f01c9d..00000000000 |
37 |
--- a/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch |
38 |
+++ /dev/null |
39 |
@@ -1,34 +0,0 @@ |
40 |
-From 46a226217d8ec5bbf66a4fa3da138fd6924dd13b Mon Sep 17 00:00:00 2001 |
41 |
-From: Dan Dennedy <dan@×××××××.org> |
42 |
-Date: Wed, 25 Mar 2020 16:06:34 -0700 |
43 |
-Subject: [PATCH] fix #535 crash in composite when PGM luma fails to load |
44 |
- |
45 |
---- |
46 |
- src/modules/core/transition_composite.c | 6 +++--- |
47 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
48 |
- |
49 |
-diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c |
50 |
-index e6d078e36..24a0d30c7 100644 |
51 |
---- a/src/modules/core/transition_composite.c |
52 |
-+++ b/src/modules/core/transition_composite.c |
53 |
-@@ -1,6 +1,6 @@ |
54 |
- /* |
55 |
- * transition_composite.c -- compose one image over another using alpha channel |
56 |
-- * Copyright (C) 2003-2019 Meltytech, LLC |
57 |
-+ * Copyright (C) 2003-2020 Meltytech, LLC |
58 |
- * |
59 |
- * This library is free software; you can redistribute it and/or |
60 |
- * modify it under the terms of the GNU Lesser General Public |
61 |
-@@ -697,10 +697,10 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w |
62 |
- { |
63 |
- luma_width = 0; |
64 |
- luma_height = 0; |
65 |
-- } |
66 |
-+ } |
67 |
- } |
68 |
- } |
69 |
-- if ( luma_width > 0 && luma_height > 0 ) |
70 |
-+ if ( orig_bitmap && luma_width > 0 && luma_height > 0 ) |
71 |
- { |
72 |
- // Scale luma map |
73 |
- luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) ); |
74 |
|
75 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch b/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch |
76 |
deleted file mode 100644 |
77 |
index 25057b3c1ae..00000000000 |
78 |
--- a/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch |
79 |
+++ /dev/null |
80 |
@@ -1,48 +0,0 @@ |
81 |
-From dc585bfa5765db418923e7b4802c03bc57733111 Mon Sep 17 00:00:00 2001 |
82 |
-From: Dan Dennedy <dan@×××××××.org> |
83 |
-Date: Mon, 2 Mar 2020 14:02:26 -0800 |
84 |
-Subject: [PATCH] fix crash with filters not supporting preview scale |
85 |
- |
86 |
---- |
87 |
- src/modules/frei0r/transition_frei0r.c | 18 +++++++++++++++++- |
88 |
- 1 file changed, 17 insertions(+), 1 deletion(-) |
89 |
- |
90 |
-diff --git a/src/modules/frei0r/transition_frei0r.c b/src/modules/frei0r/transition_frei0r.c |
91 |
-index b69011719..f11266b75 100644 |
92 |
---- a/src/modules/frei0r/transition_frei0r.c |
93 |
-+++ b/src/modules/frei0r/transition_frei0r.c |
94 |
-@@ -1,7 +1,7 @@ |
95 |
- /* |
96 |
- * transition_frei0r.c -- frei0r transition |
97 |
- * Copyright (c) 2008 Marco Gittler <g.marco@×××××××.de> |
98 |
-- * Copyright (C) 2009-2019 Meltytech, LLC |
99 |
-+ * Copyright (C) 2009-2020 Meltytech, LLC |
100 |
- * |
101 |
- * This library is free software; you can redistribute it and/or |
102 |
- * modify it under the terms of the GNU Lesser General Public |
103 |
-@@ -67,9 +67,25 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f |
104 |
- } |
105 |
- else |
106 |
- { |
107 |
-+ mlt_image_format b_format = *format; |
108 |
-+ int b_width = *width; |
109 |
-+ int b_height = *height; |
110 |
-+ |
111 |
- error = mlt_frame_get_image( a_frame, &images[0], format, width, height, 0 ); |
112 |
- if ( error ) return error; |
113 |
- |
114 |
-+ if (*width != b_width || *height != b_height) { |
115 |
-+ if (invert) { |
116 |
-+ *image = images[0]; |
117 |
-+ } else { |
118 |
-+ *image = images[1]; |
119 |
-+ *format = b_format; |
120 |
-+ *width = b_width; |
121 |
-+ *height = b_height; |
122 |
-+ } |
123 |
-+ return error; |
124 |
-+ } |
125 |
-+ |
126 |
- mlt_position position = mlt_transition_get_position( transition, a_frame ); |
127 |
- mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( transition ) ); |
128 |
- double time = (double) position / mlt_profile_fps( profile ); |
129 |
|
130 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch |
131 |
deleted file mode 100644 |
132 |
index ed206108d2e..00000000000 |
133 |
--- a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch |
134 |
+++ /dev/null |
135 |
@@ -1,34 +0,0 @@ |
136 |
-From d02611584d4b2f693469c72272fe369413139394 Mon Sep 17 00:00:00 2001 |
137 |
-From: Carlo Landmeter <clandmeter@×××××.com> |
138 |
-Date: Sun, 6 Nov 2016 00:45:44 +0100 |
139 |
-Subject: testing/mlt: new aport |
140 |
- |
141 |
---- |
142 |
- testing/mlt/musl-locale.patch | 13 +++++++++++++ |
143 |
- 1 file changed, 13 insertions(+) |
144 |
- create mode 100644 testing/mlt/musl-locale.patch |
145 |
- |
146 |
-(limited to 'testing/mlt/musl-locale.patch') |
147 |
- |
148 |
-diff --git a/testing/mlt/musl-locale.patch b/testing/mlt/musl-locale.patch |
149 |
-new file mode 100644 |
150 |
-index 0000000000..030bb781d1 |
151 |
---- /dev/null |
152 |
-+++ b/testing/mlt/musl-locale.patch |
153 |
-@@ -0,0 +1,13 @@ |
154 |
-+--- ./src/framework/mlt_property.h.orig |
155 |
-++++ ./src/framework/mlt_property.h |
156 |
-+@@ -30,8 +30,8 @@ |
157 |
-+ #include <sys/param.h> |
158 |
-+ #endif |
159 |
-+ |
160 |
-+-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) |
161 |
-+-#include <xlocale.h> |
162 |
-++#if defined(__linux__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) |
163 |
-++#include <locale.h> |
164 |
-+ #else |
165 |
-+ typedef char* locale_t; |
166 |
-+ #endif |
167 |
--- |
168 |
-cgit v1.2.1 |
169 |
- |
170 |
|
171 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch b/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch |
172 |
deleted file mode 100644 |
173 |
index 5031ab374f6..00000000000 |
174 |
--- a/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch |
175 |
+++ /dev/null |
176 |
@@ -1,421 +0,0 @@ |
177 |
-From 1c45ceae1d06cd3df7063e2644140b647b6d0acd Mon Sep 17 00:00:00 2001 |
178 |
-From: martin <martin.sandsmark@×××.org> |
179 |
-Date: Mon, 13 Apr 2020 19:15:32 +0000 |
180 |
-Subject: [PATCH] split out gdk code from gtk2 code, disable gtk2 by default |
181 |
- (#544) |
182 |
- |
183 |
-* split gtk2 code out from gdk code |
184 |
- |
185 |
-* remove gtk2 module from default build |
186 |
---- |
187 |
- CMakeLists.txt | 2 +- |
188 |
- src/modules/gdk/CMakeLists.txt | 39 ++++++++ |
189 |
- src/modules/gdk/Makefile | 74 +++++++++++++++ |
190 |
- src/modules/gdk/configure | 82 +++++++++++++++++ |
191 |
- src/modules/gdk/factory.c | 92 +++++++++++++++++++ |
192 |
- src/modules/{gtk2 => gdk}/filter_rescale.c | 0 |
193 |
- src/modules/{gtk2 => gdk}/filter_rescale.yml | 0 |
194 |
- src/modules/{gtk2 => gdk}/have_mmx.S | 0 |
195 |
- src/modules/{gtk2 => gdk}/pixops.c | 0 |
196 |
- src/modules/{gtk2 => gdk}/pixops.h | 0 |
197 |
- src/modules/{gtk2 => gdk}/producer_pango.c | 1 - |
198 |
- src/modules/{gtk2 => gdk}/producer_pango.yml | 0 |
199 |
- src/modules/{gtk2 => gdk}/producer_pixbuf.c | 0 |
200 |
- src/modules/{gtk2 => gdk}/producer_pixbuf.yml | 0 |
201 |
- .../{gtk2 => gdk}/scale_line_22_yuv_mmx.S | 0 |
202 |
- src/modules/gtk2/deprecated | 0 |
203 |
- 20 files changed, 291 insertions(+), 151 deletions(-) |
204 |
- create mode 100644 src/modules/gdk/CMakeLists.txt |
205 |
- create mode 100644 src/modules/gdk/Makefile |
206 |
- create mode 100755 src/modules/gdk/configure |
207 |
- create mode 100644 src/modules/gdk/factory.c |
208 |
- rename src/modules/{gtk2 => gdk}/filter_rescale.c (100%) |
209 |
- rename src/modules/{gtk2 => gdk}/filter_rescale.yml (100%) |
210 |
- rename src/modules/{gtk2 => gdk}/have_mmx.S (100%) |
211 |
- rename src/modules/{gtk2 => gdk}/pixops.c (100%) |
212 |
- rename src/modules/{gtk2 => gdk}/pixops.h (100%) |
213 |
- rename src/modules/{gtk2 => gdk}/producer_pango.c (99%) |
214 |
- rename src/modules/{gtk2 => gdk}/producer_pango.yml (100%) |
215 |
- rename src/modules/{gtk2 => gdk}/producer_pixbuf.c (100%) |
216 |
- rename src/modules/{gtk2 => gdk}/producer_pixbuf.yml (100%) |
217 |
- rename src/modules/{gtk2 => gdk}/scale_line_22_yuv_mmx.S (100%) |
218 |
- create mode 100644 src/modules/gtk2/deprecated |
219 |
- |
220 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
221 |
-index 54afeceda..e25ca68b0 100644 |
222 |
---- a/CMakeLists.txt |
223 |
-+++ b/CMakeLists.txt |
224 |
-@@ -31,7 +31,7 @@ set(modules |
225 |
- src/modules/decklink |
226 |
- src/modules/frei0r |
227 |
- src/modules/feeds |
228 |
-- src/modules/gtk2 |
229 |
-+ src/modules/gdk |
230 |
- src/modules/kdenlive |
231 |
- src/modules/motion_est |
232 |
- src/modules/normalize |
233 |
-diff --git a/src/modules/gdk/CMakeLists.txt b/src/modules/gdk/CMakeLists.txt |
234 |
-new file mode 100644 |
235 |
-index 000000000..b7bdb2c24 |
236 |
---- /dev/null |
237 |
-+++ b/src/modules/gdk/CMakeLists.txt |
238 |
-@@ -0,0 +1,39 @@ |
239 |
-+set(mltgdk_src factory.c) |
240 |
-+set(mltgdk_lib mlt m Threads::Threads) |
241 |
-+set(mltgdk_def "") |
242 |
-+ |
243 |
-+ |
244 |
-+pkg_check_modules(GdkPixbuf IMPORTED_TARGET gdk-pixbuf-2.0 REQUIRED) |
245 |
-+if(TARGET PkgConfig::GdkPixbuf) |
246 |
-+ list(APPEND mltgdk_src producer_pixbuf.c pixops.c filter_rescale.c) |
247 |
-+ list(APPEND mltgdk_lib PkgConfig::GdkPixbuf) |
248 |
-+ list(APPEND mltgdk_def USE_PIXBUF) |
249 |
-+ message(STATUS "${mltgdk_lib}") |
250 |
-+else() |
251 |
-+ message(FATAL_ERROR "Failed to find gdk pixbuf") |
252 |
-+endif() |
253 |
-+ |
254 |
-+pkg_check_modules(pango IMPORTED_TARGET pango) |
255 |
-+if(TARGET PkgConfig::pango) |
256 |
-+ pkg_check_modules(fontconfig IMPORTED_TARGET fontconfig) |
257 |
-+ if(TARGET PkgConfig::fontconfig) |
258 |
-+ list(APPEND mltgdk_src producer_pango.c) |
259 |
-+ list(APPEND mltgdk_lib PkgConfig::pango PkgConfig::fontconfig) |
260 |
-+ list(APPEND mltgdk_def USE_PANGO) |
261 |
-+ endif() |
262 |
-+endif() |
263 |
-+ |
264 |
-+pkg_check_modules(libexif IMPORTED_TARGET libexif) |
265 |
-+if(TARGET PkgConfig::libexif) |
266 |
-+ list(APPEND mltgdk_lib PkgConfig::libexif) |
267 |
-+ list(APPEND mltgdk_def USE_EXIF) |
268 |
-+endif() |
269 |
-+# Only for MMX but not x86_64: deprecated |
270 |
-+# list(APPEND mltgdk_src have_mmx.S scale_line_22_yuv_mmx.S) |
271 |
-+add_library(mltgdk MODULE ${mltgdk_src}) |
272 |
-+target_link_libraries(mltgdk ${mltgdk_lib}) |
273 |
-+target_compile_definitions(mltgdk PRIVATE ${mltgdk_def}) |
274 |
-+install(TARGETS mltgdk LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt) |
275 |
-+file(GLOB yml *.yml) |
276 |
-+install(FILES ${yml} |
277 |
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/gdk) |
278 |
-diff --git a/src/modules/gdk/Makefile b/src/modules/gdk/Makefile |
279 |
-new file mode 100644 |
280 |
-index 000000000..2e3018976 |
281 |
---- /dev/null |
282 |
-+++ b/src/modules/gdk/Makefile |
283 |
-@@ -0,0 +1,74 @@ |
284 |
-+include ../../../config.mak |
285 |
-+include config.mak |
286 |
-+ |
287 |
-+CFLAGS := -I../.. $(CFLAGS) |
288 |
-+ |
289 |
-+LDFLAGS := -L../../framework -lmlt -lpthread -lm $(LDFLAGS) |
290 |
-+ |
291 |
-+TARGET = ../libmltgdk$(LIBSUF) |
292 |
-+ |
293 |
-+OBJS = factory.o |
294 |
-+ |
295 |
-+ifdef USE_PIXBUF |
296 |
-+OBJS += producer_pixbuf.o pixops.o filter_rescale.o |
297 |
-+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0) |
298 |
-+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0) |
299 |
-+endif |
300 |
-+ |
301 |
-+ifdef USE_EXIF |
302 |
-+CFLAGS += $(EXIFCXXFLAGS) |
303 |
-+LDFLAGS += $(EXIFLIBS) |
304 |
-+endif |
305 |
-+ |
306 |
-+ifdef MMX_FLAGS |
307 |
-+ifndef ARCH_X86_64 |
308 |
-+ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o |
309 |
-+endif |
310 |
-+endif |
311 |
-+ |
312 |
-+ifdef USE_PANGO |
313 |
-+OBJS += producer_pango.o |
314 |
-+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2) |
315 |
-+CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags-only-I freetype2 | awk '{for (i=1; i<=NF; i++) $$i=sprintf("%s/freetype", $$i); print}') |
316 |
-+LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2) |
317 |
-+ifeq ($(targetos),Darwin) |
318 |
-+LDFLAGS += -liconv |
319 |
-+endif |
320 |
-+ifeq ($(targetos),FreeBSD) |
321 |
-+LDFLAGS += -liconv |
322 |
-+endif |
323 |
-+ifeq ($(targetos), MinGW) |
324 |
-+LDFLAGS += -liconv |
325 |
-+endif |
326 |
-+endif |
327 |
-+ |
328 |
-+SRCS := $(OBJS:.o=.c) |
329 |
-+ |
330 |
-+all: $(TARGET) |
331 |
-+ |
332 |
-+$(TARGET): $(OBJS) $(ASM_OBJS) |
333 |
-+ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) |
334 |
-+ |
335 |
-+have_mmx.o: |
336 |
-+ $(CC) -o $@ -c have_mmx.S |
337 |
-+ |
338 |
-+scale_line_22_yuv_mmx.o: scale_line_22_yuv_mmx.S |
339 |
-+ $(CC) -o $@ -c scale_line_22_yuv_mmx.S |
340 |
-+ |
341 |
-+depend: $(SRCS) |
342 |
-+ $(CC) -MM $(CFLAGS) $^ 1>.depend |
343 |
-+ |
344 |
-+distclean: clean |
345 |
-+ rm -f .depend |
346 |
-+ |
347 |
-+clean: |
348 |
-+ rm -f $(OBJS) $(ASM_OBJS) $(TARGET) |
349 |
-+ |
350 |
-+install: all |
351 |
-+ install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" |
352 |
-+ install -d "$(DESTDIR)$(mltdatadir)/gdk" |
353 |
-+ install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gdk" |
354 |
-+ |
355 |
-+ifneq ($(wildcard .depend),) |
356 |
-+include .depend |
357 |
-+endif |
358 |
-diff --git a/src/modules/gdk/configure b/src/modules/gdk/configure |
359 |
-new file mode 100755 |
360 |
-index 000000000..07003b049 |
361 |
---- /dev/null |
362 |
-+++ b/src/modules/gdk/configure |
363 |
-@@ -0,0 +1,82 @@ |
364 |
-+#!/bin/sh |
365 |
-+ |
366 |
-+if [ "$help" = "1" ] |
367 |
-+then |
368 |
-+ cat << EOF |
369 |
-+GDK options: |
370 |
-+ |
371 |
-+ --gdk-prefix=path - Override the gdk prefix for pkg-config |
372 |
-+ |
373 |
-+EOF |
374 |
-+ |
375 |
-+else |
376 |
-+ pkgconfig_prefix= |
377 |
-+ for i in "$@" |
378 |
-+ do |
379 |
-+ case $i in |
380 |
-+ --gdk-prefix=* ) pkgconfig_prefix="${i#--gdk-prefix=}" ;; |
381 |
-+ esac |
382 |
-+ done |
383 |
-+ [ "$pkgconfig_prefix" != "" ] && pkgconfig_prefix="--define-variable=prefix=\"$pkgconfig_prefix\"" |
384 |
-+ |
385 |
-+ pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 2> /dev/null |
386 |
-+ disable_pixbuf=$? |
387 |
-+ |
388 |
-+ pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 pangoft2 2> /dev/null |
389 |
-+ disable_pango=$? |
390 |
-+ |
391 |
-+ if [ "$disable_pixbuf" != 0 -a "$disable_pango" != "0" ] |
392 |
-+ then |
393 |
-+ echo "- GDK components not found: disabling" |
394 |
-+ touch ../disable-gdk |
395 |
-+ exit 0 |
396 |
-+ fi |
397 |
-+ |
398 |
-+ echo > config.mak |
399 |
-+ |
400 |
-+ if [ "$disable_pixbuf" = "0" ] |
401 |
-+ then |
402 |
-+ echo "CFLAGS += -DUSE_PIXBUF" >> config.mak |
403 |
-+ echo "USE_PIXBUF=1" >> config.mak |
404 |
-+ else |
405 |
-+ echo "- pixbuf not found: pixbuf loader and rescaler disabled" |
406 |
-+ fi |
407 |
-+ |
408 |
-+ if [ "$disable_pango" = "0" ] |
409 |
-+ then |
410 |
-+ echo "CFLAGS += -DUSE_PANGO" >> config.mak |
411 |
-+ echo "USE_PANGO=1" >> config.mak |
412 |
-+ else |
413 |
-+ echo "- pango not found: pango titler disabled" |
414 |
-+ fi |
415 |
-+ |
416 |
-+ [ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=$pkgconfig_prefix" >> config.mak |
417 |
-+ |
418 |
-+ pkg-config --exists 'libexif' |
419 |
-+ if [ $? -eq 0 ] |
420 |
-+ then |
421 |
-+ echo "- Libexif found, enabling auto rotate" |
422 |
-+ echo "USE_EXIF=1" >> config.mak |
423 |
-+ echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak |
424 |
-+ echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak |
425 |
-+ echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak |
426 |
-+ elif [ -d "$exif_libdir" -a -d "$exif_includedir" ] |
427 |
-+ then |
428 |
-+ # test if we have a libexif |
429 |
-+ if [ -f "$exif_libdir/exif-data.h" ] |
430 |
-+ then |
431 |
-+ echo "- Libexif found, enabling auto rotate" |
432 |
-+ echo "USE_EXIF=1" >> config.mak |
433 |
-+ echo EXIFCXXFLAGS=-I$exif_includedir >> config.mak |
434 |
-+ echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak |
435 |
-+ echo EXIFLIBS=-L$exif_libdir lexif >> config.mak |
436 |
-+ else |
437 |
-+ echo "- Libexif not found, disabling exif features (auto rotate)" |
438 |
-+ fi |
439 |
-+ else |
440 |
-+ echo "- Libexif not found, disabling exif features (auto rotate)" |
441 |
-+ fi |
442 |
-+ |
443 |
-+ exit 0 |
444 |
-+fi |
445 |
-+ |
446 |
-diff --git a/src/modules/gdk/factory.c b/src/modules/gdk/factory.c |
447 |
-new file mode 100644 |
448 |
-index 000000000..94b89466e |
449 |
---- /dev/null |
450 |
-+++ b/src/modules/gdk/factory.c |
451 |
-@@ -0,0 +1,92 @@ |
452 |
-+/* |
453 |
-+ * factory.c -- the factory method interfaces |
454 |
-+ * Copyright (C) 2003-2014 Meltytech, LLC |
455 |
-+ * |
456 |
-+ * This library is free software; you can redistribute it and/or |
457 |
-+ * modify it under the terms of the GNU Lesser General Public |
458 |
-+ * License as published by the Free Software Foundation; either |
459 |
-+ * version 2.1 of the License, or (at your option) any later version. |
460 |
-+ * |
461 |
-+ * This library is distributed in the hope that it will be useful, |
462 |
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
463 |
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
464 |
-+ * Lesser General Public License for more details. |
465 |
-+ * |
466 |
-+ * You should have received a copy of the GNU Lesser General Public |
467 |
-+ * License along with this library; if not, write to the Free Software |
468 |
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
469 |
-+ */ |
470 |
-+ |
471 |
-+#include <string.h> |
472 |
-+#include <framework/mlt.h> |
473 |
-+#include <stdlib.h> |
474 |
-+ |
475 |
-+#ifdef USE_PIXBUF |
476 |
-+extern mlt_producer producer_pixbuf_init( char *filename ); |
477 |
-+extern mlt_filter filter_rescale_init( mlt_profile profile, char *arg ); |
478 |
-+#endif |
479 |
-+ |
480 |
-+#ifdef USE_PANGO |
481 |
-+extern mlt_producer producer_pango_init( const char *filename ); |
482 |
-+#endif |
483 |
-+ |
484 |
-+static void initialise( ) |
485 |
-+{ |
486 |
-+ static int init = 0; |
487 |
-+ if ( init == 0 ) |
488 |
-+ { |
489 |
-+ init = 1; |
490 |
-+ if ( getenv("MLT_PIXBUF_PRODUCER_CACHE") ) |
491 |
-+ { |
492 |
-+ int n = atoi( getenv("MLT_PIXBUF_PRODUCER_CACHE" ) ); |
493 |
-+ mlt_service_cache_set_size( NULL, "pixbuf.image", n ); |
494 |
-+ mlt_service_cache_set_size( NULL, "pixbuf.alpha", n ); |
495 |
-+ mlt_service_cache_set_size( NULL, "pixbuf.pixbuf", n ); |
496 |
-+ } |
497 |
-+ if ( getenv("MLT_PANGO_PRODUCER_CACHE") ) |
498 |
-+ { |
499 |
-+ int n = atoi( getenv("MLT_PANGO_PRODUCER_CACHE" ) ); |
500 |
-+ mlt_service_cache_set_size( NULL, "pango.image", n ); |
501 |
-+ } |
502 |
-+ } |
503 |
-+} |
504 |
-+ |
505 |
-+void *create_service( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) |
506 |
-+{ |
507 |
-+ initialise( ); |
508 |
-+ |
509 |
-+#ifdef USE_PIXBUF |
510 |
-+ if ( !strcmp( id, "pixbuf" ) ) |
511 |
-+ return producer_pixbuf_init( arg ); |
512 |
-+#endif |
513 |
-+ |
514 |
-+#ifdef USE_PANGO |
515 |
-+ if ( !strcmp( id, "pango" ) ) |
516 |
-+ return producer_pango_init( arg ); |
517 |
-+#endif |
518 |
-+ |
519 |
-+#ifdef USE_PIXBUF |
520 |
-+ if ( !strcmp( id, "gtkrescale" ) ) |
521 |
-+ return filter_rescale_init( profile, arg ); |
522 |
-+#endif |
523 |
-+ |
524 |
-+ return NULL; |
525 |
-+} |
526 |
-+ |
527 |
-+static mlt_properties metadata( mlt_service_type type, const char *id, void *data ) |
528 |
-+{ |
529 |
-+ char file[ PATH_MAX ]; |
530 |
-+ snprintf( file, PATH_MAX, "%s/gtk2/%s", mlt_environment( "MLT_DATA" ), (char*) data ); |
531 |
-+ return mlt_properties_parse_yaml( file ); |
532 |
-+} |
533 |
-+ |
534 |
-+MLT_REPOSITORY |
535 |
-+{ |
536 |
-+ MLT_REGISTER( filter_type, "gtkrescale", create_service ); |
537 |
-+ MLT_REGISTER( producer_type, "pango", create_service ); |
538 |
-+ MLT_REGISTER( producer_type, "pixbuf", create_service ); |
539 |
-+ |
540 |
-+ MLT_REGISTER_METADATA( filter_type, "gtkrescale", metadata, "filter_rescale.yml" ); |
541 |
-+ MLT_REGISTER_METADATA( producer_type, "pango", metadata, "producer_pango.yml" ); |
542 |
-+ MLT_REGISTER_METADATA( producer_type, "pixbuf", metadata, "producer_pixbuf.yml" ); |
543 |
-+} |
544 |
-diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gdk/filter_rescale.c |
545 |
-similarity index 100% |
546 |
-rename from src/modules/gtk2/filter_rescale.c |
547 |
-rename to src/modules/gdk/filter_rescale.c |
548 |
-diff --git a/src/modules/gtk2/filter_rescale.yml b/src/modules/gdk/filter_rescale.yml |
549 |
-similarity index 100% |
550 |
-rename from src/modules/gtk2/filter_rescale.yml |
551 |
-rename to src/modules/gdk/filter_rescale.yml |
552 |
-diff --git a/src/modules/gtk2/have_mmx.S b/src/modules/gdk/have_mmx.S |
553 |
-similarity index 100% |
554 |
-rename from src/modules/gtk2/have_mmx.S |
555 |
-rename to src/modules/gdk/have_mmx.S |
556 |
-diff --git a/src/modules/gtk2/pixops.c b/src/modules/gdk/pixops.c |
557 |
-similarity index 100% |
558 |
-rename from src/modules/gtk2/pixops.c |
559 |
-rename to src/modules/gdk/pixops.c |
560 |
-diff --git a/src/modules/gtk2/pixops.h b/src/modules/gdk/pixops.h |
561 |
-similarity index 100% |
562 |
-rename from src/modules/gtk2/pixops.h |
563 |
-rename to src/modules/gdk/pixops.h |
564 |
-diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gdk/producer_pango.c |
565 |
-similarity index 99% |
566 |
-rename from src/modules/gtk2/producer_pango.c |
567 |
-rename to src/modules/gdk/producer_pango.c |
568 |
-index b3e11b942..ead6e9123 100644 |
569 |
---- a/src/modules/gtk2/producer_pango.c |
570 |
-+++ b/src/modules/gdk/producer_pango.c |
571 |
-@@ -172,7 +172,6 @@ mlt_producer producer_pango_init( const char *filename ) |
572 |
- pthread_mutex_lock( &pango_mutex ); |
573 |
- if ( fontmap == NULL ) |
574 |
- fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new(); |
575 |
-- g_type_init(); |
576 |
- pthread_mutex_unlock( &pango_mutex ); |
577 |
- |
578 |
- producer->get_frame = producer_get_frame; |
579 |
-diff --git a/src/modules/gtk2/producer_pango.yml b/src/modules/gdk/producer_pango.yml |
580 |
-similarity index 100% |
581 |
-rename from src/modules/gtk2/producer_pango.yml |
582 |
-rename to src/modules/gdk/producer_pango.yml |
583 |
-diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gdk/producer_pixbuf.c |
584 |
-similarity index 100% |
585 |
-rename from src/modules/gtk2/producer_pixbuf.c |
586 |
-rename to src/modules/gdk/producer_pixbuf.c |
587 |
-diff --git a/src/modules/gtk2/producer_pixbuf.yml b/src/modules/gdk/producer_pixbuf.yml |
588 |
-similarity index 100% |
589 |
-rename from src/modules/gtk2/producer_pixbuf.yml |
590 |
-rename to src/modules/gdk/producer_pixbuf.yml |
591 |
-diff --git a/src/modules/gtk2/scale_line_22_yuv_mmx.S b/src/modules/gdk/scale_line_22_yuv_mmx.S |
592 |
-similarity index 100% |
593 |
-rename from src/modules/gtk2/scale_line_22_yuv_mmx.S |
594 |
-rename to src/modules/gdk/scale_line_22_yuv_mmx.S |
595 |
-diff --git a/src/modules/gtk2/deprecated b/src/modules/gtk2/deprecated |
596 |
-new file mode 100644 |
597 |
-index 000000000..e69de29bb |
598 |
|
599 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch b/media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch |
600 |
deleted file mode 100644 |
601 |
index 6bff797c0a9..00000000000 |
602 |
--- a/media-libs/mlt/files/mlt-6.20.0-nullpointer-crash.patch |
603 |
+++ /dev/null |
604 |
@@ -1,22 +0,0 @@ |
605 |
-From b32be6e56e328bb2e580aa13cd757aa211310bae Mon Sep 17 00:00:00 2001 |
606 |
-From: Dan Dennedy <dan@×××××××.org> |
607 |
-Date: Thu, 27 Feb 2020 23:49:07 -0800 |
608 |
-Subject: [PATCH] fix null pointer crash in mix transition |
609 |
- |
610 |
---- |
611 |
- src/modules/core/transition_mix.c | 2 +- |
612 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
613 |
- |
614 |
-diff --git a/src/modules/core/transition_mix.c b/src/modules/core/transition_mix.c |
615 |
-index ab7a166d0..89c07a285 100644 |
616 |
---- a/src/modules/core/transition_mix.c |
617 |
-+++ b/src/modules/core/transition_mix.c |
618 |
-@@ -139,7 +139,7 @@ static int transition_get_audio( mlt_frame frame_a, void **buffer, mlt_audio_for |
619 |
- mlt_frame_get_audio( frame_a, (void**) &buffer_a, format, &frequency_a, &channels_a, &samples_a ); |
620 |
- |
621 |
- // Prevent dividing by zero. |
622 |
-- if ( !channels_a || !channels_b ) |
623 |
-+ if ( !channels_a || !channels_b || !buffer_a || !buffer_b ) |
624 |
- return 1; |
625 |
- |
626 |
- if ( buffer_b == buffer_a ) |
627 |
|
628 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch b/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch |
629 |
deleted file mode 100644 |
630 |
index 7f764965046..00000000000 |
631 |
--- a/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch |
632 |
+++ /dev/null |
633 |
@@ -1,21 +0,0 @@ |
634 |
-From 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d Mon Sep 17 00:00:00 2001 |
635 |
-From: Jean-Baptiste Mardelle <jb@××××××××.org> |
636 |
-Date: Tue, 17 Mar 2020 18:22:04 +0100 |
637 |
-Subject: [PATCH] Fix OpenCV tracker double deletion crash. Fixes #532 |
638 |
- |
639 |
---- |
640 |
- src/modules/opencv/filter_opencv_tracker.cpp | 1 - |
641 |
- 1 file changed, 1 deletion(-) |
642 |
- |
643 |
-diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp |
644 |
-index 04a5f0b09..533f0f513 100644 |
645 |
---- a/src/modules/opencv/filter_opencv_tracker.cpp |
646 |
-+++ b/src/modules/opencv/filter_opencv_tracker.cpp |
647 |
-@@ -351,7 +351,6 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame ) |
648 |
- static void filter_close( mlt_filter filter ) |
649 |
- { |
650 |
- private_data* data = (private_data*) filter->child; |
651 |
-- free ( data->tracker ); |
652 |
- free ( data ); |
653 |
- filter->child = NULL; |
654 |
- filter->close = NULL; |
655 |
|
656 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch |
657 |
deleted file mode 100644 |
658 |
index e3e27904d5a..00000000000 |
659 |
--- a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch |
660 |
+++ /dev/null |
661 |
@@ -1,45 +0,0 @@ |
662 |
-From f4329c7e8f4704d3f8e8f2a96bd774e6d966194b Mon Sep 17 00:00:00 2001 |
663 |
-From: martin <martin.sandsmark@×××.org> |
664 |
-Date: Tue, 7 Apr 2020 19:48:01 +0000 |
665 |
-Subject: [PATCH] fix opencv4 support (#545) |
666 |
- |
667 |
---- |
668 |
- src/modules/opencv/configure | 17 +++++++++++++---- |
669 |
- 1 file changed, 13 insertions(+), 4 deletions(-) |
670 |
- |
671 |
-diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure |
672 |
-index 36851f678..4e7fdcf4a 100755 |
673 |
---- a/src/modules/opencv/configure |
674 |
-+++ b/src/modules/opencv/configure |
675 |
-@@ -26,18 +26,27 @@ else |
676 |
- exit 0 |
677 |
- fi |
678 |
- |
679 |
-- pkg-config --atleast-version=3.1.0 'opencv' |
680 |
-+ opencvname=opencv |
681 |
-+ pkg-config "$opencvname" |
682 |
-+ if [ $? -ne 0 ] |
683 |
-+ then |
684 |
-+ # Try v4, they renamed |
685 |
-+ opencvname=opencv4 |
686 |
-+ fi |
687 |
-+ |
688 |
-+ pkg-config --atleast-version=3.1.0 "$opencvname" |
689 |
-+ |
690 |
- if [ $? -eq 0 ] |
691 |
- then |
692 |
-- result=`pkg-config --libs opencv | grep "opencv_tracking"` |
693 |
-+ result=`pkg-config --libs "$opencvname" | grep "opencv_tracking"` |
694 |
- if [ -z "$result" ] |
695 |
- then |
696 |
- echo "- OpenCV tracking contrib module NOT found, disabling OpenCV modules" |
697 |
- touch ../disable-opencv |
698 |
- exit 0 |
699 |
- else |
700 |
-- echo "CFLAGS += $(pkg-config --cflags opencv)" >> config.mak |
701 |
-- echo "LDFLAGS += $(pkg-config --libs opencv)" >> config.mak |
702 |
-+ echo "CFLAGS += $(pkg-config --cflags "$opencvname")" >> config.mak |
703 |
-+ echo "LDFLAGS += $(pkg-config --libs "$opencvname")" >> config.mak |
704 |
- fi |
705 |
- else |
706 |
- echo "- OpenCV >= 3.1.0 NOT found: disabling" |
707 |
|
708 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch b/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch |
709 |
deleted file mode 100644 |
710 |
index edc183725d6..00000000000 |
711 |
--- a/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch |
712 |
+++ /dev/null |
713 |
@@ -1,49 +0,0 @@ |
714 |
-From f58b44d73442986eeffec7431e59b7d19d214c1b Mon Sep 17 00:00:00 2001 |
715 |
-From: Heiko Becker <heirecka@×××××××.org> |
716 |
-Date: Tue, 24 Mar 2020 21:17:05 +0100 |
717 |
-Subject: [PATCH] Fix build with Qt 5.15.0 |
718 |
- |
719 |
-QPainterPath is no longer included via qtransform.h (since |
720 |
-5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). |
721 |
---- |
722 |
- src/modules/qt/filter_qtext.cpp | 1 + |
723 |
- src/modules/qt/graph.cpp | 1 + |
724 |
- src/modules/qt/producer_qtext.cpp | 1 + |
725 |
- 3 files changed, 3 insertions(+) |
726 |
- |
727 |
-diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp |
728 |
-index c3de1fadc..c3e10f1a3 100644 |
729 |
---- a/src/modules/qt/filter_qtext.cpp |
730 |
-+++ b/src/modules/qt/filter_qtext.cpp |
731 |
-@@ -21,6 +21,7 @@ |
732 |
- #include <framework/mlt.h> |
733 |
- #include <framework/mlt_log.h> |
734 |
- #include <QPainter> |
735 |
-+#include <QPainterPath> |
736 |
- #include <QString> |
737 |
- |
738 |
- static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale ) |
739 |
-diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp |
740 |
-index 6d4d669ca..7e91bb12f 100644 |
741 |
---- a/src/modules/qt/graph.cpp |
742 |
-+++ b/src/modules/qt/graph.cpp |
743 |
-@@ -18,6 +18,7 @@ |
744 |
- */ |
745 |
- |
746 |
- #include "graph.h" |
747 |
-+#include <QPainterPath> |
748 |
- #include <QVector> |
749 |
- #include <math.h> |
750 |
- |
751 |
-diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp |
752 |
-index 603c2b780..ff95a8e26 100644 |
753 |
---- a/src/modules/qt/producer_qtext.cpp |
754 |
-+++ b/src/modules/qt/producer_qtext.cpp |
755 |
-@@ -26,6 +26,7 @@ |
756 |
- #include <QImage> |
757 |
- #include <QColor> |
758 |
- #include <QPainter> |
759 |
-+#include <QPainterPath> |
760 |
- #include <QFont> |
761 |
- #include <QString> |
762 |
- #include <QTextCodec> |
763 |
|
764 |
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
765 |
deleted file mode 100644 |
766 |
index d2bb530035a..00000000000 |
767 |
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild |
768 |
+++ /dev/null |
769 |
@@ -1,208 +0,0 @@ |
770 |
-# Copyright 1999-2020 Gentoo Authors |
771 |
-# Distributed under the terms of the GNU General Public License v2 |
772 |
- |
773 |
-EAPI=7 |
774 |
- |
775 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
776 |
-inherit python-single-r1 qmake-utils toolchain-funcs |
777 |
- |
778 |
-DESCRIPTION="Open source multimedia framework for television broadcasting" |
779 |
-HOMEPAGE="https://www.mltframework.org/" |
780 |
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz" |
781 |
- |
782 |
-LICENSE="GPL-3" |
783 |
-SLOT="0" |
784 |
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" |
785 |
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg |
786 |
-fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python |
787 |
-qt5 rtaudio sdl vdpau vidstab xine xml" |
788 |
-# java perl php tcl |
789 |
- |
790 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
791 |
- |
792 |
-SWIG_DEPEND=">=dev-lang/swig-2.0" |
793 |
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) |
794 |
-# perl? ( ${SWIG_DEPEND} ) |
795 |
-# php? ( ${SWIG_DEPEND} ) |
796 |
-# tcl? ( ${SWIG_DEPEND} ) |
797 |
-# ruby? ( ${SWIG_DEPEND} ) |
798 |
-BDEPEND=" |
799 |
- virtual/pkgconfig |
800 |
- compressed-lumas? ( virtual/imagemagick-tools[png] ) |
801 |
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) |
802 |
- python? ( ${SWIG_DEPEND} ) |
803 |
-" |
804 |
-#rtaudio will use OSS on non linux OSes |
805 |
-DEPEND=" |
806 |
- >=media-libs/libebur128-1.2.2:= |
807 |
- ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) |
808 |
- fftw? ( sci-libs/fftw:3.0= ) |
809 |
- frei0r? ( media-plugins/frei0r-plugins ) |
810 |
- gtk? ( |
811 |
- media-libs/libexif |
812 |
- x11-libs/pango |
813 |
- ) |
814 |
- jack? ( |
815 |
- >=dev-libs/libxml2-2.5 |
816 |
- media-libs/ladspa-sdk |
817 |
- virtual/jack |
818 |
- ) |
819 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) |
820 |
- lua? ( >=dev-lang/lua-5.1.4-r4:= ) |
821 |
- opencv? ( >=media-libs/opencv-3.2.0:= ) |
822 |
- opengl? ( media-video/movit ) |
823 |
- python? ( ${PYTHON_DEPS} ) |
824 |
- qt5? ( |
825 |
- dev-qt/qtcore:5 |
826 |
- dev-qt/qtgui:5 |
827 |
- dev-qt/qtsvg:5 |
828 |
- dev-qt/qtwidgets:5 |
829 |
- dev-qt/qtxml:5 |
830 |
- media-libs/libexif |
831 |
- x11-libs/libX11 |
832 |
- ) |
833 |
- rtaudio? ( |
834 |
- >=media-libs/rtaudio-4.1.2 |
835 |
- kernel_linux? ( media-libs/alsa-lib ) |
836 |
- ) |
837 |
- sdl? ( |
838 |
- media-libs/libsdl2[X,opengl,video] |
839 |
- media-libs/sdl2-image |
840 |
- ) |
841 |
- vidstab? ( media-libs/vidstab ) |
842 |
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) |
843 |
- xml? ( >=dev-libs/libxml2-2.5 )" |
844 |
-# java? ( >=virtual/jre-1.5 ) |
845 |
-# perl? ( dev-lang/perl ) |
846 |
-# php? ( dev-lang/php ) |
847 |
-# ruby? ( ${RUBY_DEPS} ) |
848 |
-# sox? ( media-sound/sox ) |
849 |
-# tcl? ( dev-lang/tcl:0= ) |
850 |
-RDEPEND="${DEPEND}" |
851 |
- |
852 |
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) |
853 |
- |
854 |
-PATCHES=( |
855 |
- "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch |
856 |
- "${FILESDIR}"/${P}-qt-5.15.patch |
857 |
- "${FILESDIR}"/${P}-no-gtk2.patch |
858 |
- "${FILESDIR}"/${P}-opencv4.patch |
859 |
- "${FILESDIR}"/${P}-nullpointer-crash.patch |
860 |
- "${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch |
861 |
- "${FILESDIR}"/${P}-crash-in-composite.patch |
862 |
- "${FILESDIR}"/${P}-opencv-double-del-crash.patch |
863 |
- "${FILESDIR}"/${P}-musl-locale.patch # from Alpine, pending upstream |
864 |
-) |
865 |
- |
866 |
-pkg_setup() { |
867 |
- use python && python-single-r1_pkg_setup |
868 |
-} |
869 |
- |
870 |
-src_prepare() { |
871 |
- default |
872 |
- |
873 |
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 |
874 |
- for x in python lua; do |
875 |
- sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die |
876 |
- done |
877 |
- |
878 |
- use python && python_fix_shebang src/swig/python |
879 |
-} |
880 |
- |
881 |
-src_configure() { |
882 |
- tc-export CC CXX |
883 |
- |
884 |
- local myconf=( |
885 |
- --enable-gpl |
886 |
- --enable-gpl3 |
887 |
- --enable-motion-est |
888 |
- --target-arch=$(tc-arch) |
889 |
- --disable-gtk2 |
890 |
- --disable-kde |
891 |
- --disable-sdl |
892 |
- --disable-swfdec |
893 |
- $(use_enable debug) |
894 |
- $(use_enable cpu_flags_x86_sse sse) |
895 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
896 |
- $(use_enable ffmpeg avformat) |
897 |
- $(use_enable fftw plus) |
898 |
- $(use_enable frei0r) |
899 |
- $(use_enable gtk gdk) |
900 |
- $(use_enable jack jackrack) |
901 |
- $(use_enable kdenlive) |
902 |
- $(use_enable libsamplerate resample) |
903 |
- $(use_enable melt) |
904 |
- $(use_enable opencv) |
905 |
- $(use_enable opengl) |
906 |
- $(use_enable qt5 qt) |
907 |
- $(use_enable rtaudio) |
908 |
- $(use_enable sdl sdl2) |
909 |
- $(use_enable vidstab vid.stab ) |
910 |
- $(use_enable xine) |
911 |
- $(use_enable xml) |
912 |
- --disable-sox |
913 |
- ) |
914 |
- #$(use_enable sox) FIXME |
915 |
- |
916 |
- use compressed-lumas && myconf+=( --luma-compress ) |
917 |
- use ffmpeg && myconf+=( --avformat-swscale ) |
918 |
- use vdpau && myconf+=( --avformat-vdpau ) |
919 |
- |
920 |
- if use qt5 ; then |
921 |
- myconf+=( |
922 |
- --qt-includedir=$(qt5_get_headerdir) |
923 |
- --qt-libdir=$(qt5_get_libdir) |
924 |
- ) |
925 |
- fi |
926 |
- |
927 |
- if use amd64 || use x86 ; then |
928 |
- myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) |
929 |
- else |
930 |
- myconf+=( --disable-mmx ) |
931 |
- fi |
932 |
- |
933 |
- if ! use melt ; then |
934 |
- sed -i -e "s;src/melt;;" Makefile || die |
935 |
- fi |
936 |
- |
937 |
- # TODO: add swig language bindings |
938 |
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover |
939 |
- |
940 |
- local swig_lang=() |
941 |
- # not done: java perl php ruby tcl |
942 |
- for i in lua python ; do |
943 |
- use $i && swig_lang+=( $i ) |
944 |
- done |
945 |
- [[ -z "${swig_lang}" ]] && swig_lang=( none ) |
946 |
- |
947 |
- econf "${myconf[@]}" --swig-languages="${swig_lang[*]}" |
948 |
- |
949 |
- sed -i -e s/^OPT/#OPT/ config.mak || die |
950 |
-} |
951 |
- |
952 |
-src_install() { |
953 |
- default |
954 |
- |
955 |
- insinto /usr/share/${PN} |
956 |
- doins -r demo |
957 |
- |
958 |
- docinto swig |
959 |
- |
960 |
- # Install SWIG bindings |
961 |
- if use lua; then |
962 |
- cd "${S}"/src/swig/lua || die |
963 |
- exeinto $(pkg-config --variable INSTALL_CMOD lua) |
964 |
- doexe mlt.so |
965 |
- dodoc play.lua |
966 |
- fi |
967 |
- |
968 |
- if use python; then |
969 |
- cd "${S}"/src/swig/python || die |
970 |
- python_domodule mlt.py _mlt.so |
971 |
- chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die |
972 |
- dodoc play.py |
973 |
- python_optimize |
974 |
- fi |
975 |
- |
976 |
- # not done: java perl php ruby tcl |
977 |
-} |