From 07ffdb61d24b239b8dc55a6669faa623d677cd62 Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Sun, 25 Sep 2022 17:33:20 +0200
Subject: [PATCH] Use spdlog and catch2 from repository

---
 .SRCINFO                       |  5 ++++-
 PKGBUILD                       |  6 ++++--
 dependencies-meson.build.patch | 25 +++++++++++++++++--------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e81e7d9..631b026 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,11 +6,14 @@ pkgbase = vivictpp
 	arch = x86_64
 	license = GPL2
 	makedepends = meson
+	depends = cmake
 	depends = sdl2
 	depends = sdl2_ttf
 	depends = ffmpeg
+	depends = spdlog
 	depends = cli11
 	depends = fmt
+	depends = catch2
 	provides = vivictpp
 	conflicts = vivictpp
 	source = https://github.com/svt/vivictpp/archive/refs/tags/v0.2.1.zip
@@ -18,6 +21,6 @@ pkgbase = vivictpp
 	source = dependencies-meson.build.patch
 	sha256sums = eb99feb8757a82c7b291d1ade4e152487a6fbb838fa765f444f4c6ae1fb86143
 	sha256sums = fe42b5a7ff5f13eb221ef4eba1dbfcf82f9b64e109a120b6c6774c1a6e5fb801
-	sha256sums = 7d44b7db491739589ce2e93be3a2fadf728de9fd3ae703ba9067b029725838c4
+	sha256sums = 3cb4a2368b197126456891934851eb98d982adc38dbfc395da37a323f342da4e
 
 pkgname = vivictpp
diff --git a/PKGBUILD b/PKGBUILD
index a7ae4b0..4f85db9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,10 @@ depends=('cmake'
          'sdl2'
          'sdl2_ttf'
          'ffmpeg'
+         'spdlog'
          'cli11'
-         'fmt')
+         'fmt'
+         'catch2')
 makedepends=('meson')
 provides=("${pkgname}")
 conflicts=("${pkgname}")
@@ -23,7 +25,7 @@ source=("https://github.com/svt/vivictpp/archive/refs/tags/v${pkgver}.zip"
         "dependencies-meson.build.patch")
 sha256sums=('eb99feb8757a82c7b291d1ade4e152487a6fbb838fa765f444f4c6ae1fb86143'
             'fe42b5a7ff5f13eb221ef4eba1dbfcf82f9b64e109a120b6c6774c1a6e5fb801'
-            '7d44b7db491739589ce2e93be3a2fadf728de9fd3ae703ba9067b029725838c4')
+            '3cb4a2368b197126456891934851eb98d982adc38dbfc395da37a323f342da4e')
 
 prepare() {
     patch --directory="${pkgname}-${pkgver}" --forward --strip=2 --input="${srcdir}/disable-logPacket.patch"
diff --git a/dependencies-meson.build.patch b/dependencies-meson.build.patch
index 5202036..f6b5720 100644
--- a/dependencies-meson.build.patch
+++ b/dependencies-meson.build.patch
@@ -1,12 +1,13 @@
-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 @@
+diff '--color=auto' --unified --recursive --text src/vivictpp-original/meson.build src/vivictpp-0.2.1/meson.build
+--- src/vivictpp-original/meson.build	2022-09-23 21:30:04.000000000 +0200
++++ src/vivictpp-0.2.1/meson.build	2022-09-25 17:28:50.765608946 +0200
+@@ -7,16 +7,10 @@
+ #endif
  
    
- 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')
- catch2_proj = subproject('catch2', 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')
@@ -19,14 +20,22 @@ diff '--color=auto' --unified --recursive --text src/vivictpp-0.2.1/meson.build
    dependency('freetype2', version: '>=2.8.1'),
    dependency('threads'),
    dependency('libavformat'),
-@@ -25,8 +21,8 @@
+@@ -24,13 +18,13 @@
+   dependency('libavutil'),
    dependency('libavfilter'),
    dependency('libswscale'),
-   spdlog_proj.get_variable('spdlog_dep'),
+-  spdlog_proj.get_variable('spdlog_dep'),
 -  cli11_proj.get_variable('CLI11_dep'),
 -  fmt_proj.get_variable('fmt_dep')
++  dependency('spdlog'),
 +  dependency('CLI11'),
 +  dependency('fmt')
  ]
  
  test_deps = [
+-  catch2_proj.get_variable('catch2_dep')
++  dependency('catch2')
+ ]
+ 
+ incdir = include_directories('include')
+Nur in src/vivictpp-0.2.1/: meson.build.orig.