[arch-commits] Commit in cdemu-daemon/trunk (PKGBUILD)

[Jan Steffens]

    Date: Wednesday, July 11, 2018 @ 00:47:07
  Author: heftig
Revision: 356654

3.2.0-1

Modified:
  cdemu-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-11 00:46:00 UTC (rev 356653)
+++ PKGBUILD	2018-07-11 00:47:07 UTC (rev 356654)
@@ -5,7 +5,7 @@
 # Contributor: Charles Lindsay <charles at chaoslizard.org>
 
 pkgname=cdemu-daemon
-pkgver=3.1.0
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="CD/DVD-ROM device emulator daemon"
 arch=(x86_64)
@@ -12,7 +12,7 @@
 url="http://cdemu.sourceforge.net/"
 license=(GPL)
 depends=(dbus vhba-module libao 'libmirage>=3.1.0')
-makedepends=(cmake intltool)
+makedepends=(cmake intltool ninja)
 optdepends=('alsa-lib: to enable the ALSA audio driver'
             'pulseaudio: to enable the PA audio driver')
 backup=(etc/conf.d/cdemu-daemon
@@ -20,7 +20,7 @@
 install=cdemu-daemon.install
 source=("https://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
         0001-Patch-system-daemon-for-Arch-friendliness.patch)
-sha256sums=('498f0f2fe2225de76acfe0b3dbf9606e4e2eb57ac9d29da9d48064b62587bc4f'
+sha256sums=('82d61860ff6d72fa080da48607b82af3e30ede8f792b73a477dfe468d898effb'
             'e83467d342abd979b38b3a971b97942787f5b5a0e18c569b034a636c54eb8154')
 
 prepare() {
@@ -33,21 +33,18 @@
 
 build() {
   cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -G Ninja ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
     -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname
-  make
+  cmake --build .
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/lib/modules-load.d"
-  echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
+  DESTDIR="$pkgdir" cmake --build build --target install
+  echo vhba | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
 }
 
 # vim:set ts=2 sw=2 et: