update to 19.24

3 files changed, 8 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d559652aaccd..0835de7b1d43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dlib-sse
 	pkgdesc = A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques
-	pkgver = 19.22
-	pkgrel = 3
+	pkgver = 19.24
+	pkgrel = 1
 	url = http://dlib.net
 	arch = x86_64
 	license = custom
@@ -19,10 +19,8 @@ pkgbase = dlib-sse
 	optdepends = giflib: for GIF support
 	optdepends = sqlite: for sqlite support
 	provides = dlib
-	source = https://github.com/davisking/dlib/archive/600e03655274f0e7f2013d8d3cd5a3799843186b.tar.gz
-	source = version.patch
-	sha256sums = ff6fbbb0032e973a32b9a3b525b507851326305a97b8892e90c519dc6b2490d7
-	sha256sums = df6167bb6c9a258eebfed651bd4c8d4e5d89324dd10579057fa58e6d1f4d110d
+	source = https://github.com/davisking/dlib/archive/refs/tags/v19.24.tar.gz
+	sha256sums = 3cc42e84c7b1bb926c6451a21ad1595f56c5b10be3a1d7aa2f3c716a25b7ae39
 
 pkgname = dlib-sse
 
@@ -37,4 +35,3 @@ pkgname = dlib-sse-cuda
 	depends = cuda
 	depends = cudnn
 	conflicts = dlib
-
diff --git a/PKGBUILD b/PKGBUILD
index 9a97a0673a85..35de666a7871 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgbase=dlib
 pkgname=("dlib-sse" "dlib-sse-cuda")
-pkgver=19.22
-pkgrel=3
+pkgver=19.24
+pkgrel=1
 _commit=600e03655274f0e7f2013d8d3cd5a3799843186b
 pkgdesc="A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques"
 arch=('x86_64')
@@ -19,14 +19,10 @@ optdepends=('giflib: for GIF support'
             'sqlite: for sqlite support')
 makedepends=('cmake' 'ccache-ext' 'ccache' 'cuda' 'cudnn')
 provides=("dlib")
-source=("https://github.com/davisking/dlib/archive/$_commit.tar.gz"
-	"version.patch")
-sha256sums=('ff6fbbb0032e973a32b9a3b525b507851326305a97b8892e90c519dc6b2490d7'
-            'df6167bb6c9a258eebfed651bd4c8d4e5d89324dd10579057fa58e6d1f4d110d')
+source=("https://github.com/davisking/dlib/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('3cc42e84c7b1bb926c6451a21ad1595f56c5b10be3a1d7aa2f3c716a25b7ae39')
 build() {
-    mv -v "${srcdir}/${_pkgbase}-${_commit}" "${srcdir}/${_pkgbase}-${pkgver}"
     cd "${srcdir}/${_pkgbase}-${pkgver}"
-    patch -p1 -i ../version.patch
     cd ..
     mkdir -p build && cd build
     #cmake -GNinja \
diff --git a/version.patch b/version.patch
deleted file mode 100644
index 54de5f25499d..000000000000
--- a/version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/dlib/CMakeLists.txt
-+++ b/dlib/CMakeLists.txt
-@@ -20,8 +20,8 @@
- 
- set(CPACK_PACKAGE_NAME "dlib")
- set(CPACK_PACKAGE_VERSION_MAJOR "19")
--set(CPACK_PACKAGE_VERSION_MINOR "21")
--set(CPACK_PACKAGE_VERSION_PATCH "99")
-+set(CPACK_PACKAGE_VERSION_MINOR "22")
-+set(CPACK_PACKAGE_VERSION_PATCH "0")
- set(VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
- # Only print these messages once, even if dlib is added multiple times via add_subdirectory()
- if (NOT TARGET dlib)