Date: Wednesday, January 26, 2022 @ 20:55:27 Author: arojas Revision: 1116191
archrelease: copy trunk to community-staging-x86_64 Added: tupitube/repos/community-staging-x86_64/ tupitube/repos/community-staging-x86_64/PKGBUILD (from rev 1116190, tupitube/trunk/PKGBUILD) tupitube/repos/community-staging-x86_64/ffmpeg5.patch (from rev 1116190, tupitube/trunk/ffmpeg5.patch) tupitube/repos/community-staging-x86_64/tupitube.appdata.xml (from rev 1116190, tupitube/trunk/tupitube.appdata.xml) ----------------------+ PKGBUILD | 44 +++++++++++++++++++++++++++++++++ ffmpeg5.patch | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ tupitube.appdata.xml | 28 +++++++++++++++++++++ 3 files changed, 137 insertions(+) Copied: tupitube/repos/community-staging-x86_64/PKGBUILD (from rev 1116190, tupitube/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2022-01-26 20:55:27 UTC (rev 1116191) @@ -0,0 +1,44 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Ninez <triplesquarednine AT gmail DOT com> +# Contributor: N30N <archli...@alunamation.com> +# Contributor: sekret +# Contributor: SanskritFritz + +pkgname=tupitube +pkgver=0.2.18 +pkgrel=2 +pkgdesc='Design and authoring tool for digital artists interested in 2D animation' +arch=('x86_64') +url='https://tupitube.com/' +license=('GPL2') +depends=('ffmpeg' 'qt5-multimedia' 'qt5-svg' 'quazip') +makedepends=('ruby-rexml') +replaces=('tupitube.desk') +source=("https://downloads.sourceforge.net/tupi2d/$pkgname.desk-$pkgver.tar.gz" + 'tupitube.appdata.xml' + 'ffmpeg5.patch') +sha256sums=('b765e39426531c383cc88cda62c5331efe5f965d02ec079e55eddd077749a4aa' + '99fbafe0b359130d53278db3cada052f8245c325dcb82ce33997322dd750707a' + 'b08c12db5f9c66128f31c398ae5a50d96b4fdfd895b47c62fe0d3dab9325f45a') + +prepare() { + cd $pkgname.desk + sed -i 's|quazip/|QuaZip-Qt5-1.2/quazip/|' configure.tests/quazip/main.cpp src/libtupi/tuppackagehandler.cpp + sed -i 's|quazip-qt5|quazip1-qt5|' qonf/test.rb + sed -i 's|/share/pixmaps|/share/icons/hicolor/128x128/apps|' qonf/makefile.rb + sed -i '/require .os/d' qonf/configure.rb + + patch -p1 -i ../ffmpeg5.patch # Fix build with FFmpeg 5 +} + +build() { + cd $pkgname.desk + ./configure --prefix=/usr --libdir=/usr/lib --without-debug + make +} + +package() { + cd $pkgname.desk + make DESTDIR="$pkgdir" install + install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" +} Copied: tupitube/repos/community-staging-x86_64/ffmpeg5.patch (from rev 1116190, tupitube/trunk/ffmpeg5.patch) =================================================================== --- community-staging-x86_64/ffmpeg5.patch (rev 0) +++ community-staging-x86_64/ffmpeg5.patch 2022-01-26 20:55:27 UTC (rev 1116191) @@ -0,0 +1,65 @@ +diff --git a/configure.tests/ffmpeg/main.cpp b/configure.tests/ffmpeg/main.cpp +index 907500d3..42d2eda9 100644 +--- a/configure.tests/ffmpeg/main.cpp ++++ b/configure.tests/ffmpeg/main.cpp +@@ -43,7 +43,7 @@ extern "C" { + + int main() + { +- AVOutputFormat *format = av_guess_format("ffh264", NULL, NULL); ++ const AVOutputFormat *format = av_guess_format("ffh264", NULL, NULL); + + AVFormatContext *formatContext = avformat_alloc_context(); + formatContext->oformat = format; +@@ -53,7 +53,7 @@ int main() + + stream = avformat_new_stream(formatContext, 0); + +- AVCodec *codec = avcodec_find_encoder(stream->codecpar->codec_id); ++ const AVCodec *codec = avcodec_find_encoder(stream->codecpar->codec_id); + if (!codec) { + av_log(NULL, AV_LOG_ERROR, "Failed to find decoder for stream\n"); + return AVERROR_DECODER_NOT_FOUND; +diff --git a/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp b/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp +index 2ecd5e79..52bd604b 100644 +--- a/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp ++++ b/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.cpp +@@ -40,6 +40,7 @@ + #include "talgorithm.h" + + #include <QDir> ++#include <QDebug> + #include <QTimer> + + // Handy documentation about Libav library +@@ -213,7 +214,6 @@ AVStream * TFFmpegMovieGenerator::addVideoStream() + return nullptr; + } + +- /* SQA: Code pending for review + codecContext = avcodec_alloc_context3(codec); + if (!codecContext) { + qDebug() << "Could not allocate video codec context"; +@@ -223,9 +223,6 @@ AVStream * TFFmpegMovieGenerator::addVideoStream() + qDebug() << "Could not copy parameters to context"; + return nullptr; + } +- */ +- +- codecContext = st->codec; + + // Put sample parameters + codecContext->bit_rate = 6000000; +diff --git a/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h b/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h +index 257994c2..7bc60251 100644 +--- a/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h ++++ b/src/plugins/export/ffmpegplugin/tffmpegmoviegenerator.h +@@ -92,7 +92,7 @@ class TUPITUBE_PLUGIN TFFmpegMovieGenerator : public TMovieGenerator + AVFrame *videoFrame; + AVStream *video_st; + AVFormatContext *formatContext; +- AVOutputFormat *outputFormat; ++ const AVOutputFormat *outputFormat; + AVCodecContext *codecContext; + enum AVCodecID videoCodecID; + const AVCodec *codec; Copied: tupitube/repos/community-staging-x86_64/tupitube.appdata.xml (from rev 1116190, tupitube/trunk/tupitube.appdata.xml) =================================================================== --- community-staging-x86_64/tupitube.appdata.xml (rev 0) +++ community-staging-x86_64/tupitube.appdata.xml 2022-01-26 20:55:27 UTC (rev 1116191) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>com.maefloresta.tupitube</id> + <launchable type="desktop-id">tupitube.desktop</launchable> + <name>TupiTube Desk</name> + <summary>2D Animation Toolkit</summary> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> + <description> + <p>TupiTube Desk is a 2D animation tool for desktop environments focused on usability for children and amateur artists.</p> + </description> + <screenshots> + <screenshot type="default"> + <image>https://a.fsdn.com/con/app/proj/tupi2d/screenshots/screen01_en.png</image> + </screenshot> + <screenshot> + <image>https://a.fsdn.com/con/app/proj/tupi2d/screenshots/screen02_en.png</image> + </screenshot> + <screenshot> + <image>https://a.fsdn.com/con/app/proj/tupi2d/screenshots/screen03_en.png</image> + </screenshot> + <screenshot> + <image>https://a.fsdn.com/con/app/proj/tupi2d/screenshots/tweening-en.png</image> + </screenshot> + </screenshots> + <url type="bugtracker">https://github.com/xtingray/tupitube.desk/issues</url> + <url type="homepage">https://www.maefloresta.com/</url> +</component>