Update to 0.2.3

Due to upstream changes, the previously included patches are not
    necessary anymore.
    Some dependencies could also be removed again.

Update dependencies

Readd sdl2_ttf dependency

Updated dependencies

Modify dependencies
This commit is contained in:
RealStickman 2022-10-17 13:26:39 +02:00
parent 07ffdb61d2
commit bd4927c9b8
4 changed files with 11 additions and 103 deletions

View File

@ -1,26 +1,17 @@
pkgbase = vivictpp pkgbase = vivictpp
pkgdesc = An easy to use tool for subjective comparison of the visual quality of different encodings of the same video source. pkgdesc = An easy to use tool for subjective comparison of the visual quality of different encodings of the same video source.
pkgver = 0.2.1 pkgver = 0.2.3
pkgrel = 1 pkgrel = 1
url = https://github.com/svt/vivictpp url = https://github.com/svt/vivictpp
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = cmake
makedepends = meson makedepends = meson
depends = cmake
depends = sdl2
depends = sdl2_ttf depends = sdl2_ttf
depends = ffmpeg depends = ffmpeg
depends = spdlog
depends = cli11
depends = fmt
depends = catch2
provides = vivictpp provides = vivictpp
conflicts = vivictpp conflicts = vivictpp
source = https://github.com/svt/vivictpp/archive/refs/tags/v0.2.1.zip source = https://github.com/svt/vivictpp/archive/refs/tags/v0.2.3.zip
source = disable-logPacket.patch sha256sums = 1b00feca8f2d699092ab3d8e068062d4cf081b7006801e8b1aa37ff94681cd27
source = dependencies-meson.build.patch
sha256sums = eb99feb8757a82c7b291d1ade4e152487a6fbb838fa765f444f4c6ae1fb86143
sha256sums = fe42b5a7ff5f13eb221ef4eba1dbfcf82f9b64e109a120b6c6774c1a6e5fb801
sha256sums = 3cb4a2368b197126456891934851eb98d982adc38dbfc395da37a323f342da4e
pkgname = vivictpp pkgname = vivictpp

View File

@ -2,35 +2,21 @@
pkgname=vivictpp pkgname=vivictpp
pkgdesc='An easy to use tool for subjective comparison of the visual quality of different encodings of the same video source.' pkgdesc='An easy to use tool for subjective comparison of the visual quality of different encodings of the same video source.'
pkgver=0.2.1 pkgver=0.2.3
# Uncomment for releases with hyphens # Uncomment for releases with hyphens
# _pkgver=$(echo "$pkgver" | tr '~' -) # _pkgver=$(echo "$pkgver" | tr '~' -)
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
url='https://github.com/svt/vivictpp' url='https://github.com/svt/vivictpp'
license=('GPL2') license=('GPL2')
depends=('cmake' depends=('sdl2_ttf'
'sdl2' 'ffmpeg')
'sdl2_ttf' makedepends=('cmake'
'ffmpeg' 'meson')
'spdlog'
'cli11'
'fmt'
'catch2')
makedepends=('meson')
provides=("${pkgname}") provides=("${pkgname}")
conflicts=("${pkgname}") conflicts=("${pkgname}")
source=("https://github.com/svt/vivictpp/archive/refs/tags/v${pkgver}.zip" source=("https://github.com/svt/vivictpp/archive/refs/tags/v${pkgver}.zip")
"disable-logPacket.patch" sha256sums=('1b00feca8f2d699092ab3d8e068062d4cf081b7006801e8b1aa37ff94681cd27')
"dependencies-meson.build.patch")
sha256sums=('eb99feb8757a82c7b291d1ade4e152487a6fbb838fa765f444f4c6ae1fb86143'
'fe42b5a7ff5f13eb221ef4eba1dbfcf82f9b64e109a120b6c6774c1a6e5fb801'
'3cb4a2368b197126456891934851eb98d982adc38dbfc395da37a323f342da4e')
prepare() {
patch --directory="${pkgname}-${pkgver}" --forward --strip=2 --input="${srcdir}/disable-logPacket.patch"
patch --directory="${pkgname}-${pkgver}" --forward --strip=2 --input="${srcdir}/dependencies-meson.build.patch"
}
build() { build() {
meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir" meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir"

View File

@ -1,41 +0,0 @@
diff '--color=auto' --unified --recursive --text src/vivictpp-original/meson.build src/vivictpp-0.2.1/meson.build
--- src/vivictpp-original/meson.build 2022-09-23 21:30:04.000000000 +0200
+++ src/vivictpp-0.2.1/meson.build 2022-09-25 17:28:50.765608946 +0200
@@ -7,16 +7,10 @@
#endif
-spdlog_proj = subproject('spdlog', default_options: 'warning_level=0')
-cli11_proj = subproject('cli11', default_options: 'warning_level=0')
-catch2_proj = subproject('catch2', default_options: 'warning_level=0')
-fmt_proj = subproject('fmt', default_options: 'warning_level=0')
-sdl2_proj = subproject('sdl2', default_options: ['warning_level=0', 'test=false'])
-sdl2_ttf_proj = subproject('sdl2_ttf', default_options: 'warning_level=0')
deps = [
- sdl2_proj.get_variable('sdl2_dep'),
- sdl2_ttf_proj.get_variable('sdl2_ttf_dep'),
+ dependency('sdl2'),
+ dependency('sdl2_ttf'),
dependency('freetype2', version: '>=2.8.1'),
dependency('threads'),
dependency('libavformat'),
@@ -24,13 +18,13 @@
dependency('libavutil'),
dependency('libavfilter'),
dependency('libswscale'),
- spdlog_proj.get_variable('spdlog_dep'),
- cli11_proj.get_variable('CLI11_dep'),
- fmt_proj.get_variable('fmt_dep')
+ dependency('spdlog'),
+ dependency('CLI11'),
+ dependency('fmt')
]
test_deps = [
- catch2_proj.get_variable('catch2_dep')
+ dependency('catch2')
]
incdir = include_directories('include')
Nur in src/vivictpp-0.2.1/: meson.build.orig.

View File

@ -1,28 +0,0 @@
diff '--color=auto' --unified --recursive --text src/vivictpp.original/src/workers/DecoderWorker.cc src/vivictpp-0.2.1/src/workers/DecoderWorker.cc
--- src/vivictpp.original/src/workers/DecoderWorker.cc 2022-09-23 21:30:04.000000000 +0200
+++ src/vivictpp-0.2.1/src/workers/DecoderWorker.cc 2022-09-25 16:56:29.112970013 +0200
@@ -59,6 +59,7 @@
}, "seek"));
}
+/*
void logPacket(vivictpp::libav::Packet pkt, const std::shared_ptr<spdlog::logger> &logger) {
AVPacket *packet = pkt.avPacket();
if (packet) {
@@ -67,6 +68,7 @@
logger->trace("Packet: nullptr");
}
}
+*/
void vivictpp::workers::DecoderWorker::doWork() {
logger->trace("vivictpp::workers::DecoderWorker::doWork");
@@ -88,7 +90,7 @@
// TODO: check filter.eof
vivictpp::libav::Packet packet = *(data.data);
- logPacket(packet, logger);
+ //logPacket(packet, logger);
std::vector<vivictpp::libav::Frame> frames = decoder->handlePacket(packet.avPacket());
for (auto frame : frames) {
dropFrameIfSeekingAndBufferFull();