diff --git a/.SRCINFO b/.SRCINFO index b97dde1..f329659 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ 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.3.1 + pkgver = 1.0.0 pkgrel = 1 url = https://github.com/vivictorg/vivictpp arch = x86_64 @@ -13,11 +13,9 @@ pkgbase = vivictpp depends = zlib provides = vivictpp conflicts = vivictpp - source = https://github.com/vivictorg/vivictpp/archive/refs/tags/v0.3.1.zip + source = https://github.com/vivictorg/vivictpp/archive/refs/tags/v1.0.0.zip source = meson_build.patch - source = VideoInputMessage.patch - sha256sums = 8706f0911747729b33afc5c7845cae2044b8030bc33473cb57af9f2c083d3631 - sha256sums = 51766406570144fac60b77ae9adc7ba459775c02482d1cde85db50e73bb8366c - sha256sums = d9cee025ae4ccc65c3fac77b68922336bef00fa0f1b0de98e3e398ef74afa0ca + sha256sums = 869bbcd6f413152be15ed82ac39593e9ad895346e79a8c01e2b620375f28b326 + sha256sums = 37b71962eac6cff7ec4d7ecb82e514a0c34075536edaeec89956c55201952ac0 pkgname = vivictpp diff --git a/PKGBUILD b/PKGBUILD index 33da93f..44e2d22 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ 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.3.1 +pkgver=1.0.0 # Uncomment for releases with hyphens # _pkgver=$(echo "$pkgver" | tr '~' -) pkgrel=1 @@ -18,17 +18,14 @@ makedepends=('cmake' provides=("${pkgname}") conflicts=("${pkgname}") source=("https://github.com/vivictorg/vivictpp/archive/refs/tags/v${pkgver}.zip" - "meson_build.patch" - "VideoInputMessage.patch") -sha256sums=('8706f0911747729b33afc5c7845cae2044b8030bc33473cb57af9f2c083d3631' - '51766406570144fac60b77ae9adc7ba459775c02482d1cde85db50e73bb8366c' - 'd9cee025ae4ccc65c3fac77b68922336bef00fa0f1b0de98e3e398ef74afa0ca') + "meson_build.patch") +sha256sums=('869bbcd6f413152be15ed82ac39593e9ad895346e79a8c01e2b620375f28b326' + '37b71962eac6cff7ec4d7ecb82e514a0c34075536edaeec89956c55201952ac0') prepare() { # patching cd "$srcdir/$pkgname-$pkgver" patch --strip=2 < ../../meson_build.patch - patch --strip=2 < ../../VideoInputMessage.patch } build() { diff --git a/VideoInputMessage.patch b/VideoInputMessage.patch deleted file mode 100644 index 8e7353d..0000000 --- a/VideoInputMessage.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff '--color=auto' --unified --recursive --text --color src/vivictpp-0.3.1-original/include/workers/VideoInputMessage.hh src/vivictpp-0.3.1/include/workers/VideoInputMessage.hh ---- src/vivictpp-0.3.1-original/include/workers/VideoInputMessage.hh 2023-05-19 12:56:35.683822444 +0200 -+++ src/vivictpp-0.3.1/include/workers/VideoInputMessage.hh 2023-05-19 12:57:35.496794950 +0200 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - namespace vivictpp { - namespace workers { diff --git a/meson_build.patch b/meson_build.patch index 58ea2c4..94b7c97 100644 --- a/meson_build.patch +++ b/meson_build.patch @@ -1,24 +1,24 @@ -diff '--color=auto' --unified --recursive --text --color src/vivictpp-0.3.1-original/meson.build src/vivictpp-0.3.1/meson.build ---- src/vivictpp-0.3.1-original/meson.build 2023-05-19 12:56:35.674821846 +0200 -+++ src/vivictpp-0.3.1/meson.build 2023-05-19 13:14:37.148825157 +0200 +--- src/vivictpp-1.0.0/meson.build 2023-12-09 10:16:38.000000000 +0100 ++++ src/vivictpp-1.0.0-new/meson.build 2023-12-10 13:16:59.614188557 +0100 @@ -10,8 +10,6 @@ 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') --freetype2_proj = subproject('freetype2', default_options: 'warning_level=0') -zlib_proj = subproject('zlib', default_options: 'warning_level=0') +-freetype2_proj = subproject('freetype2', default_options: 'warning_level=0') + platformfolders_proj = subproject('platformfolders', default_options: 'warning_level=0') if build_machine.system() == 'windows' +@@ -60,10 +58,10 @@ + -@@ -61,9 +59,8 @@ deps = [ +- zlib_proj.get_variable('zlib_dep'), ++ dependency('zlib'), sdl2_dep, sdl2_ttf_dep, - # dependency('freetype2', version: '>=2.8.1'), -- zlib_proj.get_variable('zlib_dep'), -- # freetype2_proj.get_variable('freetype2_dep'), + dependency('freetype2', version: '>=2.8.1'), -+ dependency('zlib'), + # freetype2_proj.get_variable('freetype2_dep'), dependency('threads'), libavformat_dep, - libavcodec_dep,