From a525ce15297d696a415700dc103f0b65027b8ddf Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Fri, 19 May 2023 14:49:55 +0200
Subject: [PATCH] Update to v0.3.1

    This update includes two patchfiles again.
    VideoInputMessage.patch is required to build the program without
    errors.
    meson_build.patch makes freetype2 and zlib external dependencies.
    Otherwise system packages might be overwritten.
---
 .SRCINFO                | 12 +++++++++---
 PKGBUILD                | 21 +++++++++++++++++----
 VideoInputMessage.patch | 11 +++++++++++
 meson_build.patch       | 24 ++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 VideoInputMessage.patch
 create mode 100644 meson_build.patch

diff --git a/.SRCINFO b/.SRCINFO
index a7888e2..b97dde1 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.2.4
+	pkgver = 0.3.1
 	pkgrel = 1
 	url = https://github.com/vivictorg/vivictpp
 	arch = x86_64
@@ -9,9 +9,15 @@ pkgbase = vivictpp
 	makedepends = meson
 	depends = sdl2_ttf
 	depends = ffmpeg
+	depends = freetype2
+	depends = zlib
 	provides = vivictpp
 	conflicts = vivictpp
-	source = https://github.com/vivictorg/vivictpp/archive/refs/tags/v0.2.4.zip
-	sha256sums = c05fdec2936c7e0b0d2c3447ffe700835abad359b6064cac60a524472b14d97c
+	source = https://github.com/vivictorg/vivictpp/archive/refs/tags/v0.3.1.zip
+	source = meson_build.patch
+	source = VideoInputMessage.patch
+	sha256sums = 8706f0911747729b33afc5c7845cae2044b8030bc33473cb57af9f2c083d3631
+	sha256sums = 51766406570144fac60b77ae9adc7ba459775c02482d1cde85db50e73bb8366c
+	sha256sums = d9cee025ae4ccc65c3fac77b68922336bef00fa0f1b0de98e3e398ef74afa0ca
 
 pkgname = vivictpp
diff --git a/PKGBUILD b/PKGBUILD
index 81a1aa9..33da93f 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.2.4
+pkgver=0.3.1
 # Uncomment for releases with hyphens
 # _pkgver=$(echo "$pkgver" | tr '~' -)
 pkgrel=1
@@ -10,13 +10,26 @@ arch=('x86_64')
 url='https://github.com/vivictorg/vivictpp'
 license=('GPL2')
 depends=('sdl2_ttf'
-         'ffmpeg')
+         'ffmpeg'
+         'freetype2'
+         'zlib')
 makedepends=('cmake'
              'meson')
 provides=("${pkgname}")
 conflicts=("${pkgname}")
-source=("https://github.com/vivictorg/vivictpp/archive/refs/tags/v${pkgver}.zip")
-sha256sums=('c05fdec2936c7e0b0d2c3447ffe700835abad359b6064cac60a524472b14d97c')
+source=("https://github.com/vivictorg/vivictpp/archive/refs/tags/v${pkgver}.zip"
+        "meson_build.patch"
+        "VideoInputMessage.patch")
+sha256sums=('8706f0911747729b33afc5c7845cae2044b8030bc33473cb57af9f2c083d3631'
+            '51766406570144fac60b77ae9adc7ba459775c02482d1cde85db50e73bb8366c'
+            'd9cee025ae4ccc65c3fac77b68922336bef00fa0f1b0de98e3e398ef74afa0ca')
+
+prepare() {
+    # patching
+    cd "$srcdir/$pkgname-$pkgver"
+    patch --strip=2 < ../../meson_build.patch
+    patch --strip=2 < ../../VideoInputMessage.patch
+}
 
 build() {
     meson --prefix=/usr --buildtype=plain "$srcdir/${pkgname}-${pkgver}" "builddir"
diff --git a/VideoInputMessage.patch b/VideoInputMessage.patch
new file mode 100644
index 0000000..8e7353d
--- /dev/null
+++ b/VideoInputMessage.patch
@@ -0,0 +1,11 @@
+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 <atomic>
+ #include <condition_variable>
+ #include <functional>
++#include <stdexcept>
+ 
+ namespace vivictpp {
+ namespace workers {
diff --git a/meson_build.patch b/meson_build.patch
new file mode 100644
index 0000000..58ea2c4
--- /dev/null
+++ b/meson_build.patch
@@ -0,0 +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
+@@ -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')
+ 
+ if build_machine.system() == 'windows'
+ 
+@@ -61,9 +59,8 @@
+ deps = [
+   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'),
+   dependency('threads'),
+   libavformat_dep,
+   libavcodec_dep,