From 310f92c634f89a55bcb4dee0911fd2bee9a2ee34 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Fri, 25 Dec 2020 02:30:16 +0530
Subject: [PATCH] libtorrent-rasterbar2: Use Ninja, Remove path reference.

---
 mingw-w64-libtorrent-rasterbar2/PKGBUILD | 40 ++++++++++++++----------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/mingw-w64-libtorrent-rasterbar2/PKGBUILD b/mingw-w64-libtorrent-rasterbar2/PKGBUILD
index 30c5bc29ed..d6487eca5c 100644
--- a/mingw-w64-libtorrent-rasterbar2/PKGBUILD
+++ b/mingw-w64-libtorrent-rasterbar2/PKGBUILD
@@ -8,7 +8,7 @@ _realname=${_basename}2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="libtorrent is a feature complete C++ bittorrent implementation focusing on efficiency and scalability (mingw-w64)"
 arch=('any')
 license=('BSD')
@@ -17,9 +17,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-openssl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_basename}")
-options=(staticlibs strip)
+options=('staticlibs' 'strip')
 source=("https://github.com/arvidn/libtorrent/releases/download/v${pkgver}/${_basename}-${pkgver}.tar.gz")
 sha256sums=('7b39599bf602bf2f208f8f05bf2327576356a3c192175b3a4603262ede42ffd7')
 
@@ -35,43 +36,50 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  mkdir ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+  [[ -d "${srcdir}/build-${MINGW_CHOST}-shared" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-shared"
+  mkdir "${srcdir}/build-${MINGW_CHOST}-shared" && cd "${srcdir}/build-${MINGW_CHOST}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+  ${MINGW_PREFIX}/bin/cmake.exe \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     ${extra_config} \
     -DBUILD_SHARED_LIBS=ON \
     -Dbuild_tests=OFF \
     -Dbuild_examples=OFF \
+    -Dbuild_tools=OFF \
     ../${_basename}-${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake.exe --build ./
 
   [[ -d "${srcdir}/build-${MINGW_CHOST}-static" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}-static"
-  mkdir ${srcdir}/build-${MINGW_CHOST}-static && cd ${srcdir}/build-${MINGW_CHOST}-static
+  mkdir "${srcdir}/build-${MINGW_CHOST}-static" && cd "${srcdir}/build-${MINGW_CHOST}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+  ${MINGW_PREFIX}/bin/cmake.exe \
+    -G"Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     ${extra_config} \
+    -DBUILD_SHARED_LIBS=OFF \
     -Dbuild_tests=OFF \
     -Dbuild_examples=OFF \
-    -DBUILD_SHARED_LIBS=OFF \
+    -Dbuild_tools=OFF \
     ../${_basename}-${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake.exe --build ./
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}-static
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
-  cd ${srcdir}/build-${MINGW_CHOST}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
   install -Dm644 "${srcdir}/${_basename}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_basename}/LICENSE"
+
+  # Remove full path reference in cmake and pkgconfig files
+  local _PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  sed -s "s|${_PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libtorrent-rasterbar.pc"
+  sed -s "s|${_PREFIX_WIN}/include||g" -i "${pkgdir}${MINGW_PREFIX}/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake"
 }