mlt6 new package

This commit is contained in:
Rmys
2021-10-28 13:08:54 +03:00
parent d0a75c6e3e
commit a9b2947c7c
10 changed files with 1316 additions and 279 deletions
+9 -2
View File
@@ -27,13 +27,13 @@
<Package>
<Name>flowblade</Name>
<RuntimeDependencies>
<Dependency>mlt</Dependency>
<Dependency>mlt6</Dependency>
<Dependency>gmic</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>ffmpeg</Dependency>
<Dependency>python3</Dependency>
<Dependency>librsvg</Dependency>
<Dependency>python-mlt</Dependency>
<Dependency>python-mlt6</Dependency>
<Dependency>dbus-python3</Dependency>
<Dependency>frei0r-plugins</Dependency>
<Dependency>python3-numpy</Dependency>
@@ -51,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2021-10-28</Date>
<Version>2.8.0.3</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2021-10-25</Date>
<Version>2.8.0.3</Version>
+61
View File
@@ -0,0 +1,61 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import cmaketools
from pisi.actionsapi import get
def setup():
shelltools.export("LDFLAGS", get.LDFLAGS())
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DMOD_OPENCV=ON \
-DMOD_GTK2=OFF \
-DMOD_RTAUDIO=OFF \
-DSWIG_PYTHON=ON", sourceDir="..")
#autotools.configure("--enable-gpl \
#--enable-gpl3 \
#--disable-gtk2 \
#--qt-libdir=/usr/lib/ \
#--qt-includedir=/usr/include/qt5 \
#--avformat-vdpau \
#--avformat-swscale")
# Enable bindings
#shelltools.echo("%s/src/swig/config.mak" % get.curDIR(), "SUBDIRS = perl python")
def build():
shelltools.cd("build")
cmaketools.make()
#cmaketools.make("-C src/swig")
#autotools.make()
#autotools.make("-C src/swig")
def install():
shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.rename("/usr/bin/melt", "melt6")
#autotools.rawInstall("DESTDIR=%s" % get.installDIR())
# We should manually install the bindings :(
#pisitools.insinto("/usr/lib/%s/site-packages/" % get.curPYTHON(), "src/swig/python/mlt.py")
#pisitools.dolib("src/swig/python/_mlt.so", "/usr/lib/%s/site-packages/" % get.curPYTHON())
#pisitools.insinto("/usr/lib/perl5/vendor_perl/%s/" % get.curPERL(), "src/swig/perl/blib/lib/mlt.pm")
#pisitools.dolib("src/swig/perl/blib/arch/auto/mlt/mlt.so", "/usr/lib/perl5/vendor_perl/%s/i686-linux-thread-multi/auto/mlt/" % get.curPERL())
shelltools.cd("..")
pisitools.dodoc("COPYING", "GPL*", "README*")
+50
View File
@@ -0,0 +1,50 @@
From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001
From: Dan Dennedy <dan@dennedy.org>
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 != 90000)) {
+ 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") == 90000
- && 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 90000 fps, which is not seekable.
- if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 90000 && frame_rate.den == 1 )
+ // Cover art is a single image at 90000 fps, which is not seekable.
+ if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC)
self->video_seekable = 0;
// Set the YUV colorspace from override or detect
+19
View File
@@ -0,0 +1,19 @@
From a87229bcea6242da2a0b923ad11dffd37d44098f Mon Sep 17 00:00:00 2001
From: j-b-m <jb@kdenlive.org>
Date: Fri, 14 May 2021 08:08:25 +0200
Subject: [PATCH] Backport vid.stab metadata fix
---
src/modules/vid.stab/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/vid.stab/CMakeLists.txt b/src/modules/vid.stab/CMakeLists.txt
index f3f2fec8a..3fce11663 100644
--- a/src/modules/vid.stab/CMakeLists.txt
+++ b/src/modules/vid.stab/CMakeLists.txt
@@ -12,4 +12,4 @@ set_target_properties(mltvidstab PROPERTIES LIBRARY_OUTPUT_DIRECTORY ..)
install(TARGETS mltvidstab LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
-install(FILES filter_deshake.yml filter_vidstab.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/vidstab)
+install(FILES filter_deshake.yml filter_vidstab.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/vid.stab)
+126
View File
@@ -0,0 +1,126 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>mlt6</Name>
<Homepage>https://www.mltframework.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2.1</License>
<IsA>app:console</IsA>
<Summary>A multimedia framework, designed and developed for television broadcasting</Summary>
<Description>MLT is an open source multimedia framework, designed and developed for television broadcasting.</Description>
<Archive sha1sum="1540b23483cf9c741795321404dac2446d517366" type="targz">https://github.com/mltframework/mlt/releases/download/v6.26.1/mlt-6.26.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>swig</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>opencv-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>frei0r-plugins-devel</Dependency>
<Dependency>fftw3-devel</Dependency>
<Dependency>jack-audio-connection-kit-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-svg-devel</Dependency>
<Dependency>perl</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>libsamplerate-devel</Dependency>
<Dependency>ladspa-sdk-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>sdl-image-devel</Dependency>
<Dependency>libexif-devel</Dependency>
<!-- <Dependency>swfdec-devel</Dependency> -->
<Dependency>libsdl2-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>libdv-devel</Dependency>
<Dependency>sox-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">7063e88e.patch</Patch>
<Patch level="1">a87229bc.patch</Patch>
</Patches>
</Source>
<Package>
<Name>python-mlt6</Name>
<PartOf>programming.language.python</PartOf>
<Summary>Python bindings for MLT</Summary>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>python3</Dependency>
<Dependency release="current">mlt6</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python*</Path>
</Files>
</Package>
<Package>
<Name>mlt6</Name>
<RuntimeDependencies>
<Dependency>sox</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>fftw3</Dependency>
<Dependency>pango</Dependency>
<Dependency>glib2</Dependency>
<Dependency>opencv</Dependency>
<Dependency>ffmpeg</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libsdl</Dependency>
<Dependency>libsdl2</Dependency>
<Dependency>libexif</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>qt5-svg</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>libvorbis</Dependency>
<Dependency>sdl-image</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>libsamplerate</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/mlt</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/mlt/modules</Path>
<Path fileType="data">/usr/share/mlt/modules/lumas/PAL</Path>
</Files>
</Package>
<Package>
<Name>mlt6-devel</Name>
<Summary>Development files for mlt</Summary>
<RuntimeDependencies>
<Dependency release="current">mlt6</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="man">/usr/share/man/man3</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-08-31</Date>
<Version>6.26.1</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>mlt</Name>
<Summary xml:lang="tr">Televizyon yayını için tasarlanmış bir çoklu ortam altyapısı</Summary>
<Description xml:lang="tr">MLT televizyon yayını için tasarlanmış, açık kaynak kodlu bir çoklu ortam alyapısıdır.</Description>
</Source>
<Package>
<Name>perl-mlt</Name>
<Summary xml:lang="tr">MLT için Perl bağlayıcıları</Summary>
</Package>
<Package>
<Name>python-mlt</Name>
<Summary xml:lang="tr">MLT için Python bağlayıcıları</Summary>
</Package>
<Package>
<Name>mlt-devel</Name>
<Summary xml:lang="tr">mlt için geliştirme dosyaları</Summary>
</Package>
</PISI>
+1026 -275
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
bec2fa7bfac768817bd3d5983a9f86f69252c728
8cd62828d0dbdda7c799815b856dfbceff5b25fe
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
9fafd84a3b57cebe66f51c33accfcd255727302d
94dc93b9f56d1f446f10fd3db169ba302e616b4b