[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 5a3dc5e2d46fec3902d8e2ad11186a8e45618455
Author: Brahmajit Das gmail com>
AuthorDate: Sat Jul 27 15:07:54 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 15 19:39:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3dc5e2
media-libs/mlt: Fix assignment from incompatible pointer type
Closes: https://bugs.gentoo.org/936747
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37746
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../mlt/files/mlt-7.24.0-musl-build-fix.patch | 54 +++
media-libs/mlt/mlt-7.24.0-r1.ebuild| 177 +
2 files changed, 231 insertions(+)
diff --git a/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch
b/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch
new file mode 100644
index ..7349c5dc1a9d
--- /dev/null
+++ b/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch
@@ -0,0 +1,54 @@
+https://github.com/mltframework/mlt/pull/1009
+From: Brahmajit Das
+Date: Sat, 27 Jul 2024 14:51:47 +
+Subject: [PATCH 1/1] Fix building on musl libc
+
+Not every Linux distribution uses GLibc, hence the code under
+```
+\#if defined(__linux__) || defined(__GLIBC__)
+```
+is not evaluated properly on non GLibc Linux distributions resulting in
+build errors such as:
+
+```
+/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:
In function 'mlt_properties_set_lcnumeric':
+/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:154:22:
error: assignment to 'mlt_locale_t' {aka 'struct __locale_struct *'} from
incompatible pointer type 'char *' [-Wincompatible-pointer-types]
+ 154 | list->locale = strdup(locale);
+ | ^
+/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:
In function 'mlt_properties_get_lcnumeric':
+/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:186:16:
error: assignment to 'const char *' from incompatible pointer type
'mlt_locale_t' {aka 'struct __locale_struct *'} [-Wincompatible-pointer-types]
+ 186 | result = list->locale;
+ |^
+[11/173] /usr/bin/x86_64-pc-linux-musl-gcc -DPREFIX_DATA=\"/usr/share/mlt-7\"
-DPREFIX_LIB=\"/usr/lib/mlt-7\" -Dmlt_EXPORTS
-I/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/.. -O2
-march=x86-64 -pipe -pipe -frecord-gcc-switches -fno-diagnostics-color
-fmessage-length=0 -std=gnu11 -fPIC -mmmx -msse -msse2 -MD -MT
src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -MF
src/framework/CMakeFiles/mlt.dir/mlt_property.c.o.d -o
src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -c
/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c
+FAILED: src/framework/CMakeFiles/mlt.dir/mlt_property.c.o
+/usr/bin/x86_64-pc-linux-musl-gcc -DPREFIX_DATA=\"/usr/share/mlt-7\"
-DPREFIX_LIB=\"/usr/lib/mlt-7\" -Dmlt_EXPORTS
-I/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/.. -O2
-march=x86-64 -pipe -pipe -frecord-gcc-switches -fno-diagnostics-color
-fmessage-length=0 -std=gnu11 -fPIC -mmmx -msse -msse2 -MD -MT
src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -MF
src/framework/CMakeFiles/mlt.dir/mlt_property.c.o.d -o
src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -c
/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c
+/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:
In function 'time_clock_to_frames':
+/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:331:31:
error: passing argument 2 of 'setlocale' from incompatible pointer type
[-Wincompatible-pointer-types]
+ 331 | setlocale(LC_NUMERIC, locale);
+ | ^~
+ | |
+ | mlt_locale_t {aka struct __locale_struct
*}
+In file included from
/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.h:34,
+ from
/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:28:
+/usr/include/locale.h:55:23: note: expected 'const char *' but argument is of
type 'mlt_locale_t' {aka 'struct __locale_struct *'}
+ 55 | char *setlocale (int, const char *);
+```
+
+Reported on Gentoo Linux with musl libc.
+Please refer bug: https://bugs.gentoo.org/936747 for more details.
+
+Signed-off-by: Brahmajit Das
+--- a/src/framework/mlt_property.h
b/src/framework/mlt_property.h
+@@ -30,7 +30,7 @@
+ #include
+ #endif
+
+-#if defined(__linux__) || defined(__GLIBC__)
++#if defined(__GLIBC__)
+ #include
+ typedef locale_t mlt_locale_t;
+ #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version
>= 900506)
+--
+2.45.2
+
diff --git a/media-libs/mlt/mlt-7.24.0-r1.ebuild
b/media-libs/mlt
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 7a37c9a76df76df42d230bc4e65bf471dee74cd1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 20 14:47:01 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 20 14:49:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a37c9a7
media-libs/mlt: drop 7.14.0-r1, 7.16.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/Manifest| 1 -
.../mlt/files/mlt-7.14.0-int-conversion.patch | 53 ---
media-libs/mlt/mlt-7.14.0-r1.ebuild| 158 -
media-libs/mlt/mlt-7.16.0.ebuild | 158 -
4 files changed, 370 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 7f9726ea8813..9932679fc00c 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1,2 @@
-DIST mlt-7.14.0.tar.gz 1509786 BLAKE2B
6a590bb85f9c1f35cffce393db0ae016351ed9713d37bb22232474df27fc8f647847e9aed6ba6a8a00787a69136533fbb9f2adfb7b4743e2bdee9b146ebbe02a
SHA512
9f30b06fd4a38fe41547f3b3919a6cb809f2493ef71af2c7a16029ba7b4a7b633db56c0fabafb1745b6072cd9de4db4131fe55afc66c06fd3dd016c33eb828cc
DIST mlt-7.16.0.tar.gz 1577046 BLAKE2B
810583888cbbd066a6addaf98fc0f9b9e5b7b0063f8442b8d1c26ca2454103bb199656d55348a3b325cf0ea44833296cbf61ae088631609b70c1918cfdb09e08
SHA512
35844a5fe6565ce8908c81f341fffe79e651fe1a6b05fde53338053a8dae774112f0caeb16059febba2a5a418d9674c17ddc2016899c8a24aefa501e812cc3df
DIST mlt-7.18.0.tar.gz 1586572 BLAKE2B
a0cd6728f0282733532b6d69f970428e868b372319ee1790aa0fb98d2f45e0487767ef983e80ed336d34de49a0240c577bff08515b71649d32befea6b3561d4e
SHA512
36995dc0d246525ca026c2337c41f0a485f37f8f9842973733a081c05dbc8870a501acc8f51314853cd189306f9bb620f6172cba84e2363af57a0b2be3781a74
diff --git a/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch
b/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch
deleted file mode 100644
index 8a3acdcc7048..
--- a/media-libs/mlt/files/mlt-7.14.0-int-conversion.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream:
https://github.com/mltframework/mlt/commit/db1f3ceff723912c2ff4b6207a3f446f6677e8f8
-
-From db1f3ceff723912c2ff4b6207a3f446f6677e8f8 Mon Sep 17 00:00:00 2001
-From: j-b-m
-Date: Sun, 2 Apr 2023 18:14:20 +0200
-Subject: [PATCH] Fix compilation: parameter type mismatch
-
-* Fix compilation: parameter type mismatch
-
-* Fix incompatible arg
a/src/modules/avformat/factory.c
-+++ b/src/modules/avformat/factory.c
-@@ -31,7 +31,7 @@ extern mlt_filter filter_swresample_init( mlt_profile
profile, char *arg );
- extern mlt_filter filter_swscale_init( mlt_profile profile, char *arg );
- extern mlt_producer producer_avformat_init( mlt_profile profile, const char
*service, char *file );
- extern mlt_filter filter_avfilter_init( mlt_profile, mlt_service_type, const
char*, char* );
--extern mlt_link link_swresample_init( mlt_profile profile, char *arg );
-+extern mlt_link link_swresample_init( mlt_profile profile, mlt_service_type,
const char *, char * );
-
- // ffmpeg Header files
- #include
-@@ -94,7 +94,7 @@ static void *create_service( mlt_profile profile,
mlt_service_type type, const c
- if ( type == mlt_service_filter_type )
- return filter_swresample_init( profile, arg );
- else if ( type == mlt_service_link_type )
-- return link_swresample_init( profile, arg );
-+ return link_swresample_init( profile, type, id, arg );
- #endif
- return NULL;
- }
a/src/win32/win32.c
-+++ b/src/win32/win32.c
-@@ -70,7 +70,7 @@ int setenv(const char *name, const char *value, int
overwrite)
-
- static int iconv_from_utf8( mlt_properties properties, const char *prop_name,
const char *prop_name_out, const char* encoding )
- {
-- char *text = mlt_properties_get( properties, prop_name );
-+ const char *text = mlt_properties_get( properties, prop_name );
- int result = 0;
-
- if ( text ) {
-@@ -99,7 +99,7 @@ static int iconv_from_utf8( mlt_properties properties, const
char *prop_name, co
-
- static int iconv_to_utf8( mlt_properties properties, const char *prop_name,
const char *prop_name_out, const char* encoding )
- {
-- char *text = mlt_properties_get( properties, prop_name );
-+ const char *text = mlt_properties_get( properties, prop_name );
- int result = 0;
-
- if ( text ) {
---
-2.41.0
-
diff --git a/media-libs/mlt/mlt-7.14.0-r1.ebuild
b/media-libs/mlt/mlt-7.14.0-r1.ebuild
deleted file mode 100644
index 2e4aa2447770..
--- a/media-libs/mlt/mlt-7.14.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 1ff80614a9657203b3d50042bd266e7e90f6812f
Author: Alfred Persson Forsberg catcream org>
AuthorDate: Sun Jun 26 19:14:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 26 20:08:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff80614
media-libs/mlt: fix build for musl
There is no gurantee that either HAVE_STRTOD_L or HAVE_LOCALE_H will be
defined at compile-time. Try for example building this project :)
The locale usage is now defined in POSIX and therefore we can now
assume it will be available on Linux, except for ancient systems.
https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/locale.h.html
Another way of dealing with this would be to have a global mlt_config.h
where HAVE_LOCALE_H and HAVE_STRTOD_L are defined to values determined
when mlt is installed.
See-also:
https://git.alpinelinux.org/aports/tree/community/mlt/musl-locale.patch,
https://github.com/mltframework/mlt/pull/803
Closes: https://bugs.gentoo.org/829608
Signed-off-by: Alfred Persson Forsberg catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26083
Signed-off-by: Sam James gentoo.org>
.../mlt/files/mlt-7.8.0-linux_locale_h.patch | 37 ++
media-libs/mlt/mlt-7.8.0.ebuild| 1 +
2 files changed, 38 insertions(+)
diff --git a/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
b/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
new file mode 100644
index ..43822c446654
--- /dev/null
+++ b/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
@@ -0,0 +1,37 @@
+From 7d82553a00e74af77e69cc74645e0a3ec6bb3aa1 Mon Sep 17 00:00:00 2001
+From: alfredfo <98554039+alfre...@users.noreply.github.com>
+Date: Sat, 25 Jun 2022 01:00:11 +
+Subject: [PATCH] Fix building for musl (#803)
+
+reverts: https://github.com/mltframework/mlt/pull/298.
+There is no gurantee that either HAVE_STRTOD_L or HAVE_LOCALE_H will be
+defined at compile-time. Try for example building this project :)
+
+The locale usage is now defined in POSIX and therefore we can now
+assume it will be available on Linux, except for ancient systems.
+https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/locale.h.html
+
+Another way of dealing with this would be to have a global mlt_config.h
+where HAVE_LOCALE_H and HAVE_STRTOD_L are defined to values determined
+when mlt is installed.
+
+https://git.alpinelinux.org/aports/tree/community/mlt/musl-locale.patch
+https://bugs.gentoo.org/829608
+https://github.com/mltframework/mlt/pull/803
+---
+ src/framework/mlt_property.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 85d550ac0..be61c23c2 100644
+--- a/src/framework/mlt_property.h
b/src/framework/mlt_property.h
+@@ -30,7 +30,7 @@
+ #include
+ #endif
+
+-#if (defined(__GLIBC__) && !defined(__APPLE__)) || defined(HAVE_LOCALE_H)
++#if (defined(__linux__) && !defined(__APPLE__))
+ # include
+ #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version
>= 900506)
+ # include
diff --git a/media-libs/mlt/mlt-7.8.0.ebuild b/media-libs/mlt/mlt-7.8.0.ebuild
index 0415d23c4499..badcf2ff5bcd 100644
--- a/media-libs/mlt/mlt-7.8.0.ebuild
+++ b/media-libs/mlt/mlt-7.8.0.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
+ "${FILESDIR}"/${PN}-7.8.0-linux_locale_h.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: ffbe363fb73741fa1d0f549a3a539b9fb3dadd8e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 29 14:50:01 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 29 14:50:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbe363f
media-libs/mlt: Drop 6.26.1-r1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/Manifest| 1 -
.../mlt-6.26.1-fix-crash-w-ogg-album-art.patch | 50 -
media-libs/mlt/metadata.xml| 2 -
media-libs/mlt/mlt-6.26.1-r1.ebuild| 232 -
4 files changed, 285 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 9ffa7b9eed59..488270c45cff 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,2 +1 @@
-DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B
f5b7e733090ae60cb6893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974
SHA512
6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
DIST mlt-7.2.0.tar.gz 1203489 BLAKE2B
2b53a813146f4868469c945208b4e7b509f67667357df615954a7d0f02ebe809dba0c15acd302f9a8609978929d00dd1e20fb03fc5d29a7dd5196253f37f70b7
SHA512
cee8d6cef2db5aae5747a80a292eca29d25adedd7754ea88a1857b429c0ccd35f689bcd9381c069c0e9e04b9eae5b7301e7c9548c536b43e4a9d54af664d629f
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
deleted file mode 100644
index 4ad7ff5de416..
--- a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Fri, 16 Apr 2021 11:15:37 -0700
-Subject: [PATCH] fix #704 by properly identifying cover art
-
-(cherry picked from commit 6b0829df726aa9a840b8b34e923e9faf17a3a5ca)
- src/modules/avformat/producer_avformat.c | 15 ---
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c
b/src/modules/avformat/producer_avformat.c
-index 049452f9d..e079e6f70 100644
a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -398,10 +398,7 @@ static mlt_properties find_default_streams(
producer_avformat self )
- if ( first_video_index < 0 )
- first_video_index = i;
- // Only set the video stream if not album art
-- if (self->video_index < 0 &&
-- (codec_params->codec_id !=
AV_CODEC_ID_MJPEG ||
-- codec_context->time_base.num
!= 1 ||
-- codec_context->time_base.den
!= 9)) {
-+ if (self->video_index < 0 &&
!(context->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
- self->video_index = i;
- }
- mlt_properties_set( meta_media, key, "video" );
-@@ -1682,11 +1679,7 @@ static int producer_get_image( mlt_frame frame, uint8_t
**buffer, mlt_image_form
- codec_params = stream->codecpar;
-
- // Always use the image cache for album art.
-- int is_album_art = ((codec_context->codec_id == AV_CODEC_ID_MJPEG
-- || codec_context->codec_id == AV_CODEC_ID_GIF
-- || codec_context->codec_id == AV_CODEC_ID_PNG)
-- && mlt_properties_get_int(properties,
"meta.media.frame_rate_num") == 9
-- && mlt_properties_get_int(properties,
"meta.media.frame_rate_den") == 1);
-+ int is_album_art = stream->disposition & AV_DISPOSITION_ATTACHED_PIC;
- if (is_album_art)
- position = 0;
-
-@@ -2296,8 +2289,8 @@ static int video_codec_init( producer_avformat self, int
index, mlt_properties p
- mlt_properties_set_int( properties,
"meta.media.frame_rate_num", frame_rate.num );
- mlt_properties_set_int( properties,
"meta.media.frame_rate_den", frame_rate.den );
-
-- // MP3 album art is a single JPEG at 9 fps, which is not
seekable.
-- if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 9
&& frame_rate.den == 1 )
-+ // Cover art is a single image at 9 fps, which is not
seekable.
-+ if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC)
- self->video_seekable = 0;
-
- // Set the YUV colorspace from override or detect
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 70c25a2a106a..632bde59b9d1 100644
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 910e07f083cf153254a277ced60e5d1cd064f59d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 27 19:53:31 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 27 19:53:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910e07f0
media-libs/mlt: Drop 6.22.1-r1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/Manifest| 1 -
...-fix-regression-w-multiple-affine-filters.patch | 23 ---
media-libs/mlt/metadata.xml| 2 -
media-libs/mlt/mlt-6.22.1-r1.ebuild| 201 -
4 files changed, 227 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 42929ef7e61..1813290fcc9 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,2 +1 @@
-DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B
3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb
SHA512
c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B
ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b
SHA512
c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
diff --git
a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch
b/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch
deleted file mode 100644
index d60976c1185..000
---
a/media-libs/mlt/files/mlt-6.22.1-fix-regression-w-multiple-affine-filters.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8b778aaee121c6b381bd570c2b6f526989866f8e Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Fri, 11 Sep 2020 21:24:24 -0700
-Subject: [PATCH] fix regression in 2c354d6e with multiple affine filters
-
-See #9 in https://forum.shotcut.org/t/v20-09-beta-is-now-available-to-
-test/20766/31
- src/modules/plus/transition_affine.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/modules/plus/transition_affine.c
b/src/modules/plus/transition_affine.c
-index 63bbaa1df..b1147c8c6 100644
a/src/modules/plus/transition_affine.c
-+++ b/src/modules/plus/transition_affine.c
-@@ -564,6 +564,7 @@ static int transition_get_image( mlt_frame a_frame,
uint8_t **image, mlt_image_f
- b_height = result.h;
- // Set the rescale interpolation to match the frame
- mlt_properties_set( b_props, "rescale.interp",
mlt_properties_get( a_props, "rescale.interp" ) );
-+ mlt_properties_set_int( b_props, "distort", 1 );
- } else if (scale_width != 1.0 || scale_height != 1.0) {
- // Scale request of b frame image to consumer scale maintaining
its aspect ratio.
- b_height = *height;
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 0a18c2e2c88..26411b90da3 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -12,9 +12,7 @@
Compress the luma files in
png.
Build the module for
media-plugins/frei0r-plugins
- Build support for
kde-apps/kdenlive
Build SWIG bindings for Lua
- Build the melt commandline tool
Build motion tracking module using
media-libs/opencv
Build SWIG bindings for Python
Builds rtaudio consumer for native audio
support on multiple platforms
diff --git a/media-libs/mlt/mlt-6.22.1-r1.ebuild
b/media-libs/mlt/mlt-6.22.1-r1.ebuild
deleted file mode 100644
index b40bee09cb6..000
--- a/media-libs/mlt/mlt-6.22.1-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-single-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/";
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
debug ffmpeg
-fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv
opengl python
-qt5 rtaudio sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-# perl? ( ${SWIG_DEPEND} )
-# php? ( ${SWIG_DEPEND} )
-# tcl? ( ${SWIG_DEPEND} )
-# ruby? ( ${SWIG_DEPEND} )
-BDEPEND="
- virtual/pkgcon
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: e95aae1b6e09fbeab95cae9f6595378662a8519d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Nov 2 14:01:35 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Nov 2 14:13:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95aae1b
media-libs/mlt: Drop 6.20.0-r2
Bug: https://bugs.gentoo.org/749810
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/Manifest| 1 -
.../mlt/files/mlt-6.20.0-crash-in-composite.patch | 34 --
...-6.20.0-crash-w-unsupported-preview-scale.patch | 48 ---
media-libs/mlt/files/mlt-6.20.0-musl-locale.patch | 34 --
media-libs/mlt/files/mlt-6.20.0-no-gtk2.patch | 421 -
.../mlt/files/mlt-6.20.0-nullpointer-crash.patch | 22 --
.../files/mlt-6.20.0-opencv-double-del-crash.patch | 21 -
media-libs/mlt/files/mlt-6.20.0-opencv4.patch | 45 ---
media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch | 49 ---
media-libs/mlt/mlt-6.20.0-r2.ebuild| 208 --
10 files changed, 883 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 26e118a2458..a4e8eb5d916 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,2 +1 @@
-DIST mlt-6.20.0.tar.gz 1446137 BLAKE2B
50599c827be82ea5f5145297b41001e94b44519ec4c6344b8cfdc6fc92e6106de60ecd985296ab77d24e6a5b74ea8e859187935bd88f9394f3c108308afc68ac
SHA512
939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B
3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb
SHA512
c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
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
deleted file mode 100644
index e5ae5f01c9d..000
--- a/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 46a226217d8ec5bbf66a4fa3da138fd6924dd13b Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Wed, 25 Mar 2020 16:06:34 -0700
-Subject: [PATCH] fix #535 crash in composite when PGM luma fails to load
-
- src/modules/core/transition_composite.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/core/transition_composite.c
b/src/modules/core/transition_composite.c
-index e6d078e36..24a0d30c7 100644
a/src/modules/core/transition_composite.c
-+++ b/src/modules/core/transition_composite.c
-@@ -1,6 +1,6 @@
- /*
- * transition_composite.c -- compose one image over another using alpha
channel
-- * Copyright (C) 2003-2019 Meltytech, LLC
-+ * Copyright (C) 2003-2020 Meltytech, LLC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -697,10 +697,10 @@ static uint16_t* get_luma( mlt_transition self,
mlt_properties properties, int w
- {
- luma_width = 0;
- luma_height = 0;
--}
-+ }
- }
- }
-- if ( luma_width > 0 && luma_height > 0 )
-+ if ( orig_bitmap && luma_width > 0 && luma_height > 0 )
- {
- // Scale luma map
- luma_bitmap = mlt_pool_alloc( width * height * sizeof(
uint16_t ) );
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
deleted file mode 100644
index 25057b3c1ae..000
--- a/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dc585bfa5765db418923e7b4802c03bc57733111 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Mon, 2 Mar 2020 14:02:26 -0800
-Subject: [PATCH] fix crash with filters not supporting preview scale
-
- src/modules/frei0r/transition_frei0r.c | 18 +-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/frei0r/transition_frei0r.c
b/src/modules/frei0r/transition_frei0r.c
-index b69011719..f11266b75 100644
a/src/modules/frei0r/transition_frei0r.c
-+++ b/src/modules/frei0r/transition_frei0r.c
-@@ -1,7 +1,7 @@
- /*
- * transition_frei0r.c -- frei0r transition
- * Copyright (c) 2008 Marco Gittler
-- * Copyright (C) 2009-2019 Meltytech, LLC
-+ * Copyright (C) 2009-2020 Meltytech, LLC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -67,9 +67,25 @@ static int transition_get_image( mlt_frame a_frame,
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 8e82bd7a497db607c05f1367417b844dc6a55412
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 1 18:42:27 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 1 18:44:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e82bd7a
media-libs/mlt: Fix build with musl libc
Closes: https://bugs.gentoo.org/713938
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/files/mlt-6.20.0-musl-locale.patch | 34 +++
media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 +
2 files changed, 35 insertions(+)
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
new file mode 100644
index 000..ed206108d2e
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch
@@ -0,0 +1,34 @@
+From d02611584d4b2f693469c72272fe369413139394 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter
+Date: Sun, 6 Nov 2016 00:45:44 +0100
+Subject: testing/mlt: new aport
+
+---
+ testing/mlt/musl-locale.patch | 13 +
+ 1 file changed, 13 insertions(+)
+ create mode 100644 testing/mlt/musl-locale.patch
+
+(limited to 'testing/mlt/musl-locale.patch')
+
+diff --git a/testing/mlt/musl-locale.patch b/testing/mlt/musl-locale.patch
+new file mode 100644
+index 00..030bb781d1
+--- /dev/null
b/testing/mlt/musl-locale.patch
+@@ -0,0 +1,13 @@
++--- ./src/framework/mlt_property.h.orig
+ ./src/framework/mlt_property.h
++@@ -30,8 +30,8 @@
++ #include
++ #endif
++
++-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
++-#include
+++#if defined(__linux__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+++#include
++ #else
++ typedef char* locale_t;
++ #endif
+--
+cgit v1.2.1
+
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild
b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index 7c449e85101..2d15f57bfc5 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch
"${FILESDIR}"/${P}-crash-in-composite.patch
"${FILESDIR}"/${P}-opencv-double-del-crash.patch
+ "${FILESDIR}"/${P}-musl-locale.patch # from Alpine, pending upstream
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 09fadf3ec3ead6c7b1dcd9c98988c473d43e942d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 30 21:01:26 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 30 21:44:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fadf3e
media-libs/mlt: fix crash in composite when PGM luma fails to load
Upstream commit 46a226217d8ec5bbf66a4fa3da138fd6924dd13b
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../mlt/files/mlt-6.20.0-crash-in-composite.patch | 34 ++
media-libs/mlt/mlt-6.20.0-r2.ebuild| 1 +
2 files changed, 35 insertions(+)
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
new file mode 100644
index 000..e5ae5f01c9d
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch
@@ -0,0 +1,34 @@
+From 46a226217d8ec5bbf66a4fa3da138fd6924dd13b Mon Sep 17 00:00:00 2001
+From: Dan Dennedy
+Date: Wed, 25 Mar 2020 16:06:34 -0700
+Subject: [PATCH] fix #535 crash in composite when PGM luma fails to load
+
+---
+ src/modules/core/transition_composite.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/core/transition_composite.c
b/src/modules/core/transition_composite.c
+index e6d078e36..24a0d30c7 100644
+--- a/src/modules/core/transition_composite.c
b/src/modules/core/transition_composite.c
+@@ -1,6 +1,6 @@
+ /*
+ * transition_composite.c -- compose one image over another using alpha
channel
+- * Copyright (C) 2003-2019 Meltytech, LLC
++ * Copyright (C) 2003-2020 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -697,10 +697,10 @@ static uint16_t* get_luma( mlt_transition self,
mlt_properties properties, int w
+ {
+ luma_width = 0;
+ luma_height = 0;
+-}
++ }
+ }
+ }
+- if ( luma_width > 0 && luma_height > 0 )
++ if ( orig_bitmap && luma_width > 0 && luma_height > 0 )
+ {
+ // Scale luma map
+ luma_bitmap = mlt_pool_alloc( width * height * sizeof(
uint16_t ) );
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild
b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index d261114c200..745d4959228 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
"${FILESDIR}"/${P}-opencv4.patch
"${FILESDIR}"/${P}-nullpointer-crash.patch
"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch
+ "${FILESDIR}"/${P}-crash-in-composite.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 98abfbe6ffbde5878926bc0b366c5f15e40d02da
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 30 20:30:45 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 30 21:44:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98abfbe6
media-libs/mlt: Fix configure with opencv-4
Upstream commit f4329c7e8f4704d3f8e8f2a96bd774e6d966194b
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/files/mlt-6.20.0-opencv4.patch | 45 +++
media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 +
2 files changed, 46 insertions(+)
diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv4.patch
b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch
new file mode 100644
index 000..e3e27904d5a
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-opencv4.patch
@@ -0,0 +1,45 @@
+From f4329c7e8f4704d3f8e8f2a96bd774e6d966194b Mon Sep 17 00:00:00 2001
+From: martin
+Date: Tue, 7 Apr 2020 19:48:01 +
+Subject: [PATCH] fix opencv4 support (#545)
+
+---
+ src/modules/opencv/configure | 17 +
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/opencv/configure b/src/modules/opencv/configure
+index 36851f678..4e7fdcf4a 100755
+--- a/src/modules/opencv/configure
b/src/modules/opencv/configure
+@@ -26,18 +26,27 @@ else
+ exit 0
+ fi
+
+-pkg-config --atleast-version=3.1.0 'opencv'
++ opencvname=opencv
++ pkg-config "$opencvname"
++ if [ $? -ne 0 ]
++ then
++ # Try v4, they renamed
++ opencvname=opencv4
++ fi
++
++ pkg-config --atleast-version=3.1.0 "$opencvname"
++
+ if [ $? -eq 0 ]
+ then
+-result=`pkg-config --libs opencv | grep "opencv_tracking"`
++result=`pkg-config --libs "$opencvname" | grep
"opencv_tracking"`
+ if [ -z "$result" ]
+ then
+ echo "- OpenCV tracking contrib module NOT found,
disabling OpenCV modules"
+ touch ../disable-opencv
+ exit 0
+ else
+-echo "CFLAGS += $(pkg-config --cflags opencv)" >>
config.mak
+-echo "LDFLAGS += $(pkg-config --libs opencv)" >>
config.mak
++echo "CFLAGS += $(pkg-config --cflags "$opencvname")"
>> config.mak
++echo "LDFLAGS += $(pkg-config --libs "$opencvname")"
>> config.mak
+ fi
+ else
+ echo "- OpenCV >= 3.1.0 NOT found: disabling"
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild
b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index d12698082a8..6edc6c8f9cb 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
"${FILESDIR}"/${P}-qt-5.15.patch
"${FILESDIR}"/${P}-no-gtk2.patch
+ "${FILESDIR}"/${P}-opencv4.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 9284c333c4c23eb00240f6a38533ecb2d27262dd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jun 30 21:04:19 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jun 30 21:44:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9284c333
media-libs/mlt: Fix OpenCV tracker double deletion crash
Upstream commit 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/mlt-6.20.0-opencv-double-del-crash.patch | 21 +
media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 +
2 files changed, 22 insertions(+)
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
new file mode 100644
index 000..7f764965046
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch
@@ -0,0 +1,21 @@
+From 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle
+Date: Tue, 17 Mar 2020 18:22:04 +0100
+Subject: [PATCH] Fix OpenCV tracker double deletion crash. Fixes #532
+
+---
+ src/modules/opencv/filter_opencv_tracker.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/modules/opencv/filter_opencv_tracker.cpp
b/src/modules/opencv/filter_opencv_tracker.cpp
+index 04a5f0b09..533f0f513 100644
+--- a/src/modules/opencv/filter_opencv_tracker.cpp
b/src/modules/opencv/filter_opencv_tracker.cpp
+@@ -351,7 +351,6 @@ static mlt_frame filter_process( mlt_filter filter,
mlt_frame frame )
+ static void filter_close( mlt_filter filter )
+ {
+ private_data* data = (private_data*) filter->child;
+- free ( data->tracker );
+ free ( data );
+ filter->child = NULL;
+ filter->close = NULL;
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild
b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index 745d4959228..cef89ce3ef6 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -90,6 +90,7 @@ PATCHES=(
"${FILESDIR}"/${P}-nullpointer-crash.patch
"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch
"${FILESDIR}"/${P}-crash-in-composite.patch
+ "${FILESDIR}"/${P}-opencv-double-del-crash.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: d82d4fd33555c69783dee4a83cfc4df184e97782
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 21 08:31:10 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 21 09:22:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82d4fd3
media-libs/mlt: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch | 49 +++
media-libs/mlt/mlt-6.20.0-r1.ebuild | 5 ++-
media-libs/mlt/mlt-6.20.0.ebuild | 5 ++-
3 files changed, 57 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000..edc183725d6
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-qt-5.15.patch
@@ -0,0 +1,49 @@
+From f58b44d73442986eeffec7431e59b7d19d214c1b Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Tue, 24 Mar 2020 21:17:05 +0100
+Subject: [PATCH] Fix build with Qt 5.15.0
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+---
+ src/modules/qt/filter_qtext.cpp | 1 +
+ src/modules/qt/graph.cpp | 1 +
+ src/modules/qt/producer_qtext.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp
+index c3de1fadc..c3e10f1a3 100644
+--- a/src/modules/qt/filter_qtext.cpp
b/src/modules/qt/filter_qtext.cpp
+@@ -21,6 +21,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ static QRectF get_text_path( QPainterPath* qpath, mlt_properties
filter_properties, const char* text, double scale )
+diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp
+index 6d4d669ca..7e91bb12f 100644
+--- a/src/modules/qt/graph.cpp
b/src/modules/qt/graph.cpp
+@@ -18,6 +18,7 @@
+ */
+
+ #include "graph.h"
++#include
+ #include
+ #include
+
+diff --git a/src/modules/qt/producer_qtext.cpp
b/src/modules/qt/producer_qtext.cpp
+index 603c2b780..ff95a8e26 100644
+--- a/src/modules/qt/producer_qtext.cpp
b/src/modules/qt/producer_qtext.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/media-libs/mlt/mlt-6.20.0-r1.ebuild
b/media-libs/mlt/mlt-6.20.0-r1.ebuild
index faf5025e814..8e0a0a9de4d 100644
--- a/media-libs/mlt/mlt-6.20.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r1.ebuild
@@ -89,7 +89,10 @@ RDEPEND="${DEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
diff --git a/media-libs/mlt/mlt-6.20.0.ebuild b/media-libs/mlt/mlt-6.20.0.ebuild
index bb5c456337a..98a221ed040 100644
--- a/media-libs/mlt/mlt-6.20.0.ebuild
+++ b/media-libs/mlt/mlt-6.20.0.ebuild
@@ -89,7 +89,10 @@ RDEPEND="${DEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: fd5352737ee789fd778a7bc577d10145de20193c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 22 09:02:20 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 22 12:15:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd535273
media-libs/mlt: Drop 6.12.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
media-libs/mlt/Manifest| 1 -
.../mlt/files/mlt-6.12.0-frei0r-w-tractor.patch| 37
.../mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch | 169
.../mlt/files/mlt-6.12.0-seconds-digits.patch | 22 ---
media-libs/mlt/mlt-6.12.0.ebuild | 219 -
5 files changed, 448 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 79e016ac566..40a4d0884ab 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,2 +1 @@
-DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B
18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283
SHA512
ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B
6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433
SHA512
554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
diff --git a/media-libs/mlt/files/mlt-6.12.0-frei0r-w-tractor.patch
b/media-libs/mlt/files/mlt-6.12.0-frei0r-w-tractor.patch
deleted file mode 100644
index e655f805f53..000
--- a/media-libs/mlt/files/mlt-6.12.0-frei0r-w-tractor.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 30621f28fd3a21a4162de17a12d943e811566b5e Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Wed, 5 Dec 2018 11:14:54 -0800
-Subject: [PATCH] Fix frei0r producer not working with tractor.
-
-Reported in https://forum.shotcut.org/t/color-bars-working-not-
-correctly/8308
- src/modules/frei0r/producer_frei0r.c | 8 ++--
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/modules/frei0r/producer_frei0r.c
b/src/modules/frei0r/producer_frei0r.c
-index 9a90f6b6b..d1547f6c5 100644
a/src/modules/frei0r/producer_frei0r.c
-+++ b/src/modules/frei0r/producer_frei0r.c
-@@ -26,12 +26,7 @@
-
- static int producer_get_image( mlt_frame frame, uint8_t **buffer,
mlt_image_format *format, int *width, int *height, int writable )
- {
--
-- // Obtain properties of frame
-- mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
--
-- // Obtain the producer for this frame
-- mlt_producer producer = mlt_properties_get_data( properties,
"producer_frei0r", NULL );
-+mlt_producer producer = mlt_frame_pop_service( frame );
-
- // Choose suitable out values if nothing specific requested
- if ( *width <= 0 )
-@@ -83,6 +78,7 @@ int producer_get_frame( mlt_producer producer, mlt_frame_ptr
frame, int index )
- mlt_properties_set_double( properties, "aspect_ratio",
mlt_profile_sar( profile ) );
-
- // Push the get_image method
-+mlt_frame_push_service( *frame, producer );
- mlt_frame_push_get_image( *frame, producer_get_image );
- }
-
\ No newline at end of file
diff --git a/media-libs/mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch
b/media-libs/mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch
deleted file mode 100644
index d0930c5ac63..000
--- a/media-libs/mlt/files/mlt-6.12.0-rgb-to-yuv-accuracy.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From adc5a2284b3a1073cb364c5f07d1d7c97e94c937 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Fri, 30 Nov 2018 15:26:15 -0800
-Subject: [PATCH] Fix color accuracy of RGB->YUV conversion.
-
-Fixes https://github.com/mltframework/shotcut/issues/674
- src/modules/avformat/common.c| 2 ++
- src/modules/avformat/common.h| 1 +
- src/modules/avformat/consumer_avformat.c | 7 +--
- src/modules/avformat/filter_avcolour_space.c | 7 +--
- src/modules/avformat/filter_swscale.c| 12
- src/modules/avformat/producer_avformat.c | 12 ++--
- 6 files changed, 15 insertions(+), 26 deletions(-)
-
-diff --git a/src/modules/avformat/common.c b/src/modules/avformat/common.c
-index 2b1f1fd5d..dca9dbaee 100644
a/src/modules/avformat/common.c
-+++ b/src/modules/avformat/common.c
-@@ -22,6 +22,8 @@
- #include
- #include
-
-+int mlt_default_sws_flags = SWS_BICUBIC | SWS_FULL_CHR_H_INP |
SWS_FULL_CHR_H_INT | SWS_ACCURATE_RND;
-+
- int mlt_to_av_sample_format( mlt_audio_format format )
- {
- switch( format )
-diff --git a/src/modules/avformat/common.h b/src/modules/avformat/common.h
-index 54df63e93..ce0f0f079 100644
a/src/modules/avformat/com
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: c0e8cee00a6112a277fe44bdfbe897e904a3c490
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 29 17:28:13 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 29 21:33:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e8cee0
media-libs/mlt: python3, use qmake-utils, various fixes
Add missing media-libs/libebur128 slot op
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
16.0-bad-aspect-ratio-resulting-in-black.patch | 56 ++
..._multi-does-not-correctly-handle-in-point.patch | 22 ++
media-libs/mlt/files/mlt-6.16.0-crop-filter.patch | 31 +++
.../mlt-6.16.0-mlt_consumer-race-condition.patch | 30 +++
.../mlt-6.16.0-rotoscoping-interpolation.patch | 22 ++
media-libs/mlt/mlt-6.16.0-r1.ebuild| 223 +
6 files changed, 384 insertions(+)
diff --git
a/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
new file mode 100644
index 000..c2bc1946a81
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.16.0-bad-aspect-ratio-resulting-in-black.patch
@@ -0,0 +1,56 @@
+From f0628d1fe7f61a267f1adad8824b9a2083e3376a Mon Sep 17 00:00:00 2001
+From: Dan Dennedy
+Date: Fri, 31 May 2019 19:03:32 -0700
+Subject: [PATCH] Fix #453 bad aspect ratio computed resulting in black.
+
+This occured when the s, width, or height properties are supplied with
+no "aspect."
+---
+ src/modules/avformat/consumer_avformat.c | 34 +---
+ 1 file changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+index 738f5a972..dd2719997 100644
+--- a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+@@ -271,22 +271,24 @@ mlt_consumer consumer_avformat_init( mlt_profile
profile, char *arg )
+ static void recompute_aspect_ratio( mlt_properties properties )
+ {
+ double ar = mlt_properties_get_double( properties, "aspect" );
+- AVRational rational = av_d2q( ar, 255 );
+- int width = mlt_properties_get_int( properties, "width" );
+- int height = mlt_properties_get_int( properties, "height" );
+-
+- // Update the profile and properties as well since this is an alias
+- // for mlt properties that correspond to profile settings
+- mlt_properties_set_int( properties, "display_aspect_num", rational.num
);
+- mlt_properties_set_int( properties, "display_aspect_den", rational.den
);
+-
+- // Now compute the sample aspect ratio
+- rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
+-
+- // Update the profile and properties as well since this is an alias
+- // for mlt properties that correspond to profile settings
+- mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
+- mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
++ if (ar > 0.0) {
++ AVRational rational = av_d2q( ar, 255 );
++ int width = mlt_properties_get_int( properties, "width" );
++ int height = mlt_properties_get_int( properties, "height" );
++
++ // Update the profile and properties as well since this is an
alias
++ // for mlt properties that correspond to profile settings
++ mlt_properties_set_int( properties, "display_aspect_num",
rational.num );
++ mlt_properties_set_int( properties, "display_aspect_den",
rational.den );
++
++ // Now compute the sample aspect ratio
++ rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
++
++ // Update the profile and properties as well since this is an
alias
++ // for mlt properties that correspond to profile settings
++ mlt_properties_set_int( properties, "sample_aspect_num",
rational.num );
++ mlt_properties_set_int( properties, "sample_aspect_den",
rational.den );
++ }
+ }
+
+ static void color_trc_from_colorspace( mlt_properties properties )
diff --git
a/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
new file mode 100644
index 000..946d06ae357
--- /dev/null
+++
b/media-libs/mlt/files/mlt-6.16.0-consumer_multi-does-not-correctly-handle-in-point.patch
@@ -0,0 +1,22 @@
+From 434dbcf62048cc1220c425c2adc77697b4d40ffb Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Mardelle
+Date: Mon, 10 Jun 2019 18:18:44 +0200
+Subject: [PATCH] Fix multi consumer doesn't correctly handle in point
+
+---
+ src/modules/core/consumer_multi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/core/consumer_multi.c
b/src/modules/core/consumer_multi.c
+inde
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 46a206cb63f05a289c5a979333d55ea2ab8a151b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 30 11:57:32 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Sep 7 20:33:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a206cb
media-libs/mlt: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/mlt/Manifest| 2 -
media-libs/mlt/files/mlt-6.2.0-ruby-link.patch | 18 --
media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch| 40
media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch| 22 --
.../mlt/files/mlt-6.4.1-libebur128-unbundle.patch | 137
media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch| 33 ---
media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch| 33 ---
media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch| 61 --
media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch | 33 ---
.../mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch | 22 --
media-libs/mlt/files/mlt-6.6.0-libav-1.patch | 39
media-libs/mlt/files/mlt-6.6.0-libav-2.patch | 31 ---
media-libs/mlt/files/mlt-6.6.0-libav-3.patch | 23 --
media-libs/mlt/files/mlt-6.6.0-png-segfault.patch | 36
.../mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch| 29 ---
media-libs/mlt/metadata.xml| 1 -
media-libs/mlt/mlt-6.4.1-r6.ebuild | 224 ---
media-libs/mlt/mlt-6.6.0-r1.ebuild | 240 -
18 files changed, 1024 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index c904de216cb..b884ece8480 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1 @@
DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B
4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e
SHA512
6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b
-DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B
835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051
SHA512
b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
-DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B
e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f
SHA512
06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
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
deleted file mode 100644
index 35341b4c205..000
--- a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The build system tries to link to installed system libraries first, which
-fails because the ABI has changed...
-
a/src/swig/ruby/build
-+++ b/src/swig/ruby/build
-@@ -5,9 +5,11 @@
- exit 0
- end
- system( "ln -sf ../mlt.i" )
-+system( "ln -sf ../../framework/libmlt.so" )
-+system( "ln -sf ../../mlt++/libmlt++.so" )
- system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
- $CFLAGS = $CFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')?
ENV['CXXFLAGS'] : '')
- $CXXFLAGS = $CXXFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')?
ENV['CXXFLAGS'] : '')
--$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++"
-+$LIBS += " -lmlt++ -lmlt -lstdc++"
- create_makefile('mlt')
- system( "make V=1" )
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
deleted file mode 100644
index 2f486939d8f..000
--- a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy
-Date: Sat, 26 Aug 2017 18:31:47 -0700
-Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reported by schnitzeltony on Andreas Müller.
-Patch by Dave Plater.
- src/framework/mlt_property.h | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 404d513f..043f530b 100644
a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -3,7 +3,7 @@
- * \brief Property class declaration
- * \see mlt_property_s
- *
-- * Copyright (C) 2003-2014 Meltytech, LLC
-+ * Copyright (C) 2003-2017 Meltytech, LLC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -31,7 +31,11 @@
- #endif
-
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
--#include
-+# if GLIBC_MINOR >= 26 && !defined(
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 5db3ebf975df589d6d2414317c52964c9dec5612
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 22 20:15:21 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 22 21:49:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db3ebf9
media-libs/mlt: Fix gif encoding with >=ffmpeg-3.2
Package-Manager: Portage-2.3.43, Repoman-2.3.10
media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch | 33 +++
media-libs/mlt/mlt-6.6.0-r1.ebuild| 1 +
2 files changed, 34 insertions(+)
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
new file mode 100644
index 000..4faecdc7879
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch
@@ -0,0 +1,33 @@
+From c7c2f271170892094a0cccdb517ca1b6061208d7 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy
+Date: Mon, 12 Mar 2018 15:20:29 -0700
+Subject: [PATCH] Fix #284 GIF encoding not working.
+
+This also fixes DPX.
+---
+ presets/consumer/avformat/GIF| 1 -
+ src/modules/avformat/consumer_avformat.c | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/presets/consumer/avformat/GIF b/presets/consumer/avformat/GIF
+index f6a0cd41a..da7361851 100644
+--- a/presets/consumer/avformat/GIF
b/presets/consumer/avformat/GIF
+@@ -7,4 +7,3 @@ bf=0
+
+ meta.preset.extension=gif
+ meta.preset.name=GIF Animation
+-meta.preset.hidden=1
+diff --git a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+index caac488e2..c3724d131 100644
+--- a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+@@ -71,7 +71,7 @@
+ #define AUDIO_ENCODE_BUFFER_SIZE (48000 * 2 * MAX_AUDIO_STREAMS)
+ #define AUDIO_BUFFER_SIZE (1024 * 42)
+ #define VIDEO_BUFFER_SIZE (8192 * 8192)
+-#define IMAGE_ALIGN (1)
++#define IMAGE_ALIGN (4)
+
+ //
+ // This structure should be extended and made globally available in mlt
diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild
b/media-libs/mlt/mlt-6.6.0-r1.ebuild
index b0b811b945d..c5eed698d08 100644
--- a/media-libs/mlt/mlt-6.6.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.6.0-r1.ebuild
@@ -99,6 +99,7 @@ PATCHES=(
"${FILESDIR}"/${P}-vorbis-ffmpeg-3.4.patch
"${FILESDIR}"/${P}-libav-{1,2,3}.patch
"${FILESDIR}"/${P}-png-segfault.patch
+ "${FILESDIR}"/${P}-gif-encoding.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 513c09f64248fd18d6dffcdeb0ed847d507fd205
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 22 19:03:18 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 22 21:49:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513c09f6
media-libs/mlt: Fix vorbis encoding with >=ffmpeg-3.4
Package-Manager: Portage-2.3.43, Repoman-2.3.10
.../mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch| 29 +++
media-libs/mlt/mlt-6.6.0-r1.ebuild | 224 +
2 files changed, 253 insertions(+)
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
new file mode 100644
index 000..bdf6ea211d4
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch
@@ -0,0 +1,29 @@
+From 7e0d478d161eacea015aa3d116e250e7c5f9f942 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy
+Date: Wed, 7 Feb 2018 16:58:44 -0800
+Subject: [PATCH] Fix vorbis encoding with FFmpeg v3.4+
+
+---
+ src/modules/avformat/consumer_avformat.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+index 434710049..6deb76df5 100644
+--- a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
+@@ -1,6 +1,6 @@
+ /*
+ * consumer_avformat.c -- an encoder based on avformat
+- * Copyright (C) 2003-2017 Meltytech, LLC
++ * Copyright (C) 2003-2018 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -1647,6 +1647,7 @@ static void *consumer_thread( void *arg )
+ enc_ctx->audio_avframe->format = c->sample_fmt;
+ enc_ctx->audio_avframe->nb_samples =
enc_ctx->audio_input_frame_size;
+ enc_ctx->audio_avframe->channel_layout =
c->channel_layout;
++ enc_ctx->audio_avframe->channels = c->channels;
+ } else {
+ mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed
to allocate audio AVFrame\n" );
+ mlt_events_fire( properties, "consumer-fatal-error",
NULL );
diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild
b/media-libs/mlt/mlt-6.6.0-r1.ebuild
new file mode 100644
index 000..6fcd43e0423
--- /dev/null
+++ b/media-libs/mlt/mlt-6.6.0-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single
ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the
ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby23"
+inherit eutils flag-o-matic multilib python-single-r1 ruby-single
toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/";
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5
rtaudio ruby sdl sdl2 vdpau xine xml"
+# java perl php tcl vidstab
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+COMMON_DEPEND="
+ >=media-libs/libebur128-1.2.2
+ ffmpeg? (
+ libav? ( >=media-video/libav-12:0=[vdpau?] )
+ !libav? ( media-video/ffmpeg:0=[vdpau?] )
+ )
+ fftw? ( sci-libs/fftw:3.0= )
+ frei0r? ( media-plugins/frei0r-plugins )
+ gtk? (
+ media-libs/libexif
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )
+ jack? (
+ >=dev-libs/libxml2-2.5
+ media-libs/ladspa-sdk
+ virtual/jack
+ )
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+ lua? ( >=dev-lang/lua-5.1.4-r4:= )
+ opencv? ( >=media-libs/opencv-3.2.0:= )
+ opengl? ( media-video/movit )
+ python? ( ${PYTHON_DEPS} )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/libexif
+ x11-libs/libX11
+ )
+ rtaudio? (
+ media-libs/rtaudio
+ kernel_linux? ( media-libs/alsa-lib )
+ )
+ ruby? ( ${RUBY_DEPS} )
+ sdl? (
+ >=media-libs/libsdl-1.2.10[X,opengl,video]
+ >=media-libs/sdl-image-1.2.4
+ )
+ sdl2? (
+ media-libs/libsdl2[X,open
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: 0cbedddea510010caa0597b963d8add093ef7c71
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 28 20:50:22 2017 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Oct 28 20:50:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbeddde
media-libs/mlt: Add glibc-2.26 compatibility patches.
Revision bump since headers have to be modified.
Closes: https://bugs.gentoo.org/635088
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch | 40 +
media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch | 22 +++
media-libs/mlt/mlt-6.4.1-r4.ebuild | 224
3 files changed, 286 insertions(+)
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
new file mode 100644
index 000..2f486939d8f
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch
@@ -0,0 +1,40 @@
+From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy
+Date: Sat, 26 Aug 2017 18:31:47 -0700
+Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported by schnitzeltony on Andreas Müller.
+Patch by Dave Plater.
+---
+ src/framework/mlt_property.h | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 404d513f..043f530b 100644
+--- a/src/framework/mlt_property.h
b/src/framework/mlt_property.h
+@@ -3,7 +3,7 @@
+ * \brief Property class declaration
+ * \see mlt_property_s
+ *
+- * Copyright (C) 2003-2014 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -31,7 +31,11 @@
+ #endif
+
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#include
++# if GLIBC_MINOR >= 26 && !defined(APPLE)
++#include
++# else
++#include
++# endif
+ #else
+ typedef char* locale_t;
+ #endif
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
new file mode 100644
index 000..d992ee32e06
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch
@@ -0,0 +1,22 @@
+From fbf6a5187776f2f392cf258935ff49e4c0e87024 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy
+Date: Wed, 30 Aug 2017 09:08:16 -0700
+Subject: [PATCH] Fix glib test macros to include locale.h.
+
+---
+ src/framework/mlt_property.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 043f530b..3ecebd67 100644
+--- a/src/framework/mlt_property.h
b/src/framework/mlt_property.h
+@@ -31,7 +31,7 @@
+ #endif
+
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-# if GLIBC_MINOR >= 26 && !defined(APPLE)
++# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
+ #include
+ # else
+ #include
diff --git a/media-libs/mlt/mlt-6.4.1-r4.ebuild
b/media-libs/mlt/mlt-6.4.1-r4.ebuild
new file mode 100644
index 000..f644ac3bb1f
--- /dev/null
+++ b/media-libs/mlt/mlt-6.4.1-r4.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single
ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the
ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby22"
+inherit eutils flag-o-matic multilib python-single-r1 ruby-single
toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/";
+SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
debug ffmpeg fftw frei0r
+gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5
rtaudio ruby sdl vdpau xine xml"
+# java perl php tcl vidstab
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+COMMON_DEPEND="
+ >=media-libs/libebur128-1.2.2
+ ffmpeg? (
+ libav? ( media-video/libav:0=[vdpau?] )
+ !libav? ( media-video/ffmpeg:0=[vdpau?] )
+ )
+ fftw? ( sci-libs/fftw:3.0= )
+ frei0r? ( media-plugins/frei0r-plugins )
+ gtk? (
+ media-libs/libexif
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )
+ jack? (
+ >=dev-libs/libxml2-2.5
+ media-libs/ladspa-sdk
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: dbada02dc1801b0eeb09a1c37c4c4840a6ec04cc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 5 10:31:01 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 5 11:54:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbada02d
media-libs/mlt: Unbundle libebur128
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../mlt/files/mlt-6.4.1-libebur128-unbundle.patch | 137 +
media-libs/mlt/mlt-6.4.1-r3.ebuild | 215 +
2 files changed, 352 insertions(+)
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
new file mode 100644
index 000..e9aaa25cf32
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch
@@ -0,0 +1,137 @@
+From fad1df2bc8efc2881867e510443547fddf5d620b Mon Sep 17 00:00:00 2001
+From: Brian Matherly
+Date: Sun, 19 Feb 2017 23:35:17 -0600
+Subject: [PATCH 1/2] Use external libebur128 if detected.
+
+---
+ src/modules/plus/Makefile | 7 +--
+ src/modules/plus/configure | 11 +++
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
+index 90067a56..351e7b76 100644
+--- a/src/modules/plus/Makefile
b/src/modules/plus/Makefile
+@@ -22,14 +22,17 @@ OBJS = consumer_blipflash.o \
+ filter_sepia.o \
+ producer_blipflash.o \
+ producer_count.o \
+- transition_affine.o \
+- ebur128/ebur128.o
++ transition_affine.o
+
+ ifdef USE_FFTW
+ OBJS += filter_dance.o \
+ filter_fft.o
+ endif
+
++ifdef USE_INTERNAL_LIBEBUR128
++ OBJS += ebur128/ebur128.o
++endif
++
+ SRCS := $(OBJS:.o=.c)
+
+ all: $(TARGET)
+diff --git a/src/modules/plus/configure b/src/modules/plus/configure
+index fbd49807..e38464b4 100755
+--- a/src/modules/plus/configure
b/src/modules/plus/configure
+@@ -16,5 +16,16 @@ then
+ echo "- fftw not found: disable fft and dance filters"
+ fi
+
++ pkg-config libebur128
++ if [ $? -eq 0 ]
++ then
++ echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
++ echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
++ else
++ echo "- libebur128 not found: using internal libebur128"
++ echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
++ echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
++ fi
++
+ exit 0
+ fi
+
+From 9951883b895eb920b7f67ea67a0753d8dea21a9e Mon Sep 17 00:00:00 2001
+From: Brian Matherly
+Date: Mon, 20 Feb 2017 08:15:52 -0600
+Subject: [PATCH 2/2] Fix include directives for ebur128 filters.
+
+---
+ src/modules/plus/Makefile | 2 +-
+ src/modules/plus/configure | 2 ++
+ src/modules/plus/filter_dynamic_loudness.c | 2 +-
+ src/modules/plus/filter_loudness.c | 2 +-
+ src/modules/plus/filter_loudness_meter.c | 2 +-
+ 5 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
+index 351e7b76..366bca19 100644
+--- a/src/modules/plus/Makefile
b/src/modules/plus/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -I../.. -Iebur128/queue
++CFLAGS += -I../..
+
+ LDFLAGS += -L../../framework -lmlt -lm -lpthread
+
+diff --git a/src/modules/plus/configure b/src/modules/plus/configure
+index e38464b4..59662ca0 100755
+--- a/src/modules/plus/configure
b/src/modules/plus/configure
+@@ -19,12 +19,14 @@ then
+ pkg-config libebur128
+ if [ $? -eq 0 ]
+ then
++ echo "- libebur128 found: using external libebur128"
+ echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
+ echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
+ else
+ echo "- libebur128 not found: using internal libebur128"
+ echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
+ echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
++ echo "CFLAGS += -Iebur128 -Iebur128/queue" >> config.mak
+ fi
+
+ exit 0
+diff --git a/src/modules/plus/filter_dynamic_loudness.c
b/src/modules/plus/filter_dynamic_loudness.c
+index 07551f14..99c83051 100644
+--- a/src/modules/plus/filter_dynamic_loudness.c
b/src/modules/plus/filter_dynamic_loudness.c
+@@ -22,7 +22,7 @@
+ #include
+ #include
+ #include
+-#include "ebur128/ebur128.h"
++#include
+
+ typedef struct
+ {
+diff --git a/src/modules/plus/filter_loudness.c
b/src/modules/plus/filter_loudness.c
+index 8b74b5c9..0614fecc 100644
+--- a/src/modules/plus/filter_loudness.c
b/src/modules/plus/filter_loudness.c
+@@ -22,7 +22,7 @@
+ #include
+ #include
+ #include
+-#include "ebur128/ebur128.h"
++#include
+
+ #define MAX_RESULT_SIZE 512
+
+diff --git a/src/modules/plus/filter_loudness_meter.c
b/src/modules/plus/filter_loudne
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: a73ddafeb654f1d81b0953f742d3fe233007e285
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Aug 21 20:08:30 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 21 20:08:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73ddafe
media-libs/mlt: remove old
Package-Manager: portage-2.3.0
media-libs/mlt/Manifest| 1 -
media-libs/mlt/files/mlt-0.9.8-ffmpeg3.patch | 500 -
media-libs/mlt/files/mlt-0.9.8-ruby-link.patch | 19 -
media-libs/mlt/mlt-0.9.8-r2.ebuild | 218 ---
media-libs/mlt/mlt-6.2.0-r1.ebuild | 200 --
5 files changed, 938 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 64044d7..aa1e385 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,2 +1 @@
-DIST mlt-0.9.8.tar.gz 1263364 SHA256
1214d6ad7fd1c3d36f0b1e64fd1c8d8a7ab6290e8452396003e79d58c0d21074 SHA512
2f3db19cbff8bdd11c53fe835fcc1c32d775ead061b2e225466376be98c622cdd18e67f66becda503a57725ac9a296bc48aae4c3aeed09ba878f61fd1e10
WHIRLPOOL
6153236139ea80f8d6727a05129a9dc32097a8c2bf41cb818843fa8d47885744c1534fd7d26817262f60404e4caa12ea67ae9b3f59984874981865ee9148
DIST mlt-6.2.0.tar.gz 1314506 SHA256
dd2ee742e89620de78a259790f92a7cadad67f0e0a6c1ea7ed932f96fb739fff SHA512
a36ee9c0684511dfa83e08027671d7c6f2c19741cc0504a12d19b4f859c596ca3457108785fa8d7321f5ba83f9498b9be26abb0d857b86743d0ec61e6fb2745b
WHIRLPOOL
a1554d58d7373711b8e99a185e0e57807ba438f1647480971feec26f6b7123af1c811a6219311d69444277e6ac1da95a1d7c8d351271dd0e3a80913028dba3fc
diff --git a/media-libs/mlt/files/mlt-0.9.8-ffmpeg3.patch
b/media-libs/mlt/files/mlt-0.9.8-ffmpeg3.patch
deleted file mode 100644
index ef89fbb..000
--- a/media-libs/mlt/files/mlt-0.9.8-ffmpeg3.patch
+++ /dev/null
@@ -1,500 +0,0 @@
-commit 97c2dd0de4f578ad40d547eddf78fcb1e4a008a4
-Author: Dan Dennedy
-Date: Sat Sep 5 13:06:21 2015 -0700
-
-Fix avformat build against FFmpeg and Libav master.
-
-This drops support for FFmpeg v1.0; requires at least v1.1. Still works
-with Libav v9.
-CPU flags are no longer required/used by libswscale. They are detected
-at runtime automatically.
-
-diff --git a/src/modules/avformat/consumer_avformat.c
b/src/modules/avformat/consumer_avformat.c
-index ef8b153..7947c47 100644
a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -439,18 +439,18 @@ static void apply_properties( void *obj, mlt_properties
properties, int flags )
- }
- }
-
--static enum PixelFormat pick_pix_fmt( mlt_image_format img_fmt )
-+static enum AVPixelFormat pick_pix_fmt( mlt_image_format img_fmt )
- {
- switch ( img_fmt )
- {
- case mlt_image_rgb24:
-- return PIX_FMT_RGB24;
-+ return AV_PIX_FMT_RGB24;
- case mlt_image_rgb24a:
-- return PIX_FMT_RGBA;
-+ return AV_PIX_FMT_RGBA;
- case mlt_image_yuv420p:
-- return PIX_FMT_YUV420P;
-+ return AV_PIX_FMT_YUV420P;
- default:
-- return PIX_FMT_YUYV422;
-+ return AV_PIX_FMT_YUYV422;
- }
- }
-
-@@ -798,7 +798,7 @@ static AVStream *add_video_stream( mlt_consumer consumer,
AVFormatContext *oc, A
- st->time_base = c->time_base;
-
- // Default to the codec's first pix_fmt if possible.
-- c->pix_fmt = pix_fmt? av_get_pix_fmt( pix_fmt ) : codec?
codec->pix_fmts[0] : PIX_FMT_YUV420P;
-+ c->pix_fmt = pix_fmt? av_get_pix_fmt( pix_fmt ) : codec?
codec->pix_fmts[0] : AV_PIX_FMT_YUV420P;
-
- switch ( colorspace )
- {
-@@ -1032,7 +1032,7 @@ static int open_video( mlt_properties properties,
AVFormatContext *oc, AVStream
-
- if( codec && codec->pix_fmts )
- {
-- const enum PixelFormat *p = codec->pix_fmts;
-+ const enum AVPixelFormat *p = codec->pix_fmts;
- for( ; *p!=-1; p++ )
- {
- if( *p == video_enc->pix_fmt )
-@@ -1791,12 +1791,6 @@ static void *consumer_thread( void *arg )
-
- // Do the colour space
conversion
- int flags = SWS_BICUBIC;
--#ifdef USE_MMX
-- flags |= SWS_CPU_CAPS_MMX;
--#endif
--#ifdef USE_SSE
-- flags |= SWS_CPU_CAPS_MMX2;
--#endif
- struct SwsContext *context =
sws_getContext( width, height, pick_pix_fmt( img_fmt ),
- width, height,
c->pix_fmt, flags, NULL, NULL, NULL);
- sws_scale( context, (const
uint8_t* const*) video_avframe->data, video_avframe->linesize, 0, height,
-@@ -1808,9 +1802,9 @@ s
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: a4e0ed1025e2a331ca0007a33440bb5e7f50d7ae
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Jun 23 15:09:43 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Jun 23 15:11:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e0ed10
media-libs/mlt: remove old
Package-Manager: portage-2.3.0_rc1
media-libs/mlt/Manifest | 1 -
media-libs/mlt/files/mlt-0.8.6-ruby-link.patch | 19 --
media-libs/mlt/files/mlt-0.9.0-freetype251.patch | 12 --
media-libs/mlt/mlt-0.9.0.ebuild | 189
media-libs/mlt/mlt-0.9.8.ebuild | 177 --
media-libs/mlt/mlt-6.2.0.ebuild | 218 ---
6 files changed, 616 deletions(-)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index dc39b38..64044d7 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1,2 @@
-DIST mlt-0.9.0.tar.gz 1167943 SHA256
f20c6a9c9acaed3da84c601bf9293b2d148168386e5be2bc55651a75f95c1cc9 SHA512
631ab41ee6e3673c712f784b9c02b567a5e3b982d49eabe032ef20e89be9424cf9ce6d97fe6906f03b0ac082544316ba8524ae041d017aeac009ab9b98d457d9
WHIRLPOOL
b39e78837f2f2785721315ac174d106e33bafd2dd55b8883b254a39dc98f664be29ce3e84413d2ba55f881bb42ca10c36a9117de00b1a5efc3dff8577a6a29af
DIST mlt-0.9.8.tar.gz 1263364 SHA256
1214d6ad7fd1c3d36f0b1e64fd1c8d8a7ab6290e8452396003e79d58c0d21074 SHA512
2f3db19cbff8bdd11c53fe835fcc1c32d775ead061b2e225466376be98c622cdd18e67f66becda503a57725ac9a296bc48aae4c3aeed09ba878f61fd1e10
WHIRLPOOL
6153236139ea80f8d6727a05129a9dc32097a8c2bf41cb818843fa8d47885744c1534fd7d26817262f60404e4caa12ea67ae9b3f59984874981865ee9148
DIST mlt-6.2.0.tar.gz 1314506 SHA256
dd2ee742e89620de78a259790f92a7cadad67f0e0a6c1ea7ed932f96fb739fff SHA512
a36ee9c0684511dfa83e08027671d7c6f2c19741cc0504a12d19b4f859c596ca3457108785fa8d7321f5ba83f9498b9be26abb0d857b86743d0ec61e6fb2745b
WHIRLPOOL
a1554d58d7373711b8e99a185e0e57807ba438f1647480971feec26f6b7123af1c811a6219311d69444277e6ac1da95a1d7c8d351271dd0e3a80913028dba3fc
diff --git a/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch
b/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch
deleted file mode 100644
index fa4ec8a..000
--- a/media-libs/mlt/files/mlt-0.8.6-ruby-link.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-The build system tries to link to installed system libraries first, which
-fails because the ABI has changed...
-
-Index: mlt-0.8.6/src/swig/ruby/build
-===
mlt-0.8.6.orig/src/swig/ruby/build
-+++ mlt-0.8.6/src/swig/ruby/build
-@@ -5,8 +5,10 @@ if ARGV.shift == 'clean'
- exit 0
- end
- system( "ln -sf ../mlt.i" )
-+system( "ln -sf ../../framework/libmlt.so" )
-+system( "ln -sf ../../mlt++/libmlt++.so" )
- system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
- $CFLAGS += " -I../.. " + ENV['CXXFLAGS']
--$LDFLAGS += " -L../../mlt++ -lmlt++"
-+$LIBS += " -lmlt++ -lmlt -lstdc++"
- create_makefile('mlt')
- system( "make" )
diff --git a/media-libs/mlt/files/mlt-0.9.0-freetype251.patch
b/media-libs/mlt/files/mlt-0.9.0-freetype251.patch
deleted file mode 100644
index 0584121..000
--- a/media-libs/mlt/files/mlt-0.9.0-freetype251.patch
+++ /dev/null
@@ -1,12 +0,0 @@
mlt-0.9.0/src/modules/gtk2/producer_pango.c
-+++ mlt-0.9.0/src/modules/gtk2/producer_pango.c
-@@ -25,7 +25,8 @@
- #include
- #include
- #include
--#include
-+#include
-+#include FT_FREETYPE_H
- #include
- #include
- #include
diff --git a/media-libs/mlt/mlt-0.9.0.ebuild b/media-libs/mlt/mlt-0.9.0.ebuild
deleted file mode 100644
index dc15e01..000
--- a/media-libs/mlt/mlt-0.9.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_DEPEND="python? 2:2.6"
-inherit eutils toolchain-funcs multilib python
-
-DESCRIPTION="An open source multimedia framework, designed and developed for
television broadcasting"
-HOMEPAGE="http://www.mltframework.org/";
-SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libav
libsamplerate melt
-cpu_flags_x86_mmx qt4 quicktime rtaudio sdl cpu_flags_x86_sse
cpu_flags_x86_sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl
-IUSE="${IUSE} kernel_linux"
-
-#rtaudio will use OSS on non linux OSes
-RDEPEND="
- ffmpeg? (
- libav? ( media-video/libav:0=[vdpau?] )
- !libav? ( media-video/ffmpeg:0=[vdpau?] )
- )
- dv? ( >=media-libs/libdv-0.104 )
- xml? ( >=dev-libs/libxml2-2.5 )
- vorbis? ( >=media-libs/libvorbis-1.1.2 )
- sdl? ( >=media-libs/libsdl-1.2.10[X,opengl]
->=media-libs/sdl-image-1.2.4 )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
commit: d889cb0f7a1dbda62e132c2eba19215f4209d8d9
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Aug 19 14:18:48 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Aug 19 14:19:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d889cb0f
media-libs/mlt: version bump
Gentoo-bug: 517640
Package-Manager: portage-2.2.20.1
media-libs/mlt/Manifest| 1 +
media-libs/mlt/files/mlt-0.9.8-ruby-link.patch | 20 +++
media-libs/mlt/mlt-0.9.8.ebuild| 192 +
3 files changed, 213 insertions(+)
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 09ba865..405dcd6 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,3 +1,4 @@
DIST mlt-0.8.2.tar.gz 1161293 SHA256
36c743d2abc68ce737ac526507fc2caf71b3d6a53a2bf31d22e8193a8b899577 SHA512
ab71018e5a188b95d91b4aceeb4ca0dfc59d0dd981ec3e4fa220b91ce812e2c98ebad1d51998005c6bc98999c7478444c8bfd398d61bd2084ff732a1638ca6aa
WHIRLPOOL
4d72efbffd2f7c77041065c948c18ccbb4a65eb7f4ec7209ccde15e142fee84c70324390bc921c0302c30ad7673336c8cf00be8c710154fe31c8a3063987622b
DIST mlt-0.8.8.tar.gz 1108652 SHA256
cc0e1cdb97a1cd59811a74553b5d3fbff590eb859c475253e188de1069ff9654 SHA512
d29d982632dec14e4397db602688816e06f095b1831514a816bc7640d574a04d3d56cc16240ea0a01229887e95c80891b87c5df981063cb2d6a14b50ff67589f
WHIRLPOOL
6e5665e5b4c9471d252faea7073cfd21580e31b55941ba51a415783d79bec3d857fcd01f111da25e24551a3f03a728390e17ab9b127e1bd0977bac94c83162a5
DIST mlt-0.9.0.tar.gz 1167943 SHA256
f20c6a9c9acaed3da84c601bf9293b2d148168386e5be2bc55651a75f95c1cc9 SHA512
631ab41ee6e3673c712f784b9c02b567a5e3b982d49eabe032ef20e89be9424cf9ce6d97fe6906f03b0ac082544316ba8524ae041d017aeac009ab9b98d457d9
WHIRLPOOL
b39e78837f2f2785721315ac174d106e33bafd2dd55b8883b254a39dc98f664be29ce3e84413d2ba55f881bb42ca10c36a9117de00b1a5efc3dff8577a6a29af
+DIST mlt-0.9.8.tar.gz 1263364 SHA256
1214d6ad7fd1c3d36f0b1e64fd1c8d8a7ab6290e8452396003e79d58c0d21074 SHA512
2f3db19cbff8bdd11c53fe835fcc1c32d775ead061b2e225466376be98c622cdd18e67f66becda503a57725ac9a296bc48aae4c3aeed09ba878f61fd1e10
WHIRLPOOL
6153236139ea80f8d6727a05129a9dc32097a8c2bf41cb818843fa8d47885744c1534fd7d26817262f60404e4caa12ea67ae9b3f59984874981865ee9148
diff --git a/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
b/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
new file mode 100755
index 000..3dd319a
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.9.8-ruby-link.patch
@@ -0,0 +1,20 @@
+The build system tries to link to installed system libraries first, which
+fails because the ABI has changed...
+
+--- swig/ruby/build
swig/ruby/build
+@@ -0,0 +1,14 @@
++#!/usr/bin/env ruby
++require 'mkmf'
++if ARGV.shift == 'clean'
++ system( "rm -f *.cxx *.so *.o mlt.i ../.ruby Makefile" )
++ exit 0
++end
++system( "ln -sf ../mlt.i" )
++system( "ln -sf ../../framework/libmlt.so" )
++system( "ln -sf ../../mlt++/libmlt++.so" )
++system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
++$CFLAGS += " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
++$LIBS += " -lmlt++ -lmlt -lstdc++"
++create_makefile('mlt')
++system( "make" )
diff --git a/media-libs/mlt/mlt-0.9.8.ebuild b/media-libs/mlt/mlt-0.9.8.ebuild
new file mode 100644
index 000..410643c
--- /dev/null
+++ b/media-libs/mlt/mlt-0.9.8.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_DEPEND="python? 2:2.6"
+inherit eutils toolchain-funcs multilib python
+
+DESCRIPTION="An open source multimedia framework, designed and developed for
television broadcasting"
+HOMEPAGE="http://www.mltframework.org/";
+SRC_URI="https://github.com/mltframework/mlt/archive/v0.9.8.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas dv debug ffmpeg fftw frei0r gtk jack kde kdenlive libav
libsamplerate melt opengl
+cpu_flags_x86_mmx qt4 quicktime rtaudio sdl cpu_flags_x86_sse
cpu_flags_x86_sse2 xine xml lua python ruby vdpau" # java perl php tcl
+IUSE="${IUSE} kernel_linux"
+
+#rtaudio will use OSS on non linux OSes
+RDEPEND="
+ ffmpeg? (
+ libav? ( media-video/libav:0=[vdpau?] )
+ !libav? ( media-video/ffmpeg:0=[vdpau?] )
+ )
+ dv? ( >=media-libs/libdv-0.104 )
+ xml? ( >=dev-libs/libxml2-2.5 )
+ sdl? ( >=media-libs/libsdl-1.2.10[X,opengl]
+>=media-libs/sdl-image-1.2.4 )
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.121.3
+ media-libs/ladspa-sdk
+ >=dev-libs/libxml2-2.5 )
+ fftw? ( sci-libs/fftw:3.0= )
+ frei0r? ( media-plugins/frei0r-plugins )
+ gtk? ( x11-libs/gtk+:2
+ media-libs/libexif
+ x11-libs/pango )
+ opengl? ( media-video/movit
