Updated to 19.10

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 284b3e6876d8..917f9b4fb2df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Jan 26 06:42:34 UTC 2018
 pkgbase = mingw-w64-dlib
 	pkgdesc = Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques. (mingw-w64)
-	pkgver = 19.9
+	pkgver = 19.10
 	pkgrel = 1
 	url = http://www.dlib.net/
 	arch = any
@@ -16,10 +14,8 @@ pkgbase = mingw-w64-dlib
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = https://downloads.sourceforge.net/project/dclib/dlib/v19.9/dlib-19.9.tar.bz2
-	source = dlib.patch
-	sha512sums = 3cbd2b7d2cad2e494a14e9f19469e6ab33263ad87aa32e6f65de689ebfb395277fd5d5c3fd4a510cc16d3a8768d9685652c8378fcde0ceec5234363ab492b473
-	sha512sums = d9ffa19acf700bddef82cf02902887351036a17d9b9e840c0553a676e3fff021e5ec05aa1cca284fa74b81bea7916974c476d98575d0ae649f7478618ae89e63
+	source = https://downloads.sourceforge.net/project/dclib/dlib/v19.10/dlib-19.10.tar.bz2
+	sha512sums = 04b1513f09bf43677ad5b59d76fe7aa9cd96c6d7d1aac2fb0f431a555ccc670996a30660a8bf50eea082842f623b68f1ac019058b351750c0d86f8f0b355891b
 
 pkgname = mingw-w64-dlib
 
diff --git a/PKGBUILD b/PKGBUILD
index 77b1152620a5..57a944b37fdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mingw-w64-dlib
 _pkgname=dlib
-pkgver=19.9
+pkgver=19.10
 pkgrel=1
 pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques. (mingw-w64)"
 arch=('any')
@@ -15,25 +15,32 @@ optdepends=('mingw-w64-giflib: for GIF support'
             'mingw-w64-libpng: for PNG support'
             'mingw-w64-sqlite: for sqlite support')
 options=('!buildflags' '!strip' 'staticlibs')
-source=(https://downloads.sourceforge.net/project/dclib/${_pkgname}/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2
-        dlib.patch)
-sha512sums=('3cbd2b7d2cad2e494a14e9f19469e6ab33263ad87aa32e6f65de689ebfb395277fd5d5c3fd4a510cc16d3a8768d9685652c8378fcde0ceec5234363ab492b473'
-            'd9ffa19acf700bddef82cf02902887351036a17d9b9e840c0553a676e3fff021e5ec05aa1cca284fa74b81bea7916974c476d98575d0ae649f7478618ae89e63')
+source=(https://downloads.sourceforge.net/project/dclib/${_pkgname}/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
+sha512sums=('04b1513f09bf43677ad5b59d76fe7aa9cd96c6d7d1aac2fb0f431a555ccc670996a30660a8bf50eea082842f623b68f1ac019058b351750c0d86f8f0b355891b')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
     cd ${srcdir}
-
-    # fix a linking error while build a static binary with libpng
-    patch -Np0 -i dlib.patch
 }
 
 build() {
     cd ${srcdir}
     for _arch in ${_architectures}; do
-        mkdir -p "${_pkgname}-build-${_arch}" && pushd "${_pkgname}-build-${_arch}"
+        # shared
+        mkdir -p "${_pkgname}-build-${_arch}-shared" && pushd "${_pkgname}-build-${_arch}-shared"
+        ${_arch}-cmake \
+            -DBUILD_SHARED_LIBS:BOOL=ON \
+            -DUSE_AVX_INSTRUCTIONS:BOOL=ON \
+            -DUSE_SSE2_INSTRUCTIONS:BOOL=ON \
+            -DUSE_SSE4_INSTRUCTIONS:BOOL=ON \
+            "../${_pkgname}-${pkgver}"
+        make
+        popd
+        # static
+        mkdir -p "${_pkgname}-build-${_arch}-static" && pushd "${_pkgname}-build-${_arch}-static"
         ${_arch}-cmake \
+            -DBUILD_SHARED_LIBS:BOOL=OFF \
             -DUSE_AVX_INSTRUCTIONS:BOOL=ON \
             -DUSE_SSE2_INSTRUCTIONS:BOOL=ON \
             -DUSE_SSE4_INSTRUCTIONS:BOOL=ON \
@@ -46,10 +53,14 @@ build() {
 package() {
     cd ${srcdir}
     for _arch in ${_architectures}; do
-        pushd "${_pkgname}-build-${_arch}"
+        pushd "${_pkgname}-build-${_arch}-shared"
         make DESTDIR=${pkgdir} install
-        ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
         popd
+        pushd "${_pkgname}-build-${_arch}-static"
+        make DESTDIR=${pkgdir} install
+        popd
+        ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
+        ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
     done
     install -Dm644 "${_pkgname}-${pkgver}/dlib/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }