Simplified sources for arm

2 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 577dce3b1897..ad8663d843c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,11 +15,11 @@ pkgbase = libbass
 	source = LICENSE
 	sha256sums = 65a85873f5c6057abe947e17616bd4e0de858ce42bb74f5f9716ea53e1571b25
 	sha256sums = f7bc36320110c8fd2f87c6d2bb5df6d2231ca9ab31a299b1565de63f7681cc83
-	source_armv6h = libbass-2.4.15-x86_64.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip
+	source_armv6h = libbass-2.4.15-arm.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip
 	sha256sums_armv6h = d59d58b5dbecab4e38848abb355368ea4ea6ed78e9a5a41164d1347bc844aea4
-	source_armv7h = libbass-2.4.15-x86_64.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip
+	source_armv7h = libbass-2.4.15-arm.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip
 	sha256sums_armv7h = d59d58b5dbecab4e38848abb355368ea4ea6ed78e9a5a41164d1347bc844aea4
-	source_aarch64 = libbass-2.4.15-x86_64.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip
+	source_aarch64 = libbass-2.4.15-arm.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip
 	sha256sums_aarch64 = d59d58b5dbecab4e38848abb355368ea4ea6ed78e9a5a41164d1347bc844aea4
 
 pkgname = libbass
diff --git a/PKGBUILD b/PKGBUILD
index cfbbbb7fe02c..c14ab2ef9c7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,20 +12,22 @@ source=("$pkgname-$pkgver.zip::http://dl.un4seen.com/files/bass24-linux.zip"
         LICENSE)
 sha256sums=('65a85873f5c6057abe947e17616bd4e0de858ce42bb74f5f9716ea53e1571b25'
             'f7bc36320110c8fd2f87c6d2bb5df6d2231ca9ab31a299b1565de63f7681cc83')
+
+source_armv6h=("$pkgname-$pkgver-arm.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip")
 sha256sums_armv6h=('d59d58b5dbecab4e38848abb355368ea4ea6ed78e9a5a41164d1347bc844aea4')
+source_armv7h=("$pkgname-$pkgver-arm.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip")
 sha256sums_armv7h=('d59d58b5dbecab4e38848abb355368ea4ea6ed78e9a5a41164d1347bc844aea4')
+source_aarch64=("$pkgname-$pkgver-arm.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip")
 sha256sums_aarch64=('d59d58b5dbecab4e38848abb355368ea4ea6ed78e9a5a41164d1347bc844aea4')
 
-source_armv6h=("$pkgname-$pkgver-$CARCH.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip")
-source_armv7h=("$pkgname-$pkgver-$CARCH.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip")
-source_aarch64=("$pkgname-$pkgver-$CARCH.zip::http://dl.un4seen.com/stuff/bass24-linux-arm.zip")
-
 build () {
     unzip -q "$pkgname-$pkgver.zip" -d "$srcdir/$pkgname-$pkgver"
 
-    if [[ -e "$pkgname-$pkgver-$CARCH.zip" ]]; then
-        unzip -q "$pkgname-$pkgver-$CARCH.zip" -d "$srcdir/$pkgname-$pkgver/$CARCH"
-    fi
+    case "$CARCH" in
+    armv6h|armv7h|aarch64)
+        unzip -q "$pkgname-$pkgver-arm.zip" -d "$srcdir/$pkgname-$pkgver/arm"
+        ;;
+    esac
 }
 
 package () {
@@ -42,10 +44,10 @@ package () {
         install -D -m755 x64/libbass.so "$pkgdir/usr/lib/libbass.so"
 	;;
     armv6h|armv7h)
-        install -D -m755 $CARCH/hardfp/libbass.so "$pkgdir/usr/lib/libbass.so"
+        install -D -m755 arm/hardfp/libbass.so "$pkgdir/usr/lib/libbass.so"
 	;;
     aarch64)
-        install -D -m755 $CARCH/aarch64/libbass.so "$pkgdir/usr/lib/libbass.so"
+        install -D -m755 arm/aarch64/libbass.so "$pkgdir/usr/lib/libbass.so"
 	;;
     esac