1 |
commit: ffbe363fb73741fa1d0f549a3a539b9fb3dadd8e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 29 14:50:01 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 29 14:50:47 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbe363f |
7 |
|
8 |
media-libs/mlt: Drop 6.26.1-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/mlt/Manifest | 1 - |
14 |
.../mlt-6.26.1-fix-crash-w-ogg-album-art.patch | 50 ----- |
15 |
media-libs/mlt/metadata.xml | 2 - |
16 |
media-libs/mlt/mlt-6.26.1-r1.ebuild | 232 --------------------- |
17 |
4 files changed, 285 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest |
20 |
index 9ffa7b9eed59..488270c45cff 100644 |
21 |
--- a/media-libs/mlt/Manifest |
22 |
+++ b/media-libs/mlt/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4 |
25 |
DIST mlt-7.2.0.tar.gz 1203489 BLAKE2B 2b53a813146f4868469c945208b4e7b509f67667357df615954a7d0f02ebe809dba0c15acd302f9a8609978929d00dd1e20fb03fc5d29a7dd5196253f37f70b7 SHA512 cee8d6cef2db5aae5747a80a292eca29d25adedd7754ea88a1857b429c0ccd35f689bcd9381c069c0e9e04b9eae5b7301e7c9548c536b43e4a9d54af664d629f |
26 |
|
27 |
diff --git a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch |
28 |
deleted file mode 100644 |
29 |
index 4ad7ff5de416..000000000000 |
30 |
--- a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch |
31 |
+++ /dev/null |
32 |
@@ -1,50 +0,0 @@ |
33 |
-From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001 |
34 |
-From: Dan Dennedy <dan@×××××××.org> |
35 |
-Date: Fri, 16 Apr 2021 11:15:37 -0700 |
36 |
-Subject: [PATCH] fix #704 by properly identifying cover art |
37 |
- |
38 |
-(cherry picked from commit 6b0829df726aa9a840b8b34e923e9faf17a3a5ca) |
39 |
---- |
40 |
- src/modules/avformat/producer_avformat.c | 15 ++++----------- |
41 |
- 1 file changed, 4 insertions(+), 11 deletions(-) |
42 |
- |
43 |
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c |
44 |
-index 049452f9d..e079e6f70 100644 |
45 |
---- a/src/modules/avformat/producer_avformat.c |
46 |
-+++ b/src/modules/avformat/producer_avformat.c |
47 |
-@@ -398,10 +398,7 @@ static mlt_properties find_default_streams( producer_avformat self ) |
48 |
- if ( first_video_index < 0 ) |
49 |
- first_video_index = i; |
50 |
- // Only set the video stream if not album art |
51 |
-- if (self->video_index < 0 && |
52 |
-- (codec_params->codec_id != AV_CODEC_ID_MJPEG || |
53 |
-- codec_context->time_base.num != 1 || |
54 |
-- codec_context->time_base.den != 90000)) { |
55 |
-+ if (self->video_index < 0 && !(context->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) { |
56 |
- self->video_index = i; |
57 |
- } |
58 |
- mlt_properties_set( meta_media, key, "video" ); |
59 |
-@@ -1682,11 +1679,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form |
60 |
- codec_params = stream->codecpar; |
61 |
- |
62 |
- // Always use the image cache for album art. |
63 |
-- int is_album_art = ((codec_context->codec_id == AV_CODEC_ID_MJPEG |
64 |
-- || codec_context->codec_id == AV_CODEC_ID_GIF |
65 |
-- || codec_context->codec_id == AV_CODEC_ID_PNG) |
66 |
-- && mlt_properties_get_int(properties, "meta.media.frame_rate_num") == 90000 |
67 |
-- && mlt_properties_get_int(properties, "meta.media.frame_rate_den") == 1); |
68 |
-+ int is_album_art = stream->disposition & AV_DISPOSITION_ATTACHED_PIC; |
69 |
- if (is_album_art) |
70 |
- position = 0; |
71 |
- |
72 |
-@@ -2296,8 +2289,8 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p |
73 |
- mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num ); |
74 |
- mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den ); |
75 |
- |
76 |
-- // MP3 album art is a single JPEG at 90000 fps, which is not seekable. |
77 |
-- if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 90000 && frame_rate.den == 1 ) |
78 |
-+ // Cover art is a single image at 90000 fps, which is not seekable. |
79 |
-+ if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC) |
80 |
- self->video_seekable = 0; |
81 |
- |
82 |
- // Set the YUV colorspace from override or detect |
83 |
|
84 |
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml |
85 |
index 70c25a2a106a..632bde59b9d1 100644 |
86 |
--- a/media-libs/mlt/metadata.xml |
87 |
+++ b/media-libs/mlt/metadata.xml |
88 |
@@ -10,9 +10,7 @@ |
89 |
<name>Gentoo KDE Project</name> |
90 |
</maintainer> |
91 |
<use> |
92 |
- <flag name="compressed-lumas">Compress the luma files in png.</flag> |
93 |
<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag> |
94 |
- <flag name="lua">Build SWIG bindings for Lua</flag> |
95 |
<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag> |
96 |
<flag name="python">Build SWIG bindings for Python</flag> |
97 |
<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag> |
98 |
|
99 |
diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild |
100 |
deleted file mode 100644 |
101 |
index ec1d953a549a..000000000000 |
102 |
--- a/media-libs/mlt/mlt-6.26.1-r1.ebuild |
103 |
+++ /dev/null |
104 |
@@ -1,232 +0,0 @@ |
105 |
-# Copyright 1999-2021 Gentoo Authors |
106 |
-# Distributed under the terms of the GNU General Public License v2 |
107 |
- |
108 |
-EAPI=7 |
109 |
- |
110 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
111 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
112 |
-inherit lua python-single-r1 qmake-utils toolchain-funcs |
113 |
- |
114 |
-DESCRIPTION="Open source multimedia framework for television broadcasting" |
115 |
-HOMEPAGE="https://www.mltframework.org/" |
116 |
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz" |
117 |
- |
118 |
-LICENSE="GPL-3" |
119 |
-SLOT="0" |
120 |
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" |
121 |
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug |
122 |
-ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python |
123 |
-qt5 rtaudio rubberband sdl vdpau vidstab xine xml" |
124 |
-# java perl php tcl |
125 |
- |
126 |
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) |
127 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
128 |
- |
129 |
-SWIG_DEPEND=">=dev-lang/swig-2.0" |
130 |
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.8:* ) |
131 |
-# perl? ( ${SWIG_DEPEND} ) |
132 |
-# php? ( ${SWIG_DEPEND} ) |
133 |
-# tcl? ( ${SWIG_DEPEND} ) |
134 |
-# ruby? ( ${SWIG_DEPEND} ) |
135 |
-BDEPEND=" |
136 |
- virtual/pkgconfig |
137 |
- compressed-lumas? ( virtual/imagemagick-tools[png] ) |
138 |
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) |
139 |
- python? ( ${SWIG_DEPEND} ) |
140 |
-" |
141 |
-#rtaudio will use OSS on non linux OSes |
142 |
-DEPEND=" |
143 |
- >=media-libs/libebur128-1.2.2:= |
144 |
- ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) |
145 |
- fftw? ( sci-libs/fftw:3.0= ) |
146 |
- frei0r? ( media-plugins/frei0r-plugins ) |
147 |
- gtk? ( |
148 |
- media-libs/libexif |
149 |
- x11-libs/pango |
150 |
- ) |
151 |
- jack? ( |
152 |
- >=dev-libs/libxml2-2.5 |
153 |
- media-libs/ladspa-sdk |
154 |
- virtual/jack |
155 |
- ) |
156 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) |
157 |
- lua? ( ${LUA_DEPS} ) |
158 |
- opencv? ( >=media-libs/opencv-4.5.1:= ) |
159 |
- opengl? ( media-video/movit ) |
160 |
- python? ( ${PYTHON_DEPS} ) |
161 |
- qt5? ( |
162 |
- dev-qt/qtcore:5 |
163 |
- dev-qt/qtgui:5 |
164 |
- dev-qt/qtsvg:5 |
165 |
- dev-qt/qtwidgets:5 |
166 |
- dev-qt/qtxml:5 |
167 |
- media-libs/libexif |
168 |
- x11-libs/libX11 |
169 |
- ) |
170 |
- rtaudio? ( |
171 |
- >=media-libs/rtaudio-4.1.2 |
172 |
- kernel_linux? ( media-libs/alsa-lib ) |
173 |
- ) |
174 |
- rubberband? ( media-libs/rubberband ) |
175 |
- sdl? ( |
176 |
- media-libs/libsdl2[X,opengl,video] |
177 |
- media-libs/sdl2-image |
178 |
- ) |
179 |
- vidstab? ( media-libs/vidstab ) |
180 |
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) |
181 |
- xml? ( >=dev-libs/libxml2-2.5 )" |
182 |
-# java? ( >=virtual/jre-1.8:* ) |
183 |
-# perl? ( dev-lang/perl ) |
184 |
-# php? ( dev-lang/php ) |
185 |
-# ruby? ( ${RUBY_DEPS} ) |
186 |
-# sox? ( media-sound/sox ) |
187 |
-# tcl? ( dev-lang/tcl:0= ) |
188 |
-RDEPEND="${DEPEND}" |
189 |
- |
190 |
-DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) |
191 |
- |
192 |
-PATCHES=( |
193 |
- "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch |
194 |
- "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch |
195 |
- "${FILESDIR}"/${P}-fix-crash-w-ogg-album-art.patch # git master |
196 |
-) |
197 |
- |
198 |
-pkg_setup() { |
199 |
- use python && python-single-r1_pkg_setup |
200 |
-} |
201 |
- |
202 |
-src_prepare() { |
203 |
- default |
204 |
- |
205 |
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 |
206 |
- for x in python lua; do |
207 |
- sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die |
208 |
- done |
209 |
- |
210 |
- use python && python_fix_shebang src/swig/python |
211 |
-} |
212 |
- |
213 |
-src_configure() { |
214 |
- tc-export CC CXX |
215 |
- |
216 |
- local myconf=( |
217 |
- --enable-gpl |
218 |
- --enable-gpl3 |
219 |
- --enable-kdenlive |
220 |
- --enable-melt |
221 |
- --enable-motion-est |
222 |
- --target-arch=$(tc-arch) |
223 |
- --disable-gtk2 |
224 |
- --disable-kde |
225 |
- --disable-sdl |
226 |
- --disable-swfdec |
227 |
- $(use_enable debug) |
228 |
- $(use_enable cpu_flags_x86_sse sse) |
229 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
230 |
- $(use_enable ffmpeg avformat) |
231 |
- $(use_enable fftw plus) |
232 |
- $(use_enable frei0r) |
233 |
- $(use_enable gtk gdk) |
234 |
- $(use_enable jack jackrack) |
235 |
- $(use_enable libsamplerate resample) |
236 |
- $(use_enable opencv) |
237 |
- $(use_enable opengl) |
238 |
- $(use_enable qt5 qt) |
239 |
- $(use_enable rtaudio) |
240 |
- $(use_enable rubberband) |
241 |
- $(use_enable sdl sdl2) |
242 |
- $(use_enable vidstab vid.stab) |
243 |
- $(use_enable xine) |
244 |
- $(use_enable xml) |
245 |
- --disable-sox |
246 |
- ) |
247 |
- #$(use_enable sox) FIXME |
248 |
- |
249 |
- use compressed-lumas && myconf+=( --luma-compress ) |
250 |
- use ffmpeg && myconf+=( --avformat-swscale ) |
251 |
- use vdpau && myconf+=( --avformat-vdpau ) |
252 |
- |
253 |
- if use qt5 ; then |
254 |
- myconf+=( |
255 |
- --qt-includedir=$(qt5_get_headerdir) |
256 |
- --qt-libdir=$(qt5_get_libdir) |
257 |
- ) |
258 |
- fi |
259 |
- |
260 |
- if use amd64 || use x86 ; then |
261 |
- myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) |
262 |
- else |
263 |
- myconf+=( --disable-mmx ) |
264 |
- fi |
265 |
- |
266 |
- # TODO: add swig language bindings |
267 |
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover |
268 |
- |
269 |
- local swig_lang=() |
270 |
- # not done: java perl php ruby tcl |
271 |
- # handled separately: lua |
272 |
- for i in python; do |
273 |
- use $i && swig_lang+=( $i ) |
274 |
- done |
275 |
- [[ -z "${swig_lang}" ]] && swig_lang=( none ) |
276 |
- |
277 |
- econf "${myconf[@]}" --swig-languages="${swig_lang[*]}" |
278 |
- |
279 |
- sed -i -e s/^OPT/#OPT/ config.mak || die |
280 |
-} |
281 |
- |
282 |
-src_compile() { |
283 |
- default |
284 |
- |
285 |
- if use lua; then |
286 |
- # Only copy sources now to avoid unnecessary rebuilds |
287 |
- lua_copy_sources |
288 |
- |
289 |
- lua_compile() { |
290 |
- pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die |
291 |
- |
292 |
- sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die |
293 |
- ./build |
294 |
- |
295 |
- popd > /dev/null || die |
296 |
- } |
297 |
- lua_foreach_impl lua_compile |
298 |
- fi |
299 |
-} |
300 |
- |
301 |
-src_install() { |
302 |
- default |
303 |
- |
304 |
- insinto /usr/share/${PN} |
305 |
- doins -r demo |
306 |
- |
307 |
- # |
308 |
- # Install SWIG bindings |
309 |
- # |
310 |
- |
311 |
- docinto swig |
312 |
- |
313 |
- if use lua; then |
314 |
- lua_install() { |
315 |
- pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die |
316 |
- |
317 |
- exeinto "$(lua_get_cmod_dir)" |
318 |
- doexe mlt.so |
319 |
- |
320 |
- popd > /dev/null || die |
321 |
- } |
322 |
- lua_foreach_impl lua_install |
323 |
- |
324 |
- dodoc "${S}"/src/swig/lua/play.lua |
325 |
- fi |
326 |
- |
327 |
- if use python; then |
328 |
- cd "${S}"/src/swig/python || die |
329 |
- python_domodule mlt.py _mlt.so |
330 |
- chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die |
331 |
- dodoc play.py |
332 |
- python_optimize |
333 |
- fi |
334 |
- |
335 |
- # not done: java perl php ruby tcl |
336 |
-} |