1 |
commit: 46a206cb63f05a289c5a979333d55ea2ab8a151b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 30 11:57:32 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 7 20:33:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a206cb |
7 |
|
8 |
media-libs/mlt: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
media-libs/mlt/Manifest | 2 - |
13 |
media-libs/mlt/files/mlt-6.2.0-ruby-link.patch | 18 -- |
14 |
media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch | 40 ---- |
15 |
media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch | 22 -- |
16 |
.../mlt/files/mlt-6.4.1-libebur128-unbundle.patch | 137 ------------ |
17 |
media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch | 33 --- |
18 |
media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch | 33 --- |
19 |
media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch | 61 ------ |
20 |
media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch | 33 --- |
21 |
.../mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch | 22 -- |
22 |
media-libs/mlt/files/mlt-6.6.0-libav-1.patch | 39 ---- |
23 |
media-libs/mlt/files/mlt-6.6.0-libav-2.patch | 31 --- |
24 |
media-libs/mlt/files/mlt-6.6.0-libav-3.patch | 23 -- |
25 |
media-libs/mlt/files/mlt-6.6.0-png-segfault.patch | 36 ---- |
26 |
.../mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch | 29 --- |
27 |
media-libs/mlt/metadata.xml | 1 - |
28 |
media-libs/mlt/mlt-6.4.1-r6.ebuild | 224 ------------------- |
29 |
media-libs/mlt/mlt-6.6.0-r1.ebuild | 240 --------------------- |
30 |
18 files changed, 1024 deletions(-) |
31 |
|
32 |
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest |
33 |
index c904de216cb..b884ece8480 100644 |
34 |
--- a/media-libs/mlt/Manifest |
35 |
+++ b/media-libs/mlt/Manifest |
36 |
@@ -1,3 +1 @@ |
37 |
DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b |
38 |
-DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb |
39 |
-DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845 |
40 |
|
41 |
diff --git a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch b/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch |
42 |
deleted file mode 100644 |
43 |
index 35341b4c205..00000000000 |
44 |
--- a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch |
45 |
+++ /dev/null |
46 |
@@ -1,18 +0,0 @@ |
47 |
-The build system tries to link to installed system libraries first, which |
48 |
-fails because the ABI has changed... |
49 |
- |
50 |
---- a/src/swig/ruby/build |
51 |
-+++ b/src/swig/ruby/build |
52 |
-@@ -5,9 +5,11 @@ |
53 |
- exit 0 |
54 |
- end |
55 |
- system( "ln -sf ../mlt.i" ) |
56 |
-+system( "ln -sf ../../framework/libmlt.so" ) |
57 |
-+system( "ln -sf ../../mlt++/libmlt++.so" ) |
58 |
- system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" ) |
59 |
- $CFLAGS = $CFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '') |
60 |
- $CXXFLAGS = $CXXFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '') |
61 |
--$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++" |
62 |
-+$LIBS += " -lmlt++ -lmlt -lstdc++" |
63 |
- create_makefile('mlt') |
64 |
- system( "make V=1" ) |
65 |
|
66 |
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch |
67 |
deleted file mode 100644 |
68 |
index 2f486939d8f..00000000000 |
69 |
--- a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch |
70 |
+++ /dev/null |
71 |
@@ -1,40 +0,0 @@ |
72 |
-From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001 |
73 |
-From: Dan Dennedy <dan@×××××××.org> |
74 |
-Date: Sat, 26 Aug 2017 18:31:47 -0700 |
75 |
-Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26. |
76 |
-MIME-Version: 1.0 |
77 |
-Content-Type: text/plain; charset=UTF-8 |
78 |
-Content-Transfer-Encoding: 8bit |
79 |
- |
80 |
-Reported by schnitzeltony on Andreas Müller. |
81 |
-Patch by Dave Plater. |
82 |
---- |
83 |
- src/framework/mlt_property.h | 8 ++++++-- |
84 |
- 1 file changed, 6 insertions(+), 2 deletions(-) |
85 |
- |
86 |
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h |
87 |
-index 404d513f..043f530b 100644 |
88 |
---- a/src/framework/mlt_property.h |
89 |
-+++ b/src/framework/mlt_property.h |
90 |
-@@ -3,7 +3,7 @@ |
91 |
- * \brief Property class declaration |
92 |
- * \see mlt_property_s |
93 |
- * |
94 |
-- * Copyright (C) 2003-2014 Meltytech, LLC |
95 |
-+ * Copyright (C) 2003-2017 Meltytech, LLC |
96 |
- * |
97 |
- * This library is free software; you can redistribute it and/or |
98 |
- * modify it under the terms of the GNU Lesser General Public |
99 |
-@@ -31,7 +31,11 @@ |
100 |
- #endif |
101 |
- |
102 |
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) |
103 |
--#include <xlocale.h> |
104 |
-+# if GLIBC_MINOR >= 26 && !defined(APPLE) |
105 |
-+# include <locale.h> |
106 |
-+# else |
107 |
-+# include <xlocale.h> |
108 |
-+# endif |
109 |
- #else |
110 |
- typedef char* locale_t; |
111 |
- #endif |
112 |
|
113 |
diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch |
114 |
deleted file mode 100644 |
115 |
index d992ee32e06..00000000000 |
116 |
--- a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch |
117 |
+++ /dev/null |
118 |
@@ -1,22 +0,0 @@ |
119 |
-From fbf6a5187776f2f392cf258935ff49e4c0e87024 Mon Sep 17 00:00:00 2001 |
120 |
-From: Dan Dennedy <dan@×××××××.org> |
121 |
-Date: Wed, 30 Aug 2017 09:08:16 -0700 |
122 |
-Subject: [PATCH] Fix glib test macros to include locale.h. |
123 |
- |
124 |
---- |
125 |
- src/framework/mlt_property.h | 2 +- |
126 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
127 |
- |
128 |
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h |
129 |
-index 043f530b..3ecebd67 100644 |
130 |
---- a/src/framework/mlt_property.h |
131 |
-+++ b/src/framework/mlt_property.h |
132 |
-@@ -31,7 +31,7 @@ |
133 |
- #endif |
134 |
- |
135 |
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) |
136 |
--# if GLIBC_MINOR >= 26 && !defined(APPLE) |
137 |
-+# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__) |
138 |
- # include <locale.h> |
139 |
- # else |
140 |
- # include <xlocale.h> |
141 |
|
142 |
diff --git a/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch b/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch |
143 |
deleted file mode 100644 |
144 |
index e9aaa25cf32..00000000000 |
145 |
--- a/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch |
146 |
+++ /dev/null |
147 |
@@ -1,137 +0,0 @@ |
148 |
-From fad1df2bc8efc2881867e510443547fddf5d620b Mon Sep 17 00:00:00 2001 |
149 |
-From: Brian Matherly <code@×××××××××××××.com> |
150 |
-Date: Sun, 19 Feb 2017 23:35:17 -0600 |
151 |
-Subject: [PATCH 1/2] Use external libebur128 if detected. |
152 |
- |
153 |
---- |
154 |
- src/modules/plus/Makefile | 7 +++++-- |
155 |
- src/modules/plus/configure | 11 +++++++++++ |
156 |
- 2 files changed, 16 insertions(+), 2 deletions(-) |
157 |
- |
158 |
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile |
159 |
-index 90067a56..351e7b76 100644 |
160 |
---- a/src/modules/plus/Makefile |
161 |
-+++ b/src/modules/plus/Makefile |
162 |
-@@ -22,14 +22,17 @@ OBJS = consumer_blipflash.o \ |
163 |
- filter_sepia.o \ |
164 |
- producer_blipflash.o \ |
165 |
- producer_count.o \ |
166 |
-- transition_affine.o \ |
167 |
-- ebur128/ebur128.o |
168 |
-+ transition_affine.o |
169 |
- |
170 |
- ifdef USE_FFTW |
171 |
- OBJS += filter_dance.o \ |
172 |
- filter_fft.o |
173 |
- endif |
174 |
- |
175 |
-+ifdef USE_INTERNAL_LIBEBUR128 |
176 |
-+ OBJS += ebur128/ebur128.o |
177 |
-+endif |
178 |
-+ |
179 |
- SRCS := $(OBJS:.o=.c) |
180 |
- |
181 |
- all: $(TARGET) |
182 |
-diff --git a/src/modules/plus/configure b/src/modules/plus/configure |
183 |
-index fbd49807..e38464b4 100755 |
184 |
---- a/src/modules/plus/configure |
185 |
-+++ b/src/modules/plus/configure |
186 |
-@@ -16,5 +16,16 @@ then |
187 |
- echo "- fftw not found: disable fft and dance filters" |
188 |
- fi |
189 |
- |
190 |
-+ pkg-config libebur128 |
191 |
-+ if [ $? -eq 0 ] |
192 |
-+ then |
193 |
-+ echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak |
194 |
-+ echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak |
195 |
-+ else |
196 |
-+ echo "- libebur128 not found: using internal libebur128" |
197 |
-+ echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak |
198 |
-+ echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak |
199 |
-+ fi |
200 |
-+ |
201 |
- exit 0 |
202 |
- fi |
203 |
- |
204 |
-From 9951883b895eb920b7f67ea67a0753d8dea21a9e Mon Sep 17 00:00:00 2001 |
205 |
-From: Brian Matherly <code@×××××××××××××.com> |
206 |
-Date: Mon, 20 Feb 2017 08:15:52 -0600 |
207 |
-Subject: [PATCH 2/2] Fix include directives for ebur128 filters. |
208 |
- |
209 |
---- |
210 |
- src/modules/plus/Makefile | 2 +- |
211 |
- src/modules/plus/configure | 2 ++ |
212 |
- src/modules/plus/filter_dynamic_loudness.c | 2 +- |
213 |
- src/modules/plus/filter_loudness.c | 2 +- |
214 |
- src/modules/plus/filter_loudness_meter.c | 2 +- |
215 |
- 5 files changed, 6 insertions(+), 4 deletions(-) |
216 |
- |
217 |
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile |
218 |
-index 351e7b76..366bca19 100644 |
219 |
---- a/src/modules/plus/Makefile |
220 |
-+++ b/src/modules/plus/Makefile |
221 |
-@@ -1,4 +1,4 @@ |
222 |
--CFLAGS += -I../.. -Iebur128/queue |
223 |
-+CFLAGS += -I../.. |
224 |
- |
225 |
- LDFLAGS += -L../../framework -lmlt -lm -lpthread |
226 |
- |
227 |
-diff --git a/src/modules/plus/configure b/src/modules/plus/configure |
228 |
-index e38464b4..59662ca0 100755 |
229 |
---- a/src/modules/plus/configure |
230 |
-+++ b/src/modules/plus/configure |
231 |
-@@ -19,12 +19,14 @@ then |
232 |
- pkg-config libebur128 |
233 |
- if [ $? -eq 0 ] |
234 |
- then |
235 |
-+ echo "- libebur128 found: using external libebur128" |
236 |
- echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak |
237 |
- echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak |
238 |
- else |
239 |
- echo "- libebur128 not found: using internal libebur128" |
240 |
- echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak |
241 |
- echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak |
242 |
-+ echo "CFLAGS += -Iebur128 -Iebur128/queue" >> config.mak |
243 |
- fi |
244 |
- |
245 |
- exit 0 |
246 |
-diff --git a/src/modules/plus/filter_dynamic_loudness.c b/src/modules/plus/filter_dynamic_loudness.c |
247 |
-index 07551f14..99c83051 100644 |
248 |
---- a/src/modules/plus/filter_dynamic_loudness.c |
249 |
-+++ b/src/modules/plus/filter_dynamic_loudness.c |
250 |
-@@ -22,7 +22,7 @@ |
251 |
- #include <stdlib.h> |
252 |
- #include <string.h> |
253 |
- #include <math.h> |
254 |
--#include "ebur128/ebur128.h" |
255 |
-+#include <ebur128.h> |
256 |
- |
257 |
- typedef struct |
258 |
- { |
259 |
-diff --git a/src/modules/plus/filter_loudness.c b/src/modules/plus/filter_loudness.c |
260 |
-index 8b74b5c9..0614fecc 100644 |
261 |
---- a/src/modules/plus/filter_loudness.c |
262 |
-+++ b/src/modules/plus/filter_loudness.c |
263 |
-@@ -22,7 +22,7 @@ |
264 |
- #include <stdlib.h> |
265 |
- #include <string.h> |
266 |
- #include <math.h> |
267 |
--#include "ebur128/ebur128.h" |
268 |
-+#include <ebur128.h> |
269 |
- |
270 |
- #define MAX_RESULT_SIZE 512 |
271 |
- |
272 |
-diff --git a/src/modules/plus/filter_loudness_meter.c b/src/modules/plus/filter_loudness_meter.c |
273 |
-index 9926f945..6c81d19f 100644 |
274 |
---- a/src/modules/plus/filter_loudness_meter.c |
275 |
-+++ b/src/modules/plus/filter_loudness_meter.c |
276 |
-@@ -22,7 +22,7 @@ |
277 |
- #include <stdlib.h> |
278 |
- #include <string.h> |
279 |
- #include <math.h> |
280 |
--#include "ebur128/ebur128.h" |
281 |
-+#include <ebur128.h> |
282 |
- |
283 |
- typedef struct |
284 |
- { |
285 |
|
286 |
diff --git a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch |
287 |
deleted file mode 100644 |
288 |
index 0a3732da2e3..00000000000 |
289 |
--- a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch |
290 |
+++ /dev/null |
291 |
@@ -1,33 +0,0 @@ |
292 |
-From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001 |
293 |
-From: BoboopTeam <BoboopTeam@××××××××××××××××××××.com> |
294 |
-Date: Thu, 7 Sep 2017 22:14:48 +0200 |
295 |
-Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create() |
296 |
- |
297 |
-This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer |
298 |
---- |
299 |
- src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++--- |
300 |
- 1 file changed, 7 insertions(+), 3 deletions(-) |
301 |
- |
302 |
-diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp |
303 |
-index 48ffb56b..3cfc07d2 100644 |
304 |
---- a/src/modules/opencv/filter_opencv_tracker.cpp |
305 |
-+++ b/src/modules/opencv/filter_opencv_tracker.cpp |
306 |
-@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int |
307 |
- data->algo = mlt_properties_get( filter_properties, "algo" ); |
308 |
- if ( data->algo == NULL || !strcmp(data->algo, "" ) ) |
309 |
- { |
310 |
-- data->tracker = cv::Tracker::create( "KCF" ); |
311 |
-+ data->tracker = cv::TrackerKCF::create(); |
312 |
-+ } |
313 |
-+ else if (!strcmp(data->algo, "MIL" )) |
314 |
-+ { |
315 |
-+ data->tracker = cv::TrackerMIL::create(); |
316 |
- } |
317 |
- else |
318 |
-- { |
319 |
-- data->tracker = cv::Tracker::create( data->algo ); |
320 |
-+ { |
321 |
-+ data->tracker = cv::TrackerBoosting::create(); |
322 |
- } |
323 |
- |
324 |
- // Discard previous results |
325 |
|
326 |
diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch |
327 |
deleted file mode 100644 |
328 |
index c00e8d05615..00000000000 |
329 |
--- a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch |
330 |
+++ /dev/null |
331 |
@@ -1,33 +0,0 @@ |
332 |
-From d2a04ae77a6b2c82a2e12b9fb631beb8f825946d Mon Sep 17 00:00:00 2001 |
333 |
-From: Alberto Villa <avilla@×××××××.org> |
334 |
-Date: Sat, 24 Dec 2016 05:07:54 +0100 |
335 |
-Subject: [PATCH] Move Qt OpenGL include(s) to Qt 4 specific code |
336 |
- |
337 |
-Only Qt 4 code references those files (QMutex and QWaitCondition are |
338 |
-not OpenGL files, but still they're only useful in Qt 4 code). |
339 |
---- |
340 |
- src/modules/qt/consumer_qglsl.cpp | 7 ++++--- |
341 |
- 1 file changed, 4 insertions(+), 3 deletions(-) |
342 |
- |
343 |
-diff --git a/src/modules/qt/consumer_qglsl.cpp b/src/modules/qt/consumer_qglsl.cpp |
344 |
-index 74840602..ca0cf383 100644 |
345 |
---- a/src/modules/qt/consumer_qglsl.cpp |
346 |
-+++ b/src/modules/qt/consumer_qglsl.cpp |
347 |
-@@ -20,13 +20,14 @@ |
348 |
- #include "common.h" |
349 |
- #include <framework/mlt.h> |
350 |
- #include <QApplication> |
351 |
--#include <QGLWidget> |
352 |
--#include <QMutex> |
353 |
--#include <QWaitCondition> |
354 |
- #include <QtGlobal> |
355 |
- |
356 |
- #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) |
357 |
- |
358 |
-+#include <QGLWidget> |
359 |
-+#include <QMutex> |
360 |
-+#include <QWaitCondition> |
361 |
-+ |
362 |
- class GLWidget : public QGLWidget |
363 |
- { |
364 |
- private: |
365 |
|
366 |
diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch |
367 |
deleted file mode 100644 |
368 |
index 5f98f12bbb1..00000000000 |
369 |
--- a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch |
370 |
+++ /dev/null |
371 |
@@ -1,61 +0,0 @@ |
372 |
-From 6ba6cab570d824641f63c66b355ba28f0721811f Mon Sep 17 00:00:00 2001 |
373 |
-From: Alberto Villa <avilla@×××××××.org> |
374 |
-Date: Sat, 24 Dec 2016 05:10:20 +0100 |
375 |
-Subject: [PATCH] Avoid looking for Qt5OpenGL module |
376 |
- |
377 |
-The OpenGL-related code needed by qimage was moved to Qt5Gui, which |
378 |
-allows to safely remove the dependency on Qt 5 builds. |
379 |
- |
380 |
-Build tested on FreeBSD. |
381 |
---- |
382 |
- src/modules/qt/configure | 20 +------------------- |
383 |
- 1 file changed, 1 insertion(+), 19 deletions(-) |
384 |
- |
385 |
-diff --git a/src/modules/qt/configure b/src/modules/qt/configure |
386 |
-index 24803baf..7475dc09 100755 |
387 |
---- a/src/modules/qt/configure |
388 |
-+++ b/src/modules/qt/configure |
389 |
-@@ -107,14 +107,6 @@ else |
390 |
- then |
391 |
- echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtWidgets >> config.mak |
392 |
- echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5Widgets >> config.mak |
393 |
-- if [ -f "$qt_libdir/libQt5OpenGL.so" ] || [ -f "$qt_libdir/libQt5OpenGL.a" ] |
394 |
-- then |
395 |
-- echo QTCXXFLAGS+=-I$qt_includedir/QtOpenGL >> config.mak |
396 |
-- echo QTLIBS+=-lQt5OpenGL >> config.mak |
397 |
-- else |
398 |
-- echo "- Qt5OpenGL not found: disabling" |
399 |
-- without_opengl=true |
400 |
-- fi |
401 |
- # Qt5 on OS X |
402 |
- elif [ -d "$qt_libdir/QtWidgets.framework" ] |
403 |
- then |
404 |
-@@ -123,11 +115,10 @@ else |
405 |
- -I$qt_includedir/QtGui -I$qt_libdir/QtGui.framework/Headers \ |
406 |
- -I$qt_includedir/QtXml -I$qt_libdir/QtXml.framework/Headers \ |
407 |
- -I$qt_includedir/QtSvg -I$qt_libdir/QtSvg.framework/Headers \ |
408 |
-- -I$qt_includedir/QtOpenGL -I$qt_libdir/QtOpenGL.framework/Headers \ |
409 |
- -I$qt_includedir/QtWidgets -I$qt_libdir/QtWidgets.framework/Headers \ |
410 |
- >> config.mak |
411 |
- echo QTLIBS=-F"$qt_libdir" -framework QtCore -framework QtGui -framework \ |
412 |
-- QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak |
413 |
-+ QtXml -framework QtSvg -framework QtWidgets >> config.mak |
414 |
- # Qt4 on OS X |
415 |
- elif [ -d "$qt_libdir/QtGui.framework" ] |
416 |
- then |
417 |
-@@ -151,15 +142,6 @@ else |
418 |
- without_kde=true |
419 |
- echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak |
420 |
- echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak |
421 |
-- pkg-config --exists 'Qt5OpenGL' |
422 |
-- if [ $? -eq 0 ] |
423 |
-- then |
424 |
-- echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak |
425 |
-- echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak |
426 |
-- else |
427 |
-- echo "- Qt5OpenGL not found: disabling" |
428 |
-- without_opengl=true |
429 |
-- fi |
430 |
- else |
431 |
- pkg-config --exists 'QtGui >= 4' |
432 |
- if [ $? -eq 0 ] |
433 |
|
434 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch b/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch |
435 |
deleted file mode 100644 |
436 |
index 4faecdc7879..00000000000 |
437 |
--- a/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch |
438 |
+++ /dev/null |
439 |
@@ -1,33 +0,0 @@ |
440 |
-From c7c2f271170892094a0cccdb517ca1b6061208d7 Mon Sep 17 00:00:00 2001 |
441 |
-From: Dan Dennedy <dan@×××××××.org> |
442 |
-Date: Mon, 12 Mar 2018 15:20:29 -0700 |
443 |
-Subject: [PATCH] Fix #284 GIF encoding not working. |
444 |
- |
445 |
-This also fixes DPX. |
446 |
---- |
447 |
- presets/consumer/avformat/GIF | 1 - |
448 |
- src/modules/avformat/consumer_avformat.c | 2 +- |
449 |
- 2 files changed, 1 insertion(+), 2 deletions(-) |
450 |
- |
451 |
-diff --git a/presets/consumer/avformat/GIF b/presets/consumer/avformat/GIF |
452 |
-index f6a0cd41a..da7361851 100644 |
453 |
---- a/presets/consumer/avformat/GIF |
454 |
-+++ b/presets/consumer/avformat/GIF |
455 |
-@@ -7,4 +7,3 @@ bf=0 |
456 |
- |
457 |
- meta.preset.extension=gif |
458 |
- meta.preset.name=GIF Animation |
459 |
--meta.preset.hidden=1 |
460 |
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c |
461 |
-index caac488e2..c3724d131 100644 |
462 |
---- a/src/modules/avformat/consumer_avformat.c |
463 |
-+++ b/src/modules/avformat/consumer_avformat.c |
464 |
-@@ -71,7 +71,7 @@ |
465 |
- #define AUDIO_ENCODE_BUFFER_SIZE (48000 * 2 * MAX_AUDIO_STREAMS) |
466 |
- #define AUDIO_BUFFER_SIZE (1024 * 42) |
467 |
- #define VIDEO_BUFFER_SIZE (8192 * 8192) |
468 |
--#define IMAGE_ALIGN (1) |
469 |
-+#define IMAGE_ALIGN (4) |
470 |
- |
471 |
- // |
472 |
- // This structure should be extended and made globally available in mlt |
473 |
|
474 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch b/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch |
475 |
deleted file mode 100644 |
476 |
index b65a63d8766..00000000000 |
477 |
--- a/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch |
478 |
+++ /dev/null |
479 |
@@ -1,22 +0,0 @@ |
480 |
-From 95f7f7bc104ec35ed3c909e52d928313fd35a48c Mon Sep 17 00:00:00 2001 |
481 |
-From: Jean-Baptiste Mardelle <jb@××××××××.org> |
482 |
-Date: Mon, 19 Mar 2018 09:20:49 +0100 |
483 |
-Subject: [PATCH] Fix crash with kdenlivetile caused by wrong malloc size |
484 |
- |
485 |
---- |
486 |
- src/modules/qt/producer_kdenlivetitle.c | 2 +- |
487 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
488 |
- |
489 |
-diff --git a/src/modules/qt/producer_kdenlivetitle.c b/src/modules/qt/producer_kdenlivetitle.c |
490 |
-index 67508aa33..4dc5d9c6b 100644 |
491 |
---- a/src/modules/qt/producer_kdenlivetitle.c |
492 |
-+++ b/src/modules/qt/producer_kdenlivetitle.c |
493 |
-@@ -41,7 +41,7 @@ void read_xml(mlt_properties properties) |
494 |
- goto error; |
495 |
- rewind (f); |
496 |
- |
497 |
-- char *infile = (char*) mlt_pool_alloc(lSize); |
498 |
-+ char *infile = (char*) mlt_pool_alloc(lSize + 1); |
499 |
- if ( infile ) |
500 |
- { |
501 |
- size = fread(infile,1,lSize,f); |
502 |
|
503 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-1.patch b/media-libs/mlt/files/mlt-6.6.0-libav-1.patch |
504 |
deleted file mode 100644 |
505 |
index 6dc5a73c7fe..00000000000 |
506 |
--- a/media-libs/mlt/files/mlt-6.6.0-libav-1.patch |
507 |
+++ /dev/null |
508 |
@@ -1,39 +0,0 @@ |
509 |
-From bd59735b4f97ae9dff864debdecc2318b0cb8f94 Mon Sep 17 00:00:00 2001 |
510 |
-From: Dan Dennedy <dan@×××××××.org> |
511 |
-Date: Mon, 12 Feb 2018 12:21:19 -0800 |
512 |
-Subject: [PATCH] Fix compile error with libav. |
513 |
- |
514 |
---- |
515 |
- src/modules/avformat/producer_avformat.c | 6 +++--- |
516 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
517 |
- |
518 |
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c |
519 |
-index 214c8b325..7de997cc2 100644 |
520 |
---- a/src/modules/avformat/producer_avformat.c |
521 |
-+++ b/src/modules/avformat/producer_avformat.c |
522 |
-@@ -1,6 +1,6 @@ |
523 |
- /* |
524 |
- * producer_avformat.c -- avformat producer |
525 |
-- * Copyright (C) 2003-2017 Meltytech, LLC |
526 |
-+ * Copyright (C) 2003-2018 Meltytech, LLC |
527 |
- * |
528 |
- * This library is free software; you can redistribute it and/or |
529 |
- * modify it under the terms of the GNU Lesser General Public |
530 |
-@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt ) |
531 |
- return 0; |
532 |
- } |
533 |
- |
534 |
--#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 ) |
535 |
-+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 ) |
536 |
- struct sliced_pix_fmt_conv_t |
537 |
- { |
538 |
- int width, height, slice_w; |
539 |
-@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe |
540 |
- sws_freeContext( context ); |
541 |
- } |
542 |
- else |
543 |
--#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 ) |
544 |
-+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 ) |
545 |
- { |
546 |
- int i, c; |
547 |
- struct sliced_pix_fmt_conv_t ctx = |
548 |
|
549 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-2.patch b/media-libs/mlt/files/mlt-6.6.0-libav-2.patch |
550 |
deleted file mode 100644 |
551 |
index d29cabec704..00000000000 |
552 |
--- a/media-libs/mlt/files/mlt-6.6.0-libav-2.patch |
553 |
+++ /dev/null |
554 |
@@ -1,31 +0,0 @@ |
555 |
-From 56e3affe1ff425d979ea9f2a5e086d769852c3fc Mon Sep 17 00:00:00 2001 |
556 |
-From: Dan Dennedy <dan@×××××××.org> |
557 |
-Date: Fri, 16 Feb 2018 09:55:29 -0800 |
558 |
-Subject: [PATCH] Fix compile error with libav. |
559 |
- |
560 |
---- |
561 |
- src/modules/avformat/producer_avformat.c | 4 ++-- |
562 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
563 |
- |
564 |
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c |
565 |
-index 7de997cc2..2fafd00e8 100644 |
566 |
---- a/src/modules/avformat/producer_avformat.c |
567 |
-+++ b/src/modules/avformat/producer_avformat.c |
568 |
-@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt ) |
569 |
- return 0; |
570 |
- } |
571 |
- |
572 |
--#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 ) |
573 |
-+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101)) |
574 |
- struct sliced_pix_fmt_conv_t |
575 |
- { |
576 |
- int width, height, slice_w; |
577 |
-@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe |
578 |
- sws_freeContext( context ); |
579 |
- } |
580 |
- else |
581 |
--#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 ) |
582 |
-+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101)) |
583 |
- { |
584 |
- int i, c; |
585 |
- struct sliced_pix_fmt_conv_t ctx = |
586 |
|
587 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-3.patch b/media-libs/mlt/files/mlt-6.6.0-libav-3.patch |
588 |
deleted file mode 100644 |
589 |
index fdbd5ef271f..00000000000 |
590 |
--- a/media-libs/mlt/files/mlt-6.6.0-libav-3.patch |
591 |
+++ /dev/null |
592 |
@@ -1,23 +0,0 @@ |
593 |
-From 53181a4e4629e2cd22c6f5d16a459aa843f4bd65 Mon Sep 17 00:00:00 2001 |
594 |
-From: Dan Dennedy <dan@×××××××.org> |
595 |
-Date: Fri, 23 Feb 2018 10:04:47 -0800 |
596 |
-Subject: [PATCH] Fix compile error with libav. |
597 |
- |
598 |
---- |
599 |
- src/modules/avformat/consumer_avformat.c | 2 ++ |
600 |
- 1 file changed, 2 insertions(+) |
601 |
- |
602 |
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c |
603 |
-index 6deb76df5..ba5c900c7 100644 |
604 |
---- a/src/modules/avformat/consumer_avformat.c |
605 |
-+++ b/src/modules/avformat/consumer_avformat.c |
606 |
-@@ -1647,7 +1647,9 @@ static void *consumer_thread( void *arg ) |
607 |
- enc_ctx->audio_avframe->format = c->sample_fmt; |
608 |
- enc_ctx->audio_avframe->nb_samples = enc_ctx->audio_input_frame_size; |
609 |
- enc_ctx->audio_avframe->channel_layout = c->channel_layout; |
610 |
-+#if LIBAVCODEC_VERSION_INT >= ((57<<16)+(96<<8)) && LIBAVCODEC_VERSION_MICRO >= 100 |
611 |
- enc_ctx->audio_avframe->channels = c->channels; |
612 |
-+#endif |
613 |
- } else { |
614 |
- mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" ); |
615 |
- mlt_events_fire( properties, "consumer-fatal-error", NULL ); |
616 |
|
617 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch b/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch |
618 |
deleted file mode 100644 |
619 |
index c93458a8273..00000000000 |
620 |
--- a/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch |
621 |
+++ /dev/null |
622 |
@@ -1,36 +0,0 @@ |
623 |
-From e013fd7c2f49b40a1b482d712d531329d538da88 Mon Sep 17 00:00:00 2001 |
624 |
-From: Brian Matherly <code@×××××××××××××.com> |
625 |
-Date: Wed, 31 Jan 2018 20:57:42 -0600 |
626 |
-Subject: [PATCH] Fix segmentation fault when using qimage png producer #296 |
627 |
- |
628 |
---- |
629 |
- src/modules/qt/qimage_wrapper.cpp | 7 ++++--- |
630 |
- 1 file changed, 4 insertions(+), 3 deletions(-) |
631 |
- |
632 |
-diff --git a/src/modules/qt/qimage_wrapper.cpp b/src/modules/qt/qimage_wrapper.cpp |
633 |
-index 436f65d15..99b4ebf8e 100644 |
634 |
---- a/src/modules/qt/qimage_wrapper.cpp |
635 |
-+++ b/src/modules/qt/qimage_wrapper.cpp |
636 |
-@@ -229,18 +229,19 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form |
637 |
- QString interps = mlt_properties_get( properties, "rescale.interp" ); |
638 |
- bool interp = ( interps != "nearest" ) && ( interps != "none" ); |
639 |
- QImage *qimage = static_cast<QImage*>( self->qimage ); |
640 |
-+ int has_alpha = qimage->hasAlphaChannel(); |
641 |
-+ QImage::Format qimageFormat = has_alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32; |
642 |
- |
643 |
- // Note - the original qimage is already safe and ready for destruction |
644 |
-- if ( qimage->depth() == 1 ) |
645 |
-+ if ( qimage->format() != qimageFormat ) |
646 |
- { |
647 |
-- QImage temp = qimage->convertToFormat( QImage::Format_RGB32 ); |
648 |
-+ QImage temp = qimage->convertToFormat( qimageFormat ); |
649 |
- delete qimage; |
650 |
- qimage = new QImage( temp ); |
651 |
- self->qimage = qimage; |
652 |
- } |
653 |
- QImage scaled = interp? qimage->scaled( QSize( width, height ) ) : |
654 |
- qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); |
655 |
-- int has_alpha = scaled.hasAlphaChannel(); |
656 |
- |
657 |
- // Store width and height |
658 |
- self->current_width = width; |
659 |
|
660 |
diff --git a/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch b/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch |
661 |
deleted file mode 100644 |
662 |
index bdf6ea211d4..00000000000 |
663 |
--- a/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch |
664 |
+++ /dev/null |
665 |
@@ -1,29 +0,0 @@ |
666 |
-From 7e0d478d161eacea015aa3d116e250e7c5f9f942 Mon Sep 17 00:00:00 2001 |
667 |
-From: Dan Dennedy <dan@×××××××.org> |
668 |
-Date: Wed, 7 Feb 2018 16:58:44 -0800 |
669 |
-Subject: [PATCH] Fix vorbis encoding with FFmpeg v3.4+ |
670 |
- |
671 |
---- |
672 |
- src/modules/avformat/consumer_avformat.c | 3 ++- |
673 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
674 |
- |
675 |
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c |
676 |
-index 434710049..6deb76df5 100644 |
677 |
---- a/src/modules/avformat/consumer_avformat.c |
678 |
-+++ b/src/modules/avformat/consumer_avformat.c |
679 |
-@@ -1,6 +1,6 @@ |
680 |
- /* |
681 |
- * consumer_avformat.c -- an encoder based on avformat |
682 |
-- * Copyright (C) 2003-2017 Meltytech, LLC |
683 |
-+ * Copyright (C) 2003-2018 Meltytech, LLC |
684 |
- * |
685 |
- * This library is free software; you can redistribute it and/or |
686 |
- * modify it under the terms of the GNU Lesser General Public |
687 |
-@@ -1647,6 +1647,7 @@ static void *consumer_thread( void *arg ) |
688 |
- enc_ctx->audio_avframe->format = c->sample_fmt; |
689 |
- enc_ctx->audio_avframe->nb_samples = enc_ctx->audio_input_frame_size; |
690 |
- enc_ctx->audio_avframe->channel_layout = c->channel_layout; |
691 |
-+ enc_ctx->audio_avframe->channels = c->channels; |
692 |
- } else { |
693 |
- mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" ); |
694 |
- mlt_events_fire( properties, "consumer-fatal-error", NULL ); |
695 |
|
696 |
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml |
697 |
index 5d86c2c480d..9cf408a58aa 100644 |
698 |
--- a/media-libs/mlt/metadata.xml |
699 |
+++ b/media-libs/mlt/metadata.xml |
700 |
@@ -18,7 +18,6 @@ |
701 |
<flag name="python">Build SWIG bindings for Python</flag> |
702 |
<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag> |
703 |
<flag name="ruby">Build SWIG bindings for Ruby</flag> |
704 |
- <flag name="sdl2">Build <pkg>media-libs/libsdl2</pkg> module</flag> |
705 |
<!-- |
706 |
<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag> |
707 |
<flag name="java">Build SWIG bindings for Java</flag> |
708 |
|
709 |
diff --git a/media-libs/mlt/mlt-6.4.1-r6.ebuild b/media-libs/mlt/mlt-6.4.1-r6.ebuild |
710 |
deleted file mode 100644 |
711 |
index 96c925f512c..00000000000 |
712 |
--- a/media-libs/mlt/mlt-6.4.1-r6.ebuild |
713 |
+++ /dev/null |
714 |
@@ -1,224 +0,0 @@ |
715 |
-# Copyright 1999-2018 Gentoo Foundation |
716 |
-# Distributed under the terms of the GNU General Public License v2 |
717 |
- |
718 |
-EAPI=6 |
719 |
-PYTHON_COMPAT=( python2_7 ) |
720 |
-# this ebuild currently only supports installing ruby bindings for a single ruby version |
721 |
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls |
722 |
-# /usr/bin/${USE_RUBY} directly |
723 |
-USE_RUBY="ruby23" |
724 |
-inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs |
725 |
- |
726 |
-DESCRIPTION="Open source multimedia framework for television broadcasting" |
727 |
-HOMEPAGE="https://www.mltframework.org/" |
728 |
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
729 |
- |
730 |
-LICENSE="GPL-3" |
731 |
-SLOT="0" |
732 |
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
733 |
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r |
734 |
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml" |
735 |
-# java perl php tcl vidstab |
736 |
-IUSE="${IUSE} kernel_linux" |
737 |
- |
738 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
739 |
- |
740 |
-#rtaudio will use OSS on non linux OSes |
741 |
-COMMON_DEPEND=" |
742 |
- >=media-libs/libebur128-1.2.2 |
743 |
- ffmpeg? ( |
744 |
- libav? ( media-video/libav:0=[vdpau?] ) |
745 |
- !libav? ( media-video/ffmpeg:0=[vdpau?] ) |
746 |
- ) |
747 |
- fftw? ( sci-libs/fftw:3.0= ) |
748 |
- frei0r? ( media-plugins/frei0r-plugins ) |
749 |
- gtk? ( |
750 |
- media-libs/libexif |
751 |
- x11-libs/gtk+:2 |
752 |
- x11-libs/pango |
753 |
- ) |
754 |
- jack? ( |
755 |
- >=dev-libs/libxml2-2.5 |
756 |
- media-libs/ladspa-sdk |
757 |
- virtual/jack |
758 |
- ) |
759 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) |
760 |
- lua? ( >=dev-lang/lua-5.1.4-r4:= ) |
761 |
- opencv? ( >=media-libs/opencv-3.2.0:= ) |
762 |
- opengl? ( media-video/movit ) |
763 |
- python? ( ${PYTHON_DEPS} ) |
764 |
- qt5? ( |
765 |
- dev-qt/qtcore:5 |
766 |
- dev-qt/qtgui:5 |
767 |
- dev-qt/qtsvg:5 |
768 |
- dev-qt/qtwidgets:5 |
769 |
- dev-qt/qtxml:5 |
770 |
- media-libs/libexif |
771 |
- x11-libs/libX11 |
772 |
- ) |
773 |
- rtaudio? ( |
774 |
- media-libs/rtaudio |
775 |
- kernel_linux? ( media-libs/alsa-lib ) |
776 |
- ) |
777 |
- ruby? ( ${RUBY_DEPS} ) |
778 |
- sdl? ( |
779 |
- >=media-libs/libsdl-1.2.10[X,opengl,video] |
780 |
- >=media-libs/sdl-image-1.2.4 |
781 |
- ) |
782 |
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) |
783 |
- xml? ( >=dev-libs/libxml2-2.5 )" |
784 |
-# java? ( >=virtual/jre-1.5 ) |
785 |
-# perl? ( dev-lang/perl ) |
786 |
-# php? ( dev-lang/php ) |
787 |
-# sox? ( media-sound/sox ) |
788 |
-# tcl? ( dev-lang/tcl:0= ) |
789 |
-# vidstab? ( media-libs/libvidstab ) |
790 |
-SWIG_DEPEND=">=dev-lang/swig-2.0" |
791 |
-DEPEND="${COMMON_DEPEND} |
792 |
- virtual/pkgconfig |
793 |
- compressed-lumas? ( virtual/imagemagick-tools[png] ) |
794 |
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) |
795 |
- python? ( ${SWIG_DEPEND} ) |
796 |
- ruby? ( ${SWIG_DEPEND} )" |
797 |
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) |
798 |
-# perl? ( ${SWIG_DEPEND} ) |
799 |
-# php? ( ${SWIG_DEPEND} ) |
800 |
-# tcl? ( ${SWIG_DEPEND} ) |
801 |
-RDEPEND="${COMMON_DEPEND} |
802 |
- !media-libs/mlt++ |
803 |
-" |
804 |
- |
805 |
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) |
806 |
- |
807 |
-PATCHES=( |
808 |
- "${FILESDIR}"/${PN}-6.2.0-ruby-link.patch |
809 |
- "${FILESDIR}"/${P}-libebur128-unbundle.patch |
810 |
- "${FILESDIR}"/${P}-opencv-3.3.patch |
811 |
- "${FILESDIR}"/${P}-glibc226-{1,2}.patch |
812 |
- "${FILESDIR}"/${P}-qtopengl-{1,2}.patch |
813 |
-) |
814 |
- |
815 |
-pkg_setup() { |
816 |
- use python && python-single-r1_pkg_setup |
817 |
-} |
818 |
- |
819 |
-src_prepare() { |
820 |
- default |
821 |
- |
822 |
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 |
823 |
- for x in python lua; do |
824 |
- sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die |
825 |
- done |
826 |
- sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die |
827 |
- |
828 |
- sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die |
829 |
-} |
830 |
- |
831 |
-src_configure() { |
832 |
- tc-export CC CXX |
833 |
- |
834 |
- # bug 589848 |
835 |
- append-cxxflags -std=c++11 |
836 |
- |
837 |
- local myconf=( |
838 |
- --enable-gpl |
839 |
- --enable-gpl3 |
840 |
- --enable-motion-est |
841 |
- --target-arch=$(tc-arch) |
842 |
- --disable-kde |
843 |
- --disable-swfdec |
844 |
- $(use_enable debug) |
845 |
- $(use compressed-lumas && echo ' --luma-compress') |
846 |
- $(use_enable cpu_flags_x86_sse sse) |
847 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
848 |
- $(use_enable gtk gtk2) |
849 |
- $(use_enable sdl) |
850 |
- $(use_enable jack jackrack) |
851 |
- $(use_enable ffmpeg avformat) |
852 |
- $(use ffmpeg && echo ' --avformat-swscale') |
853 |
- $(use_enable fftw plus) |
854 |
- $(use_enable frei0r) |
855 |
- $(use_enable melt) |
856 |
- $(use_enable opencv) |
857 |
- $(use_enable opengl) |
858 |
- $(use_enable libsamplerate resample) |
859 |
- $(use_enable rtaudio) |
860 |
- $(use vdpau && echo ' --avformat-vdpau') |
861 |
- $(use_enable xml) |
862 |
- $(use_enable xine) |
863 |
- $(use_enable kdenlive) |
864 |
- --disable-sox |
865 |
- ) |
866 |
- #$(use_enable sox) FIXME |
867 |
- |
868 |
- if use qt5 ; then |
869 |
- myconf+=( |
870 |
- --enable-qt |
871 |
- --qt-includedir=$(pkg-config Qt5Core --variable=includedir) |
872 |
- --qt-libdir=$(pkg-config Qt5Core --variable=libdir) |
873 |
- ) |
874 |
- else |
875 |
- myconf+=( --disable-qt ) |
876 |
- fi |
877 |
- |
878 |
- if use x86 || use amd64 ; then |
879 |
- myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) |
880 |
- else |
881 |
- myconf+=( --disable-mmx ) |
882 |
- fi |
883 |
- |
884 |
- if ! use melt; then |
885 |
- sed -i -e "s;src/melt;;" Makefile || die |
886 |
- fi |
887 |
- |
888 |
- # TODO: add swig language bindings |
889 |
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover |
890 |
- |
891 |
- local swig_lang |
892 |
- # TODO: java perl php tcl |
893 |
- for i in lua python ruby ; do |
894 |
- use $i && swig_lang="${swig_lang} $i" |
895 |
- done |
896 |
- [[ -z "${swig_lang}" ]] && swig_lang="none" |
897 |
- |
898 |
- econf ${myconf[@]} --swig-languages="${swig_lang}" |
899 |
- |
900 |
- sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die |
901 |
-} |
902 |
- |
903 |
-src_install() { |
904 |
- emake DESTDIR="${D}" install |
905 |
- einstalldocs |
906 |
- |
907 |
- dodir /usr/share/${PN} |
908 |
- insinto /usr/share/${PN} |
909 |
- doins -r demo |
910 |
- |
911 |
- docinto swig |
912 |
- |
913 |
- # Install SWIG bindings |
914 |
- if use lua; then |
915 |
- cd "${S}"/src/swig/lua || die |
916 |
- exeinto $(pkg-config --variable INSTALL_CMOD lua) |
917 |
- doexe mlt.so |
918 |
- dodoc play.lua |
919 |
- fi |
920 |
- |
921 |
- if use python; then |
922 |
- cd "${S}"/src/swig/python || die |
923 |
- insinto $(python_get_sitedir) |
924 |
- doins mlt.py |
925 |
- exeinto $(python_get_sitedir) |
926 |
- doexe _mlt.so |
927 |
- dodoc play.py |
928 |
- python_optimize |
929 |
- fi |
930 |
- |
931 |
- if use ruby; then |
932 |
- cd "${S}"/src/swig/ruby || die |
933 |
- exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]') |
934 |
- doexe mlt.so |
935 |
- dodoc play.rb thumbs.rb |
936 |
- fi |
937 |
- # TODO: java perl php tcl |
938 |
-} |
939 |
|
940 |
diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild b/media-libs/mlt/mlt-6.6.0-r1.ebuild |
941 |
deleted file mode 100644 |
942 |
index ba5ab74a1c2..00000000000 |
943 |
--- a/media-libs/mlt/mlt-6.6.0-r1.ebuild |
944 |
+++ /dev/null |
945 |
@@ -1,240 +0,0 @@ |
946 |
-# Copyright 1999-2018 Gentoo Foundation |
947 |
-# Distributed under the terms of the GNU General Public License v2 |
948 |
- |
949 |
-EAPI=6 |
950 |
- |
951 |
-PYTHON_COMPAT=( python2_7 ) |
952 |
-# this ebuild currently only supports installing ruby bindings for a single ruby version |
953 |
-# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls |
954 |
-# /usr/bin/${USE_RUBY} directly |
955 |
-USE_RUBY="ruby23" |
956 |
-inherit flag-o-matic python-single-r1 ruby-single toolchain-funcs |
957 |
- |
958 |
-DESCRIPTION="Open source multimedia framework for television broadcasting" |
959 |
-HOMEPAGE="https://www.mltframework.org/" |
960 |
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
961 |
- |
962 |
-LICENSE="GPL-3" |
963 |
-SLOT="0" |
964 |
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
965 |
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r |
966 |
-gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl sdl2 vdpau xine xml" |
967 |
-# java perl php tcl vidstab |
968 |
-IUSE="${IUSE} kernel_linux" |
969 |
- |
970 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) sdl2? ( sdl )" |
971 |
- |
972 |
-#rtaudio will use OSS on non linux OSes |
973 |
-COMMON_DEPEND=" |
974 |
- >=media-libs/libebur128-1.2.2 |
975 |
- ffmpeg? ( |
976 |
- libav? ( >=media-video/libav-12:0=[vdpau?] ) |
977 |
- !libav? ( media-video/ffmpeg:0=[vdpau?] ) |
978 |
- ) |
979 |
- fftw? ( sci-libs/fftw:3.0= ) |
980 |
- frei0r? ( media-plugins/frei0r-plugins ) |
981 |
- gtk? ( |
982 |
- media-libs/libexif |
983 |
- x11-libs/gtk+:2 |
984 |
- x11-libs/pango |
985 |
- ) |
986 |
- jack? ( |
987 |
- >=dev-libs/libxml2-2.5 |
988 |
- media-libs/ladspa-sdk |
989 |
- virtual/jack |
990 |
- ) |
991 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) |
992 |
- lua? ( >=dev-lang/lua-5.1.4-r4:= ) |
993 |
- opencv? ( >=media-libs/opencv-3.2.0:= ) |
994 |
- opengl? ( media-video/movit ) |
995 |
- python? ( ${PYTHON_DEPS} ) |
996 |
- qt5? ( |
997 |
- dev-qt/qtcore:5 |
998 |
- dev-qt/qtgui:5 |
999 |
- dev-qt/qtsvg:5 |
1000 |
- dev-qt/qtwidgets:5 |
1001 |
- dev-qt/qtxml:5 |
1002 |
- media-libs/libexif |
1003 |
- x11-libs/libX11 |
1004 |
- ) |
1005 |
- rtaudio? ( |
1006 |
- media-libs/rtaudio |
1007 |
- kernel_linux? ( media-libs/alsa-lib ) |
1008 |
- ) |
1009 |
- ruby? ( ${RUBY_DEPS} ) |
1010 |
- sdl? ( |
1011 |
- sdl2? ( |
1012 |
- media-libs/libsdl2[X,opengl,video] |
1013 |
- media-libs/sdl2-image |
1014 |
- ) |
1015 |
- !sdl2? ( |
1016 |
- >=media-libs/libsdl-1.2.10[X,opengl,video] |
1017 |
- >=media-libs/sdl-image-1.2.4 |
1018 |
- ) |
1019 |
- ) |
1020 |
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) |
1021 |
- xml? ( >=dev-libs/libxml2-2.5 )" |
1022 |
-# java? ( >=virtual/jre-1.5 ) |
1023 |
-# perl? ( dev-lang/perl ) |
1024 |
-# php? ( dev-lang/php ) |
1025 |
-# sox? ( media-sound/sox ) |
1026 |
-# tcl? ( dev-lang/tcl:0= ) |
1027 |
-# vidstab? ( media-libs/libvidstab ) |
1028 |
-SWIG_DEPEND=">=dev-lang/swig-2.0" |
1029 |
-DEPEND="${COMMON_DEPEND} |
1030 |
- virtual/pkgconfig |
1031 |
- compressed-lumas? ( virtual/imagemagick-tools[png] ) |
1032 |
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) |
1033 |
- python? ( ${SWIG_DEPEND} ) |
1034 |
- ruby? ( ${SWIG_DEPEND} )" |
1035 |
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) |
1036 |
-# perl? ( ${SWIG_DEPEND} ) |
1037 |
-# php? ( ${SWIG_DEPEND} ) |
1038 |
-# tcl? ( ${SWIG_DEPEND} ) |
1039 |
-RDEPEND="${COMMON_DEPEND} |
1040 |
- !media-libs/mlt++ |
1041 |
-" |
1042 |
- |
1043 |
-DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) |
1044 |
- |
1045 |
-PATCHES=( |
1046 |
- "${FILESDIR}"/${P}-vorbis-ffmpeg-3.4.patch |
1047 |
- "${FILESDIR}"/${P}-libav-{1,2,3}.patch |
1048 |
- "${FILESDIR}"/${P}-png-segfault.patch |
1049 |
- "${FILESDIR}"/${P}-gif-encoding.patch |
1050 |
- "${FILESDIR}"/${P}-kdenlivetitle-crash.patch |
1051 |
-) |
1052 |
- |
1053 |
-pkg_setup() { |
1054 |
- use python && python-single-r1_pkg_setup |
1055 |
-} |
1056 |
- |
1057 |
-src_prepare() { |
1058 |
- default |
1059 |
- |
1060 |
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 |
1061 |
- for x in python lua; do |
1062 |
- sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die |
1063 |
- done |
1064 |
- sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die |
1065 |
- |
1066 |
- sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die |
1067 |
-} |
1068 |
- |
1069 |
-src_configure() { |
1070 |
- tc-export CC CXX |
1071 |
- |
1072 |
- # bug 589848 |
1073 |
- append-cxxflags -std=c++11 |
1074 |
- |
1075 |
- local myconf=( |
1076 |
- --enable-gpl |
1077 |
- --enable-gpl3 |
1078 |
- --enable-motion-est |
1079 |
- --target-arch=$(tc-arch) |
1080 |
- --disable-kde |
1081 |
- --disable-swfdec |
1082 |
- $(use_enable debug) |
1083 |
- $(use compressed-lumas && echo ' --luma-compress') |
1084 |
- $(use_enable cpu_flags_x86_sse sse) |
1085 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
1086 |
- $(use_enable gtk gtk2) |
1087 |
- $(use_enable jack jackrack) |
1088 |
- $(use_enable ffmpeg avformat) |
1089 |
- $(use ffmpeg && echo ' --avformat-swscale') |
1090 |
- $(use_enable fftw plus) |
1091 |
- $(use_enable frei0r) |
1092 |
- $(use_enable melt) |
1093 |
- $(use_enable opencv) |
1094 |
- $(use_enable opengl) |
1095 |
- $(use_enable libsamplerate resample) |
1096 |
- $(use_enable rtaudio) |
1097 |
- $(use vdpau && echo ' --avformat-vdpau') |
1098 |
- $(use_enable xml) |
1099 |
- $(use_enable xine) |
1100 |
- $(use_enable kdenlive) |
1101 |
- --disable-sox |
1102 |
- ) |
1103 |
- #$(use_enable sox) FIXME |
1104 |
- |
1105 |
- if use qt5 ; then |
1106 |
- myconf+=( |
1107 |
- --enable-qt |
1108 |
- --qt-includedir=$(pkg-config Qt5Core --variable=includedir) |
1109 |
- --qt-libdir=$(pkg-config Qt5Core --variable=libdir) |
1110 |
- ) |
1111 |
- else |
1112 |
- myconf+=( --disable-qt ) |
1113 |
- fi |
1114 |
- |
1115 |
- if use sdl ; then |
1116 |
- if use sdl2 ; then |
1117 |
- myconf+=( --enable-sdl2 --disable-sdl ) |
1118 |
- else |
1119 |
- myconf+=( --enable-sdl --disable-sdl2 ) |
1120 |
- fi |
1121 |
- else |
1122 |
- myconf+=( --disable-sdl --disable-sdl2 ) |
1123 |
- fi |
1124 |
- |
1125 |
- if use x86 || use amd64 ; then |
1126 |
- myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) |
1127 |
- else |
1128 |
- myconf+=( --disable-mmx ) |
1129 |
- fi |
1130 |
- |
1131 |
- if ! use melt; then |
1132 |
- sed -i -e "s;src/melt;;" Makefile || die |
1133 |
- fi |
1134 |
- |
1135 |
- # TODO: add swig language bindings |
1136 |
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover |
1137 |
- |
1138 |
- local swig_lang |
1139 |
- # TODO: java perl php tcl |
1140 |
- for i in lua python ruby ; do |
1141 |
- use $i && swig_lang="${swig_lang} $i" |
1142 |
- done |
1143 |
- [[ -z "${swig_lang}" ]] && swig_lang="none" |
1144 |
- |
1145 |
- econf ${myconf[@]} --swig-languages="${swig_lang}" |
1146 |
- |
1147 |
- sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die |
1148 |
-} |
1149 |
- |
1150 |
-src_install() { |
1151 |
- emake DESTDIR="${D}" install |
1152 |
- einstalldocs |
1153 |
- |
1154 |
- dodir /usr/share/${PN} |
1155 |
- insinto /usr/share/${PN} |
1156 |
- doins -r demo |
1157 |
- |
1158 |
- docinto swig |
1159 |
- |
1160 |
- # Install SWIG bindings |
1161 |
- if use lua; then |
1162 |
- cd "${S}"/src/swig/lua || die |
1163 |
- exeinto $(pkg-config --variable INSTALL_CMOD lua) |
1164 |
- doexe mlt.so |
1165 |
- dodoc play.lua |
1166 |
- fi |
1167 |
- |
1168 |
- if use python; then |
1169 |
- cd "${S}"/src/swig/python || die |
1170 |
- insinto $(python_get_sitedir) |
1171 |
- doins mlt.py |
1172 |
- exeinto $(python_get_sitedir) |
1173 |
- doexe _mlt.so |
1174 |
- dodoc play.py |
1175 |
- python_optimize |
1176 |
- fi |
1177 |
- |
1178 |
- if use ruby; then |
1179 |
- cd "${S}"/src/swig/ruby || die |
1180 |
- exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]') |
1181 |
- doexe mlt.so |
1182 |
- dodoc play.rb thumbs.rb |
1183 |
- fi |
1184 |
- # TODO: java perl php tcl |
1185 |
-} |