Update to 0.2.1

CLI11 is also noted as an external dependency now.
    Patching meson build dependencies as well as logPacket function from last update
This commit is contained in:
RealStickman 2022-09-25 17:09:08 +02:00
parent 9015bea543
commit 19c3658304
4 changed files with 60 additions and 17 deletions

View File

@ -1,18 +1,23 @@
pkgbase = vivictpp
pkgdesc = An easy to use tool for subjective comparison of the visual quality of different encodings of the same video source.
pkgver = 0.2.0
pkgrel = 2
pkgver = 0.2.1
pkgrel = 1
url = https://github.com/svt/vivictpp
arch = x86_64
license = GPL2
makedepends = meson
depends = ffmpeg
depends = sdl2
depends = sdl2_ttf
depends = ffmpeg
depends = cli11
depends = fmt
provides = vivictpp
conflicts = vivictpp
source = https://github.com/svt/vivictpp/archive/refs/tags/v0.2.0.zip
source = https://github.com/svt/vivictpp/archive/refs/tags/v0.2.1.zip
source = disable-logPacket.patch
sha256sums = 348b213245d0d29b71a600f7b75ea3f0c487836dfb423f954e0ac3cce3cbad58
sha256sums = 208f4c60aa94c85fa18bb6e532c2c983462f4e17cf04fe371f1def0275c09636
source = dependencies-meson.build.patch
sha256sums = eb99feb8757a82c7b291d1ade4e152487a6fbb838fa765f444f4c6ae1fb86143
sha256sums = fe42b5a7ff5f13eb221ef4eba1dbfcf82f9b64e109a120b6c6774c1a6e5fb801
sha256sums = 7d44b7db491739589ce2e93be3a2fadf728de9fd3ae703ba9067b029725838c4
pkgname = vivictpp

View File

@ -2,25 +2,31 @@
pkgname=vivictpp
pkgdesc='An easy to use tool for subjective comparison of the visual quality of different encodings of the same video source.'
pkgver=0.2.0
pkgver=0.2.1
# Uncomment for releases with hyphens
# _pkgver=$(echo "$pkgver" | tr '~' -)
pkgrel=2
pkgrel=1
arch=('x86_64')
url='https://github.com/svt/vivictpp'
license=('GPL2')
depends=('ffmpeg'
'sdl2_ttf')
depends=('sdl2'
'sdl2_ttf'
'ffmpeg'
'cli11'
'fmt')
makedepends=('meson')
provides=("${pkgname}")
conflicts=("${pkgname}")
source=("https://github.com/svt/vivictpp/archive/refs/tags/v${pkgver}.zip"
"disable-logPacket.patch")
sha256sums=('348b213245d0d29b71a600f7b75ea3f0c487836dfb423f954e0ac3cce3cbad58'
'208f4c60aa94c85fa18bb6e532c2c983462f4e17cf04fe371f1def0275c09636')
"disable-logPacket.patch"
"dependencies-meson.build.patch")
sha256sums=('eb99feb8757a82c7b291d1ade4e152487a6fbb838fa765f444f4c6ae1fb86143'
'fe42b5a7ff5f13eb221ef4eba1dbfcf82f9b64e109a120b6c6774c1a6e5fb801'
'7d44b7db491739589ce2e93be3a2fadf728de9fd3ae703ba9067b029725838c4')
prepare() {
patch --directory="${pkgname}-${pkgver}" --forward --strip=1 --input="${srcdir}/disable-logPacket.patch"
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() {

View File

@ -0,0 +1,32 @@
diff '--color=auto' --unified --recursive --text src/vivictpp-0.2.1/meson.build src/vivictpp-patched/meson.build
--- src/vivictpp-0.2.1/meson.build 2022-09-23 21:30:04.000000000 +0200
+++ src/vivictpp-patched/meson.build 2022-09-25 17:05:05.575896816 +0200
@@ -8,15 +8,11 @@
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'),
@@ -25,8 +21,8 @@
dependency('libavfilter'),
dependency('libswscale'),
spdlog_proj.get_variable('spdlog_dep'),
- cli11_proj.get_variable('CLI11_dep'),
- fmt_proj.get_variable('fmt_dep')
+ dependency('CLI11'),
+ dependency('fmt')
]
test_deps = [

View File

@ -1,6 +1,6 @@
diff '--color=auto' --unified --recursive --text vivictpp-0.2.0/src/workers/DecoderWorker.cc vivictpp-0.2.0.new/src/workers/DecoderWorker.cc
--- vivictpp-0.2.0/src/workers/DecoderWorker.cc 2022-08-20 14:09:56.000000000 +0200
+++ vivictpp-0.2.0.new/src/workers/DecoderWorker.cc 2022-09-25 16:10:15.818620765 +0200
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"));
}