Update to 1.1.0

This commit is contained in:
exu 2024-10-17 18:56:03 +02:00
parent f5e6666eed
commit dc2771266b
3 changed files with 26 additions and 29 deletions

View File

@ -1,21 +1,22 @@
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 = 1.0.0 pkgver = 1.1.0
pkgrel = 1 pkgrel = 1
url = https://github.com/vivictorg/vivictpp url = https://github.com/vivictorg/vivictpp
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = cmake makedepends = cmake
makedepends = meson makedepends = meson
makedepends = git
depends = sdl2_ttf depends = sdl2_ttf
depends = ffmpeg depends = ffmpeg
depends = freetype2 depends = freetype2
depends = zlib depends = zlib
provides = vivictpp provides = vivictpp
conflicts = vivictpp conflicts = vivictpp
source = https://github.com/vivictorg/vivictpp/archive/refs/tags/v1.0.0.zip source = https://github.com/vivictorg/vivictpp/archive/refs/tags/v1.1.0.zip
source = meson_build.patch source = meson_build.patch
sha256sums = 869bbcd6f413152be15ed82ac39593e9ad895346e79a8c01e2b620375f28b326 sha256sums = 5825d5de534ddb479c2a1c6052e0fd7536b566c0d342dbd9d007e277c2834344
sha256sums = 37b71962eac6cff7ec4d7ecb82e514a0c34075536edaeec89956c55201952ac0 sha256sums = 72188070abc23685ac47c48bf2c3ce42232bbdf04ebc6d6092252e9b337df4ed
pkgname = vivictpp pkgname = vivictpp

View File

@ -2,7 +2,7 @@
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=1.0.0 pkgver=1.1.0
# Uncomment for releases with hyphens # Uncomment for releases with hyphens
# _pkgver=$(echo "$pkgver" | tr '~' -) # _pkgver=$(echo "$pkgver" | tr '~' -)
pkgrel=1 pkgrel=1
@ -10,29 +10,30 @@ arch=('x86_64')
url='https://github.com/vivictorg/vivictpp' url='https://github.com/vivictorg/vivictpp'
license=('GPL2') license=('GPL2')
depends=('sdl2_ttf' depends=('sdl2_ttf'
'ffmpeg' 'ffmpeg'
'freetype2' 'freetype2'
'zlib') 'zlib')
makedepends=('cmake' makedepends=('cmake'
'meson') 'meson'
'git')
provides=("${pkgname}") provides=("${pkgname}")
conflicts=("${pkgname}") conflicts=("${pkgname}")
source=("https://github.com/vivictorg/vivictpp/archive/refs/tags/v${pkgver}.zip" source=("https://github.com/vivictorg/vivictpp/archive/refs/tags/v${pkgver}.zip"
"meson_build.patch") "meson_build.patch")
sha256sums=('869bbcd6f413152be15ed82ac39593e9ad895346e79a8c01e2b620375f28b326' sha256sums=('5825d5de534ddb479c2a1c6052e0fd7536b566c0d342dbd9d007e277c2834344'
'37b71962eac6cff7ec4d7ecb82e514a0c34075536edaeec89956c55201952ac0') '72188070abc23685ac47c48bf2c3ce42232bbdf04ebc6d6092252e9b337df4ed')
prepare() { prepare() {
# patching # patching
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
patch --strip=2 < ../meson_build.patch patch --strip=1 <../meson_build.patch
} }
build() { build() {
meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir" meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir"
meson compile -C builddir meson compile -C builddir
} }
package() { package() {
meson install -C builddir --destdir "$pkgdir" meson install -C builddir --destdir "$pkgdir"
} }

View File

@ -1,20 +1,15 @@
--- src/vivictpp-1.0.0/meson.build 2023-12-09 10:16:38.000000000 +0100 --- vivictpp-1.1.0-orig/meson.build 2024-10-17 18:45:58.085075903 +0200
+++ src/vivictpp-1.0.0-new/meson.build 2023-12-10 13:16:59.614188557 +0100 +++ vivictpp-1.1.0/meson.build 2024-10-17 18:50:03.385248421 +0200
@@ -10,8 +10,6 @@ @@ -10,7 +10,6 @@
spdlog_proj = subproject('spdlog', default_options: 'warning_level=0') spdlog_proj = subproject('spdlog', default_options: 'warning_level=0')
cli11_proj = subproject('cli11', default_options: 'warning_level=0') cli11_proj = subproject('cli11', default_options: 'warning_level=0')
catch2_proj = subproject('catch2', default_options: 'warning_level=0') catch2_proj = subproject('catch2', default_options: 'warning_level=0')
-zlib_proj = subproject('zlib', default_options: 'warning_level=0')
-freetype2_proj = subproject('freetype2', default_options: 'warning_level=0') -freetype2_proj = subproject('freetype2', default_options: 'warning_level=0')
platformfolders_proj = subproject('platformfolders', default_options: 'warning_level=0') platformfolders_proj = subproject('platformfolders', default_options: 'warning_level=0')
if build_machine.system() == 'windows' if get_option('use_zlib_subproject')
@@ -60,10 +58,10 @@ @@ -69,7 +68,7 @@
zlib_dep,
deps = [
- zlib_proj.get_variable('zlib_dep'),
+ dependency('zlib'),
sdl2_dep, sdl2_dep,
sdl2_ttf_dep, sdl2_ttf_dep,
- # dependency('freetype2', version: '>=2.8.1'), - # dependency('freetype2', version: '>=2.8.1'),