Patch around package building issue for version 0.2.0

This commit is contained in:
RealStickman 2022-09-25 16:22:47 +02:00
parent 443f6726ac
commit 9015bea543
4 changed files with 41 additions and 4 deletions

View File

@ -1,7 +1,7 @@
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.0 pkgver = 0.2.0
pkgrel = 1 pkgrel = 2
url = https://github.com/svt/vivictpp url = https://github.com/svt/vivictpp
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
@ -11,6 +11,8 @@ pkgbase = vivictpp
provides = vivictpp provides = vivictpp
conflicts = 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.0.zip
source = disable-logPacket.patch
sha256sums = 348b213245d0d29b71a600f7b75ea3f0c487836dfb423f954e0ac3cce3cbad58 sha256sums = 348b213245d0d29b71a600f7b75ea3f0c487836dfb423f954e0ac3cce3cbad58
sha256sums = 208f4c60aa94c85fa18bb6e532c2c983462f4e17cf04fe371f1def0275c09636
pkgname = vivictpp pkgname = vivictpp

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
!.gitignore !.gitignore
!PKGBUILD !PKGBUILD
!.SRCINFO !.SRCINFO
!*.patch

View File

@ -5,7 +5,7 @@ pkgdesc='An easy to use tool for subjective comparison of the visual quality of
pkgver=0.2.0 pkgver=0.2.0
# Uncomment for releases with hyphens # Uncomment for releases with hyphens
# _pkgver=$(echo "$pkgver" | tr '~' -) # _pkgver=$(echo "$pkgver" | tr '~' -)
pkgrel=1 pkgrel=2
arch=('x86_64') arch=('x86_64')
url='https://github.com/svt/vivictpp' url='https://github.com/svt/vivictpp'
license=('GPL2') license=('GPL2')
@ -14,8 +14,14 @@ depends=('ffmpeg'
makedepends=('meson') 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"
sha256sums=('348b213245d0d29b71a600f7b75ea3f0c487836dfb423f954e0ac3cce3cbad58') "disable-logPacket.patch")
sha256sums=('348b213245d0d29b71a600f7b75ea3f0c487836dfb423f954e0ac3cce3cbad58'
'208f4c60aa94c85fa18bb6e532c2c983462f4e17cf04fe371f1def0275c09636')
prepare() {
patch --directory="${pkgname}-${pkgver}" --forward --strip=1 --input="${srcdir}/disable-logPacket.patch"
}
build() { build() {
meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir" meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir"

28
disable-logPacket.patch Normal file
View File

@ -0,0 +1,28 @@
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
@@ -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();