add prebuild library

3 files changed, 24 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20198e709268..4e3714df1435 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 # Generated by mksrcinfo v8
-# Fri Dec 29 05:07:39 UTC 2017
+# Mon Jan 15 12:15:22 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.8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.dlib.net/
 	arch = any
 	license = Boost Software License
+	makedepends = mingw-w64-cmake
 	depends = mingw-w64-crt
 	optdepends = mingw-w64-giflib: for GIF support
 	optdepends = mingw-w64-lapack: for BLAS and LAPACK support
@@ -18,8 +19,8 @@ pkgbase = mingw-w64-dlib
 	options = staticlibs
 	source = https://downloads.sourceforge.net/project/dclib/dlib/v19.8/dlib-19.8.tar.bz2
 	source = dlib.patch
-	sha256sums = dbd31f7b97166e58f366c83fa5127e9fa44c492921558b61ce63a7d775be696b
-	sha256sums = 1f14cf62557bdef5efd4ad4bb631537b3bf94e4f2d2ee51cd955c138a311fea5
+	sha512sums = 13d354e2e35c93c1b84bbc680e38cfe043199a18cb362426f21962a3d2eb116c86dd83af4eacd131e3749d3a4eadcf58a9db28133ec508de0c2a4cb3eb87dbf1
+	sha512sums = c0951d8915c4d45bf9dec355a54fbe4b7e82db36cc7009c6ac2a145a5ba4a1f5ca7aedfadd5e478ab17ddf037a9460a5f18891b793f76f4f8274d0fb14ed5faa
 
 pkgname = mingw-w64-dlib
 
diff --git a/PKGBUILD b/PKGBUILD
index 54a395103449..3ca60aa35d22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,13 @@
 pkgname=mingw-w64-dlib
 _pkgname=dlib
 pkgver=19.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Dlib is a general purpose cross-platform C++ library designed using contract programming and modern C++ techniques. (mingw-w64)"
 arch=('any')
 url="http://www.dlib.net/"
 license=('Boost Software License')
 depends=('mingw-w64-crt')
+makedepends=('mingw-w64-cmake')
 optdepends=('mingw-w64-giflib: for GIF support'
             'mingw-w64-lapack: for BLAS and LAPACK support'
             'mingw-w64-libjpeg: for JPEG support'
@@ -17,8 +18,8 @@ optdepends=('mingw-w64-giflib: for GIF support'
 options=('!buildflags' '!strip' 'staticlibs')
 source=(https://downloads.sourceforge.net/project/dclib/${_pkgname}/v${pkgver}/${_pkgname}-${pkgver}.tar.bz2
         dlib.patch)
-sha256sums=('dbd31f7b97166e58f366c83fa5127e9fa44c492921558b61ce63a7d775be696b'
-            '1f14cf62557bdef5efd4ad4bb631537b3bf94e4f2d2ee51cd955c138a311fea5')
+sha512sums=('13d354e2e35c93c1b84bbc680e38cfe043199a18cb362426f21962a3d2eb116c86dd83af4eacd131e3749d3a4eadcf58a9db28133ec508de0c2a4cb3eb87dbf1'
+            'c0951d8915c4d45bf9dec355a54fbe4b7e82db36cc7009c6ac2a145a5ba4a1f5ca7aedfadd5e478ab17ddf037a9460a5f18891b793f76f4f8274d0fb14ed5faa')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -26,15 +27,25 @@ prepare() {
     cd ${srcdir}
 
     # fix a linking error while build a static binary with libpng
-    # do not use CUDA
     patch -Np0 -i dlib.patch
 }
 
-package() {
+build() {
+    cd ${srcdir}
     for _arch in ${_architectures}; do
-        cd "${srcdir}/${_pkgname}-${pkgver}"
+        mkdir -p "${_pkgname}-build-${_arch}" && pushd "${_pkgname}-build-${_arch}"
+        ${_arch}-cmake "../${_pkgname}-${pkgver}/${_pkgname}"
+        make
+        popd
+    done
+}
 
-        install -Dm755 -d "${pkgdir}/usr/${_arch}/include"
-	    cp -a ${_pkgname} "${pkgdir}/usr/${_arch}/include"
+package() {
+    cd ${srcdir}
+    for _arch in ${_architectures}; do
+        pushd "${_pkgname}-build-${_arch}"
+        make DESTDIR=${pkgdir} install
+        ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
+        popd
     done
 }
diff --git a/dlib.patch b/dlib.patch
index e6dcd61a5d1b..393678c4395f 100644
--- a/dlib.patch
+++ b/dlib.patch
@@ -1,15 +1,6 @@
 diff -ruN dlib-19.8/dlib/CMakeLists.txt dlib-19.8-patched/dlib/CMakeLists.txt
 --- dlib-19.8/dlib/CMakeLists.txt	2017-09-17 20:28:45.000000000 +0800
 +++ dlib-19.8-patched/dlib/CMakeLists.txt	2017-10-26 17:01:29.465982530 +0800
-@@ -146,7 +146,7 @@
-       option(DLIB_LINK_WITH_SQLITE3 ${DLIB_LINK_WITH_SQLITE3_STR} ON)
-       option(DLIB_USE_BLAS ${DLIB_USE_BLAS_STR} ON)
-       option(DLIB_USE_LAPACK ${DLIB_USE_LAPACK_STR} ON)
--      option(DLIB_USE_CUDA ${DLIB_USE_CUDA_STR} ON)
-+      option(DLIB_USE_CUDA ${DLIB_USE_CUDA_STR} OFF)
-       option(DLIB_PNG_SUPPORT ${DLIB_PNG_SUPPORT_STR} ON)
-       option(DLIB_GIF_SUPPORT ${DLIB_GIF_SUPPORT_STR} ON)
-       #option(DLIB_USE_FFTW ${DLIB_USE_FFTW_STR} ON)
 @@ -349,6 +349,7 @@
           if (PNG_FOUND AND LIBPNG_IS_GOOD)
              include_directories(${PNG_INCLUDE_DIR})