Package improvement

- Drop 'ninja' dependency
- Disable python bindings
- Drop '-DCMAKE_BUILD_TYPE'
- Other minor improvements

3 files changed, 18 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ca0040ff275..a754a9d3253d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = libtorrent-rasterbar-1
 	pkgdesc = Open source C++ library implementing the BitTorrent protocol.
 	pkgver = 1.2.18
-	pkgrel = 1
+	pkgrel = 2
 	url = https://libtorrent.org/
 	arch = x86_64
 	license = BSD
-	makedepends = boost
 	makedepends = cmake
-	makedepends = ninja
-	makedepends = python-setuptools
+	makedepends = boost
 	depends = boost-libs
 	depends = openssl
 	provides = libtorrent-rasterbar=1.2.18
diff --git a/.gitignore b/.gitignore
index 924dfb95c209..05c6d4d4c97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-pkg/
-src/
-*.tar.*
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 09374b2cb09c..390485619ce9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,33 @@
-pkgname=libtorrent-rasterbar-1
+_name=libtorrent-rasterbar
+pkgname=${_name}-1
 pkgver=1.2.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source C++ library implementing the BitTorrent protocol."
 url="https://libtorrent.org/"
 arch=('x86_64')
 license=('BSD')
 depends=('boost-libs' 'openssl')
-makedepends=('boost' 'cmake' 'ninja' 'python-setuptools')
-_name="${pkgname%-1}"
+makedepends=('cmake' 'boost')
 provides=("${_name}=${pkgver}")
 conflicts=("${_name}")
 options=('!emptydirs')
 
-_repo="${_name%-rasterbar}"
+_repo='libtorrent'
 _snapshot="${_repo}-${pkgver}"
 
 source=("${_snapshot}.tar.gz::https://github.com/arvidn/${_repo}/archive/v${pkgver}.tar.gz")
 sha256sums=('c4213bfb695db3e3b266be71865a7942f9007200aa4021946818fdc5e5e4a3d3')
 
 build() {
-    cd "${srcdir}"
+    cmake -B "build" -S "${_snapshot}" \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -Dpython-bindings=OFF
 
-    cmake -B "build" -GNinja "${_snapshot}" \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX="/usr" \
-        -DCMAKE_INSTALL_LIBDIR="lib" \
-        -Dpython-bindings=ON \
-        -Dboost-python-module-name="python" \
-        -Dpython-egg-info=ON
-
-    ninja -C "build"
+    cmake --build "build"
 }
 
 package() {
-    cd "${srcdir}"
-    DESTDIR="${pkgdir}" ninja -C "build" install
-
-    cd "${_snapshot}"
-    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "COPYING"
+    DESTDIR="${pkgdir}" cmake --install "build"
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${_snapshot}/COPYING"
 }