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

[Alexander Rødseth]

    Date: Thursday, June 20, 2019 @ 17:07:26
  Author: arodseth
Revision: 482502

upgpkg: dumb 2.0.3-2

Modified:
  dumb/trunk/PKGBUILD

----------+
 PKGBUILD |   55 ++++++++++++-------------------------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-20 17:03:04 UTC (rev 482501)
+++ PKGBUILD	2019-06-20 17:07:26 UTC (rev 482502)
@@ -1,37 +1,22 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 # Contributor: Chris Brannon <cmbrannon79 at gmail.com>
 # Contributor: JJDaNiMoTh <jjdanimoth at gmail.com>
-# Contributor: Bjørn Lindeijer <bjorn lindeijer nl>
+# Contributor: Bjørn Lindeijer <bjorn at lindeijer.nl>
 
-pkgbase=dumb
-pkgname=(dumb dumb-a4)
+pkgname=dumb
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='IT, XM, S3M and MOD player library'
-arch=('x86_64')
-license=('custom:dumb' 'GPL')
-url='http://dumb.sf.net/'
-makedepends=('allegro' 'allegro4' 'cmake' 'ninja')
+arch=(x86_64)
+license=(custom:dumb GPL)
+url='https://dumb.sf.net/'
+makedepends=(allegro cmake ninja)
 source=($pkgname-$pkgver.tar.gz::"https://github.com/kode54/dumb/archive/$pkgver.tar.gz")
 sha256sums=('99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9')
 
 build() {
-  cp -r "$pkgname-$pkgver" "$pkgname-$pkgver-a4"
-  mkdir -p build-a4 build-a5
-
-  # Configure for Allegro 4
-  cd build-a4
-  cmake "$srcdir/$pkgname-$pkgver-a4" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_SHARED_LIBS=ON \
-    -DBUILD_ALLEGRO4=ON \
-    -DBUILD_EXAMPLES=OFF \
-    -GNinja
-
-  # Configure for Allegro 5
-  cd "$srcdir/build-a5"
+  mkdir -p build
+  cd build
   cmake "$srcdir/$pkgname-$pkgver" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -40,29 +25,13 @@
     -DBUILD_ALLEGRO4=OFF \
     -DBUILD_EXAMPLES=OFF \
     -GNinja
-
-  # Build both
-  cd "$srcdir"
-  ninja -C build-a4
-  ninja -C build-a5
+  ninja
 }
 
 package_dumb() {
-  conflicts=('dumb-a4')
-  DESTDIR="$pkgdir" ninja -C build-a5 install
+  DESTDIR="$pkgdir" ninja -C build install
   install -Dm644 "$pkgbase-$pkgver/LICENSE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_dumb-a4() {
-  conflicts=('dumb')
-  provides=('dumb')
-  depends=('allegro4')
-  pkgdesc='IT, XM, S3M and MOD player library (for Allegro 4)'
-
-  DESTDIR="$pkgdir" ninja -C build-a4 install
-  install -Dm644 "$pkgbase-$pkgver/LICENSE" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
 # vim: ts=2 sw=2 et: