From 6ef11e32566ddab362cb5b6e0fd86d7b9cb36784 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@posteo.net>
Date: Wed, 2 Apr 2025 23:52:45 +0100
Subject: [PATCH] Cleanup

Properly add libstriezel as a meson dependency
---
 .gitignore                                    |  3 ++
 meson.build                                   |  5 ++-
 subprojects/libstriezel                       |  1 -
 subprojects/libstriezel.wrap                  |  7 +++++
 .../packagefiles/libstriezel/meson.build      | 31 +++++++++++++++++++
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore
 delete mode 160000 subprojects/libstriezel
 create mode 100644 subprojects/libstriezel.wrap
 create mode 100644 subprojects/packagefiles/libstriezel/meson.build

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7c2caf9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+tags
+subprojects/libstriezel/
+compile_commands.json
diff --git a/meson.build b/meson.build
index 4fa2fc9..0033785 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('ducktorrent', 'cpp',
   version: '0.1.0',
-  meson_version: '>=0.56.0',
+  meson_version: '>=0.63.0',
   default_options: [
 	'buildtype=release',
 	'cpp_std=gnu++20',
@@ -11,7 +11,6 @@ project('ducktorrent', 'cpp',
 
 boost_dep = dependency('boost', version: '>=1.75.0')
 
-libstriezel_proj = subproject('libstriezel')
-libstriezel_dep = libstriezel_proj.get_variable('libstriezel_dep')
+libstriezel_dep = dependency('libstriezel')
 
 subdir('src')
diff --git a/subprojects/libstriezel b/subprojects/libstriezel
deleted file mode 160000
index 12869dd..0000000
--- a/subprojects/libstriezel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 12869dd16fbad4bc60eb264be13cf9f9b6b089ba
diff --git a/subprojects/libstriezel.wrap b/subprojects/libstriezel.wrap
new file mode 100644
index 0000000..7d72385
--- /dev/null
+++ b/subprojects/libstriezel.wrap
@@ -0,0 +1,7 @@
+[wrap-git]
+url = https://gitlab.com/striezel/libstriezel.git
+revision = 12869dd16fbad4bc60eb264be13cf9f9b6b089ba
+patch_directory = libstriezel
+
+[provide]
+libstriezel = libstriezel_dep
diff --git a/subprojects/packagefiles/libstriezel/meson.build b/subprojects/packagefiles/libstriezel/meson.build
new file mode 100644
index 0000000..8e6d9b7
--- /dev/null
+++ b/subprojects/packagefiles/libstriezel/meson.build
@@ -0,0 +1,31 @@
+project('libstriezel', 'cpp',
+  version: '0.1.0',
+  meson_version: '>=0.56.0',
+  default_options: [
+	'buildtype=release',
+	'cpp_std=gnu++11',
+	'b_ndebug=if-release',
+	'c_std=c99',
+  ],
+  license: 'GPL3',
+)
+
+pub_inc = include_directories('hash')
+
+main_target = library(meson.project_name(),
+  'hash/sha1/BufferSourceUtility.cpp',
+  'hash/sha1/FileSourceUtility.cpp',
+  'hash/sha1/sha1.cpp',
+  'hash/sha256/BufferSource.cpp',
+  'hash/sha256/BufferSourceUtility.cpp',
+  'hash/sha256/FileSource.cpp',
+  'hash/sha256/FileSourceUtility.cpp',
+  'hash/sha256/MessageSource.cpp',
+  'hash/sha256/sha256.cpp',
+  install: true,
+)
+
+libstriezel_dep = declare_dependency(
+  link_with: main_target,
+  include_directories: pub_inc,
+)