1 |
commit: 46ea7eb2c62715bacc9d1eed7bbcd6abd2cc17ee |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 20:27:41 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 21:44:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ea7eb2 |
7 |
|
8 |
media-libs/mlt: Drop x11-libs/gtk+:2 dependency |
9 |
|
10 |
Upstream commit 1c45ceae1d06cd3df7063e2644140b647b6d0acd |
11 |
|
12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch | 421 ++++++++++++++++++++++++++ |
16 |
media-libs/mlt/mlt-6.20.0-r2.ebuild | 5 +- |
17 |
2 files changed, 424 insertions(+), 2 deletions(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..5031ab374f6 |
22 |
--- /dev/null |
23 |
+++ b/media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch |
24 |
@@ -0,0 +1,421 @@ |
25 |
+From 1c45ceae1d06cd3df7063e2644140b647b6d0acd Mon Sep 17 00:00:00 2001 |
26 |
+From: martin <martin.sandsmark@×××.org> |
27 |
+Date: Mon, 13 Apr 2020 19:15:32 +0000 |
28 |
+Subject: [PATCH] split out gdk code from gtk2 code, disable gtk2 by default |
29 |
+ (#544) |
30 |
+ |
31 |
+* split gtk2 code out from gdk code |
32 |
+ |
33 |
+* remove gtk2 module from default build |
34 |
+--- |
35 |
+ CMakeLists.txt | 2 +- |
36 |
+ src/modules/gdk/CMakeLists.txt | 39 ++++++++ |
37 |
+ src/modules/gdk/Makefile | 74 +++++++++++++++ |
38 |
+ src/modules/gdk/configure | 82 +++++++++++++++++ |
39 |
+ src/modules/gdk/factory.c | 92 +++++++++++++++++++ |
40 |
+ src/modules/{gtk2 => gdk}/filter_rescale.c | 0 |
41 |
+ src/modules/{gtk2 => gdk}/filter_rescale.yml | 0 |
42 |
+ src/modules/{gtk2 => gdk}/have_mmx.S | 0 |
43 |
+ src/modules/{gtk2 => gdk}/pixops.c | 0 |
44 |
+ src/modules/{gtk2 => gdk}/pixops.h | 0 |
45 |
+ src/modules/{gtk2 => gdk}/producer_pango.c | 1 - |
46 |
+ src/modules/{gtk2 => gdk}/producer_pango.yml | 0 |
47 |
+ src/modules/{gtk2 => gdk}/producer_pixbuf.c | 0 |
48 |
+ src/modules/{gtk2 => gdk}/producer_pixbuf.yml | 0 |
49 |
+ .../{gtk2 => gdk}/scale_line_22_yuv_mmx.S | 0 |
50 |
+ src/modules/gtk2/deprecated | 0 |
51 |
+ 20 files changed, 291 insertions(+), 151 deletions(-) |
52 |
+ create mode 100644 src/modules/gdk/CMakeLists.txt |
53 |
+ create mode 100644 src/modules/gdk/Makefile |
54 |
+ create mode 100755 src/modules/gdk/configure |
55 |
+ create mode 100644 src/modules/gdk/factory.c |
56 |
+ rename src/modules/{gtk2 => gdk}/filter_rescale.c (100%) |
57 |
+ rename src/modules/{gtk2 => gdk}/filter_rescale.yml (100%) |
58 |
+ rename src/modules/{gtk2 => gdk}/have_mmx.S (100%) |
59 |
+ rename src/modules/{gtk2 => gdk}/pixops.c (100%) |
60 |
+ rename src/modules/{gtk2 => gdk}/pixops.h (100%) |
61 |
+ rename src/modules/{gtk2 => gdk}/producer_pango.c (99%) |
62 |
+ rename src/modules/{gtk2 => gdk}/producer_pango.yml (100%) |
63 |
+ rename src/modules/{gtk2 => gdk}/producer_pixbuf.c (100%) |
64 |
+ rename src/modules/{gtk2 => gdk}/producer_pixbuf.yml (100%) |
65 |
+ rename src/modules/{gtk2 => gdk}/scale_line_22_yuv_mmx.S (100%) |
66 |
+ create mode 100644 src/modules/gtk2/deprecated |
67 |
+ |
68 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
69 |
+index 54afeceda..e25ca68b0 100644 |
70 |
+--- a/CMakeLists.txt |
71 |
++++ b/CMakeLists.txt |
72 |
+@@ -31,7 +31,7 @@ set(modules |
73 |
+ src/modules/decklink |
74 |
+ src/modules/frei0r |
75 |
+ src/modules/feeds |
76 |
+- src/modules/gtk2 |
77 |
++ src/modules/gdk |
78 |
+ src/modules/kdenlive |
79 |
+ src/modules/motion_est |
80 |
+ src/modules/normalize |
81 |
+diff --git a/src/modules/gdk/CMakeLists.txt b/src/modules/gdk/CMakeLists.txt |
82 |
+new file mode 100644 |
83 |
+index 000000000..b7bdb2c24 |
84 |
+--- /dev/null |
85 |
++++ b/src/modules/gdk/CMakeLists.txt |
86 |
+@@ -0,0 +1,39 @@ |
87 |
++set(mltgdk_src factory.c) |
88 |
++set(mltgdk_lib mlt m Threads::Threads) |
89 |
++set(mltgdk_def "") |
90 |
++ |
91 |
++ |
92 |
++pkg_check_modules(GdkPixbuf IMPORTED_TARGET gdk-pixbuf-2.0 REQUIRED) |
93 |
++if(TARGET PkgConfig::GdkPixbuf) |
94 |
++ list(APPEND mltgdk_src producer_pixbuf.c pixops.c filter_rescale.c) |
95 |
++ list(APPEND mltgdk_lib PkgConfig::GdkPixbuf) |
96 |
++ list(APPEND mltgdk_def USE_PIXBUF) |
97 |
++ message(STATUS "${mltgdk_lib}") |
98 |
++else() |
99 |
++ message(FATAL_ERROR "Failed to find gdk pixbuf") |
100 |
++endif() |
101 |
++ |
102 |
++pkg_check_modules(pango IMPORTED_TARGET pango) |
103 |
++if(TARGET PkgConfig::pango) |
104 |
++ pkg_check_modules(fontconfig IMPORTED_TARGET fontconfig) |
105 |
++ if(TARGET PkgConfig::fontconfig) |
106 |
++ list(APPEND mltgdk_src producer_pango.c) |
107 |
++ list(APPEND mltgdk_lib PkgConfig::pango PkgConfig::fontconfig) |
108 |
++ list(APPEND mltgdk_def USE_PANGO) |
109 |
++ endif() |
110 |
++endif() |
111 |
++ |
112 |
++pkg_check_modules(libexif IMPORTED_TARGET libexif) |
113 |
++if(TARGET PkgConfig::libexif) |
114 |
++ list(APPEND mltgdk_lib PkgConfig::libexif) |
115 |
++ list(APPEND mltgdk_def USE_EXIF) |
116 |
++endif() |
117 |
++# Only for MMX but not x86_64: deprecated |
118 |
++# list(APPEND mltgdk_src have_mmx.S scale_line_22_yuv_mmx.S) |
119 |
++add_library(mltgdk MODULE ${mltgdk_src}) |
120 |
++target_link_libraries(mltgdk ${mltgdk_lib}) |
121 |
++target_compile_definitions(mltgdk PRIVATE ${mltgdk_def}) |
122 |
++install(TARGETS mltgdk LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt) |
123 |
++file(GLOB yml *.yml) |
124 |
++install(FILES ${yml} |
125 |
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/gdk) |
126 |
+diff --git a/src/modules/gdk/Makefile b/src/modules/gdk/Makefile |
127 |
+new file mode 100644 |
128 |
+index 000000000..2e3018976 |
129 |
+--- /dev/null |
130 |
++++ b/src/modules/gdk/Makefile |
131 |
+@@ -0,0 +1,74 @@ |
132 |
++include ../../../config.mak |
133 |
++include config.mak |
134 |
++ |
135 |
++CFLAGS := -I../.. $(CFLAGS) |
136 |
++ |
137 |
++LDFLAGS := -L../../framework -lmlt -lpthread -lm $(LDFLAGS) |
138 |
++ |
139 |
++TARGET = ../libmltgdk$(LIBSUF) |
140 |
++ |
141 |
++OBJS = factory.o |
142 |
++ |
143 |
++ifdef USE_PIXBUF |
144 |
++OBJS += producer_pixbuf.o pixops.o filter_rescale.o |
145 |
++CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags gdk-pixbuf-2.0) |
146 |
++LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs gdk-pixbuf-2.0) |
147 |
++endif |
148 |
++ |
149 |
++ifdef USE_EXIF |
150 |
++CFLAGS += $(EXIFCXXFLAGS) |
151 |
++LDFLAGS += $(EXIFLIBS) |
152 |
++endif |
153 |
++ |
154 |
++ifdef MMX_FLAGS |
155 |
++ifndef ARCH_X86_64 |
156 |
++ASM_OBJS = have_mmx.o scale_line_22_yuv_mmx.o |
157 |
++endif |
158 |
++endif |
159 |
++ |
160 |
++ifdef USE_PANGO |
161 |
++OBJS += producer_pango.o |
162 |
++CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags pangoft2) |
163 |
++CFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --cflags-only-I freetype2 | awk '{for (i=1; i<=NF; i++) $$i=sprintf("%s/freetype", $$i); print}') |
164 |
++LDFLAGS += $(shell pkg-config $(PKGCONFIG_PREFIX) --libs pangoft2) |
165 |
++ifeq ($(targetos),Darwin) |
166 |
++LDFLAGS += -liconv |
167 |
++endif |
168 |
++ifeq ($(targetos),FreeBSD) |
169 |
++LDFLAGS += -liconv |
170 |
++endif |
171 |
++ifeq ($(targetos), MinGW) |
172 |
++LDFLAGS += -liconv |
173 |
++endif |
174 |
++endif |
175 |
++ |
176 |
++SRCS := $(OBJS:.o=.c) |
177 |
++ |
178 |
++all: $(TARGET) |
179 |
++ |
180 |
++$(TARGET): $(OBJS) $(ASM_OBJS) |
181 |
++ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(ASM_OBJS) $(LDFLAGS) |
182 |
++ |
183 |
++have_mmx.o: |
184 |
++ $(CC) -o $@ -c have_mmx.S |
185 |
++ |
186 |
++scale_line_22_yuv_mmx.o: scale_line_22_yuv_mmx.S |
187 |
++ $(CC) -o $@ -c scale_line_22_yuv_mmx.S |
188 |
++ |
189 |
++depend: $(SRCS) |
190 |
++ $(CC) -MM $(CFLAGS) $^ 1>.depend |
191 |
++ |
192 |
++distclean: clean |
193 |
++ rm -f .depend |
194 |
++ |
195 |
++clean: |
196 |
++ rm -f $(OBJS) $(ASM_OBJS) $(TARGET) |
197 |
++ |
198 |
++install: all |
199 |
++ install -m 755 $(TARGET) "$(DESTDIR)$(moduledir)" |
200 |
++ install -d "$(DESTDIR)$(mltdatadir)/gdk" |
201 |
++ install -m 644 *.yml "$(DESTDIR)$(mltdatadir)/gdk" |
202 |
++ |
203 |
++ifneq ($(wildcard .depend),) |
204 |
++include .depend |
205 |
++endif |
206 |
+diff --git a/src/modules/gdk/configure b/src/modules/gdk/configure |
207 |
+new file mode 100755 |
208 |
+index 000000000..07003b049 |
209 |
+--- /dev/null |
210 |
++++ b/src/modules/gdk/configure |
211 |
+@@ -0,0 +1,82 @@ |
212 |
++#!/bin/sh |
213 |
++ |
214 |
++if [ "$help" = "1" ] |
215 |
++then |
216 |
++ cat << EOF |
217 |
++GDK options: |
218 |
++ |
219 |
++ --gdk-prefix=path - Override the gdk prefix for pkg-config |
220 |
++ |
221 |
++EOF |
222 |
++ |
223 |
++else |
224 |
++ pkgconfig_prefix= |
225 |
++ for i in "$@" |
226 |
++ do |
227 |
++ case $i in |
228 |
++ --gdk-prefix=* ) pkgconfig_prefix="${i#--gdk-prefix=}" ;; |
229 |
++ esac |
230 |
++ done |
231 |
++ [ "$pkgconfig_prefix" != "" ] && pkgconfig_prefix="--define-variable=prefix=\"$pkgconfig_prefix\"" |
232 |
++ |
233 |
++ pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 2> /dev/null |
234 |
++ disable_pixbuf=$? |
235 |
++ |
236 |
++ pkg-config $pkgconfig_prefix gdk-pixbuf-2.0 pangoft2 2> /dev/null |
237 |
++ disable_pango=$? |
238 |
++ |
239 |
++ if [ "$disable_pixbuf" != 0 -a "$disable_pango" != "0" ] |
240 |
++ then |
241 |
++ echo "- GDK components not found: disabling" |
242 |
++ touch ../disable-gdk |
243 |
++ exit 0 |
244 |
++ fi |
245 |
++ |
246 |
++ echo > config.mak |
247 |
++ |
248 |
++ if [ "$disable_pixbuf" = "0" ] |
249 |
++ then |
250 |
++ echo "CFLAGS += -DUSE_PIXBUF" >> config.mak |
251 |
++ echo "USE_PIXBUF=1" >> config.mak |
252 |
++ else |
253 |
++ echo "- pixbuf not found: pixbuf loader and rescaler disabled" |
254 |
++ fi |
255 |
++ |
256 |
++ if [ "$disable_pango" = "0" ] |
257 |
++ then |
258 |
++ echo "CFLAGS += -DUSE_PANGO" >> config.mak |
259 |
++ echo "USE_PANGO=1" >> config.mak |
260 |
++ else |
261 |
++ echo "- pango not found: pango titler disabled" |
262 |
++ fi |
263 |
++ |
264 |
++ [ "$pkgconfig_prefix" != "" ] && echo "PKGCONFIG_PREFIX=$pkgconfig_prefix" >> config.mak |
265 |
++ |
266 |
++ pkg-config --exists 'libexif' |
267 |
++ if [ $? -eq 0 ] |
268 |
++ then |
269 |
++ echo "- Libexif found, enabling auto rotate" |
270 |
++ echo "USE_EXIF=1" >> config.mak |
271 |
++ echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak |
272 |
++ echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak |
273 |
++ echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak |
274 |
++ elif [ -d "$exif_libdir" -a -d "$exif_includedir" ] |
275 |
++ then |
276 |
++ # test if we have a libexif |
277 |
++ if [ -f "$exif_libdir/exif-data.h" ] |
278 |
++ then |
279 |
++ echo "- Libexif found, enabling auto rotate" |
280 |
++ echo "USE_EXIF=1" >> config.mak |
281 |
++ echo EXIFCXXFLAGS=-I$exif_includedir >> config.mak |
282 |
++ echo EXIFCXXFLAGS += -DUSE_EXIF >> config.mak |
283 |
++ echo EXIFLIBS=-L$exif_libdir lexif >> config.mak |
284 |
++ else |
285 |
++ echo "- Libexif not found, disabling exif features (auto rotate)" |
286 |
++ fi |
287 |
++ else |
288 |
++ echo "- Libexif not found, disabling exif features (auto rotate)" |
289 |
++ fi |
290 |
++ |
291 |
++ exit 0 |
292 |
++fi |
293 |
++ |
294 |
+diff --git a/src/modules/gdk/factory.c b/src/modules/gdk/factory.c |
295 |
+new file mode 100644 |
296 |
+index 000000000..94b89466e |
297 |
+--- /dev/null |
298 |
++++ b/src/modules/gdk/factory.c |
299 |
+@@ -0,0 +1,92 @@ |
300 |
++/* |
301 |
++ * factory.c -- the factory method interfaces |
302 |
++ * Copyright (C) 2003-2014 Meltytech, LLC |
303 |
++ * |
304 |
++ * This library is free software; you can redistribute it and/or |
305 |
++ * modify it under the terms of the GNU Lesser General Public |
306 |
++ * License as published by the Free Software Foundation; either |
307 |
++ * version 2.1 of the License, or (at your option) any later version. |
308 |
++ * |
309 |
++ * This library is distributed in the hope that it will be useful, |
310 |
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of |
311 |
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
312 |
++ * Lesser General Public License for more details. |
313 |
++ * |
314 |
++ * You should have received a copy of the GNU Lesser General Public |
315 |
++ * License along with this library; if not, write to the Free Software |
316 |
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
317 |
++ */ |
318 |
++ |
319 |
++#include <string.h> |
320 |
++#include <framework/mlt.h> |
321 |
++#include <stdlib.h> |
322 |
++ |
323 |
++#ifdef USE_PIXBUF |
324 |
++extern mlt_producer producer_pixbuf_init( char *filename ); |
325 |
++extern mlt_filter filter_rescale_init( mlt_profile profile, char *arg ); |
326 |
++#endif |
327 |
++ |
328 |
++#ifdef USE_PANGO |
329 |
++extern mlt_producer producer_pango_init( const char *filename ); |
330 |
++#endif |
331 |
++ |
332 |
++static void initialise( ) |
333 |
++{ |
334 |
++ static int init = 0; |
335 |
++ if ( init == 0 ) |
336 |
++ { |
337 |
++ init = 1; |
338 |
++ if ( getenv("MLT_PIXBUF_PRODUCER_CACHE") ) |
339 |
++ { |
340 |
++ int n = atoi( getenv("MLT_PIXBUF_PRODUCER_CACHE" ) ); |
341 |
++ mlt_service_cache_set_size( NULL, "pixbuf.image", n ); |
342 |
++ mlt_service_cache_set_size( NULL, "pixbuf.alpha", n ); |
343 |
++ mlt_service_cache_set_size( NULL, "pixbuf.pixbuf", n ); |
344 |
++ } |
345 |
++ if ( getenv("MLT_PANGO_PRODUCER_CACHE") ) |
346 |
++ { |
347 |
++ int n = atoi( getenv("MLT_PANGO_PRODUCER_CACHE" ) ); |
348 |
++ mlt_service_cache_set_size( NULL, "pango.image", n ); |
349 |
++ } |
350 |
++ } |
351 |
++} |
352 |
++ |
353 |
++void *create_service( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) |
354 |
++{ |
355 |
++ initialise( ); |
356 |
++ |
357 |
++#ifdef USE_PIXBUF |
358 |
++ if ( !strcmp( id, "pixbuf" ) ) |
359 |
++ return producer_pixbuf_init( arg ); |
360 |
++#endif |
361 |
++ |
362 |
++#ifdef USE_PANGO |
363 |
++ if ( !strcmp( id, "pango" ) ) |
364 |
++ return producer_pango_init( arg ); |
365 |
++#endif |
366 |
++ |
367 |
++#ifdef USE_PIXBUF |
368 |
++ if ( !strcmp( id, "gtkrescale" ) ) |
369 |
++ return filter_rescale_init( profile, arg ); |
370 |
++#endif |
371 |
++ |
372 |
++ return NULL; |
373 |
++} |
374 |
++ |
375 |
++static mlt_properties metadata( mlt_service_type type, const char *id, void *data ) |
376 |
++{ |
377 |
++ char file[ PATH_MAX ]; |
378 |
++ snprintf( file, PATH_MAX, "%s/gtk2/%s", mlt_environment( "MLT_DATA" ), (char*) data ); |
379 |
++ return mlt_properties_parse_yaml( file ); |
380 |
++} |
381 |
++ |
382 |
++MLT_REPOSITORY |
383 |
++{ |
384 |
++ MLT_REGISTER( filter_type, "gtkrescale", create_service ); |
385 |
++ MLT_REGISTER( producer_type, "pango", create_service ); |
386 |
++ MLT_REGISTER( producer_type, "pixbuf", create_service ); |
387 |
++ |
388 |
++ MLT_REGISTER_METADATA( filter_type, "gtkrescale", metadata, "filter_rescale.yml" ); |
389 |
++ MLT_REGISTER_METADATA( producer_type, "pango", metadata, "producer_pango.yml" ); |
390 |
++ MLT_REGISTER_METADATA( producer_type, "pixbuf", metadata, "producer_pixbuf.yml" ); |
391 |
++} |
392 |
+diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gdk/filter_rescale.c |
393 |
+similarity index 100% |
394 |
+rename from src/modules/gtk2/filter_rescale.c |
395 |
+rename to src/modules/gdk/filter_rescale.c |
396 |
+diff --git a/src/modules/gtk2/filter_rescale.yml b/src/modules/gdk/filter_rescale.yml |
397 |
+similarity index 100% |
398 |
+rename from src/modules/gtk2/filter_rescale.yml |
399 |
+rename to src/modules/gdk/filter_rescale.yml |
400 |
+diff --git a/src/modules/gtk2/have_mmx.S b/src/modules/gdk/have_mmx.S |
401 |
+similarity index 100% |
402 |
+rename from src/modules/gtk2/have_mmx.S |
403 |
+rename to src/modules/gdk/have_mmx.S |
404 |
+diff --git a/src/modules/gtk2/pixops.c b/src/modules/gdk/pixops.c |
405 |
+similarity index 100% |
406 |
+rename from src/modules/gtk2/pixops.c |
407 |
+rename to src/modules/gdk/pixops.c |
408 |
+diff --git a/src/modules/gtk2/pixops.h b/src/modules/gdk/pixops.h |
409 |
+similarity index 100% |
410 |
+rename from src/modules/gtk2/pixops.h |
411 |
+rename to src/modules/gdk/pixops.h |
412 |
+diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gdk/producer_pango.c |
413 |
+similarity index 99% |
414 |
+rename from src/modules/gtk2/producer_pango.c |
415 |
+rename to src/modules/gdk/producer_pango.c |
416 |
+index b3e11b942..ead6e9123 100644 |
417 |
+--- a/src/modules/gtk2/producer_pango.c |
418 |
++++ b/src/modules/gdk/producer_pango.c |
419 |
+@@ -172,7 +172,6 @@ mlt_producer producer_pango_init( const char *filename ) |
420 |
+ pthread_mutex_lock( &pango_mutex ); |
421 |
+ if ( fontmap == NULL ) |
422 |
+ fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new(); |
423 |
+- g_type_init(); |
424 |
+ pthread_mutex_unlock( &pango_mutex ); |
425 |
+ |
426 |
+ producer->get_frame = producer_get_frame; |
427 |
+diff --git a/src/modules/gtk2/producer_pango.yml b/src/modules/gdk/producer_pango.yml |
428 |
+similarity index 100% |
429 |
+rename from src/modules/gtk2/producer_pango.yml |
430 |
+rename to src/modules/gdk/producer_pango.yml |
431 |
+diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gdk/producer_pixbuf.c |
432 |
+similarity index 100% |
433 |
+rename from src/modules/gtk2/producer_pixbuf.c |
434 |
+rename to src/modules/gdk/producer_pixbuf.c |
435 |
+diff --git a/src/modules/gtk2/producer_pixbuf.yml b/src/modules/gdk/producer_pixbuf.yml |
436 |
+similarity index 100% |
437 |
+rename from src/modules/gtk2/producer_pixbuf.yml |
438 |
+rename to src/modules/gdk/producer_pixbuf.yml |
439 |
+diff --git a/src/modules/gtk2/scale_line_22_yuv_mmx.S b/src/modules/gdk/scale_line_22_yuv_mmx.S |
440 |
+similarity index 100% |
441 |
+rename from src/modules/gtk2/scale_line_22_yuv_mmx.S |
442 |
+rename to src/modules/gdk/scale_line_22_yuv_mmx.S |
443 |
+diff --git a/src/modules/gtk2/deprecated b/src/modules/gtk2/deprecated |
444 |
+new file mode 100644 |
445 |
+index 000000000..e69de29bb |
446 |
|
447 |
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
448 |
index f6a1c848d4c..d12698082a8 100644 |
449 |
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild |
450 |
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
451 |
@@ -40,7 +40,6 @@ DEPEND=" |
452 |
frei0r? ( media-plugins/frei0r-plugins ) |
453 |
gtk? ( |
454 |
media-libs/libexif |
455 |
- x11-libs/gtk+:2 |
456 |
x11-libs/pango |
457 |
) |
458 |
jack? ( |
459 |
@@ -86,6 +85,7 @@ DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) |
460 |
PATCHES=( |
461 |
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch |
462 |
"${FILESDIR}"/${P}-qt-5.15.patch |
463 |
+ "${FILESDIR}"/${P}-no-gtk2.patch |
464 |
) |
465 |
|
466 |
pkg_setup() { |
467 |
@@ -111,6 +111,7 @@ src_configure() { |
468 |
--enable-gpl3 |
469 |
--enable-motion-est |
470 |
--target-arch=$(tc-arch) |
471 |
+ --disable-gtk2 |
472 |
--disable-kde |
473 |
--disable-sdl |
474 |
--disable-swfdec |
475 |
@@ -120,7 +121,7 @@ src_configure() { |
476 |
$(use_enable ffmpeg avformat) |
477 |
$(use_enable fftw plus) |
478 |
$(use_enable frei0r) |
479 |
- $(use_enable gtk gtk2) |
480 |
+ $(use_enable gtk gdk) |
481 |
$(use_enable jack jackrack) |
482 |
$(use_enable kdenlive) |
483 |
$(use_enable libsamplerate resample) |