New upstream version: 2.4.17

The arm version is now included in the zip for linux.

2 files changed, 11 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a274747e19db..3256960fac92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libbass
 	pkgdesc = BASS audio library
-	pkgver = 2.4.16
-	pkgrel = 5
+	pkgver = 2.4.17
+	pkgrel = 1
 	url = https://www.un4seen.com/
 	arch = i686
 	arch = x86_64
@@ -10,13 +10,7 @@ pkgbase = libbass
 	arch = aarch64
 	license = custom
 	depends = alsa-lib
-	source = libbass-2.4.16.zip::http://www.un4seen.com/files/bass24-linux.zip
-	sha256sums = 77f387762a9ee4b72da3c6581c22e50456ab7aeb7c9a7154564530a9468db655
-	source_armv6h = libbass-2.4.16-arm.zip::http://www.un4seen.com/files/bass24-linux-arm.zip
-	sha256sums_armv6h = 7300ac8c112551bea6dc691b2ef3102fd208c07628c2cc822476465c077b20ba
-	source_armv7h = libbass-2.4.16-arm.zip::http://www.un4seen.com/files/bass24-linux-arm.zip
-	sha256sums_armv7h = 7300ac8c112551bea6dc691b2ef3102fd208c07628c2cc822476465c077b20ba
-	source_aarch64 = libbass-2.4.16-arm.zip::http://www.un4seen.com/files/bass24-linux-arm.zip
-	sha256sums_aarch64 = 7300ac8c112551bea6dc691b2ef3102fd208c07628c2cc822476465c077b20ba
+	source = libbass-2.4.17.zip::http://www.un4seen.com/files/bass24-linux.zip
+	sha256sums = e0caed1509d7e92d12d8b74827d95e60226c1a37dbd3e37d6ecf89aa1353932b
 
 pkgname = libbass
diff --git a/PKGBUILD b/PKGBUILD
index 17d7b8a36a6a..da02d633b3a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,15 @@
 # Contributor: Alexander F. Rødseth <xyproto@archlinux.org>
 
 pkgname=libbass
-pkgver=2.4.16
-pkgrel=5
+pkgver=2.4.17
+pkgrel=1
 pkgdesc='BASS audio library'
 arch=(i686 x86_64 armv6h armv7h aarch64)
 url='https://www.un4seen.com/'
 license=(custom)
 depends=(alsa-lib)
 source=("$pkgname-$pkgver.zip::http://www.un4seen.com/files/bass24-linux.zip")
-source_armv6h=("$pkgname-$pkgver-arm.zip::http://www.un4seen.com/files/bass24-linux-arm.zip")
-source_armv7h=("$pkgname-$pkgver-arm.zip::http://www.un4seen.com/files/bass24-linux-arm.zip")
-source_aarch64=("$pkgname-$pkgver-arm.zip::http://www.un4seen.com/files/bass24-linux-arm.zip")
-sha256sums=('77f387762a9ee4b72da3c6581c22e50456ab7aeb7c9a7154564530a9468db655')
-sha256sums_armv6h=('7300ac8c112551bea6dc691b2ef3102fd208c07628c2cc822476465c077b20ba')
-sha256sums_armv7h=('7300ac8c112551bea6dc691b2ef3102fd208c07628c2cc822476465c077b20ba')
-sha256sums_aarch64=('7300ac8c112551bea6dc691b2ef3102fd208c07628c2cc822476465c077b20ba')
+sha256sums=('e0caed1509d7e92d12d8b74827d95e60226c1a37dbd3e37d6ecf89aa1353932b')
 
 prepare() {
   grep Lic "$srcdir/bass.txt" -A62 > LICENSE
@@ -26,16 +20,13 @@ prepare() {
 package() {
   case "$CARCH" in
     i686)
-      install -D -m644 libbass.so "$pkgdir/usr/lib/libbass.so"
-	  ;;
-    x86_64)
-      install -D -m644 x64/libbass.so "$pkgdir/usr/lib/libbass.so"
+      install -D -m644 libs/x86/libbass.so "$pkgdir/usr/lib/libbass.so"
 	  ;;
     armv6h|armv7h)
-      install -D -m644 hardfp/libbass.so "$pkgdir/usr/lib/libbass.so"
+      install -D -m644 libs/armhf/libbass.so "$pkgdir/usr/lib/libbass.so"
 	  ;;
-    aarch64)
-      install -D -m644 aarch64/libbass.so "$pkgdir/usr/lib/libbass.so"
+    aarch64|x86_64)
+      install -D -m644 libs/$CARCH/libbass.so "$pkgdir/usr/lib/libbass.so"
 	  ;;
   esac