upgpkg: libre/linux-libre-firmware 1:1.3-1

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 14 insertions, 18 deletions

diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index cb6ebb17d..3534a93ea 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -4,14 +4,14 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=linux-libre-firmware
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.3
+pkgrel=1
 epoch=1
 pkgdesc='Firmware files for Linux-libre'
 arch=('any')
 url='https://jxself.org/firmware'
 license=('GPL3' 'GPL2')
-makedepends=('cmake' 'arm-linux-gnueabi-gcc' 'sh-elf-gcc' 'sh-elf-newlib' 'xtensa-elf-gcc')
+makedepends=('arm-linux-gnueabi-gcc' 'arm-none-eabi-gcc' 'cmake' 'sh-elf-gcc' 'sh-elf-newlib' 'xtensa-elf-gcc')
 provides=('linux-firmware')
 conflicts=('linux-firmware'
            'linux-firmware-git'
@@ -30,34 +30,30 @@ conflicts=('linux-firmware'
            'openfwwf'
            'ath9k-htc-firmware')
 replaces=(${conflicts[@]})
-options=(!buildflags)
-source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch' 'install-ath9k_htc-on-prefix-ath9k_htc-too.patch')
-sha512sums=('dc4f2e931b4dde217f2e3430e7a0c1a5f42f0844087bf9a771c7e40dbdd8050205d7a80495bd130f87a02a823db7514241d68bfded19548132b3620d4c7e630a'
+options=(!buildflags !makeflags)
+source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch')
+sha512sums=('d3ead6924e686d0212c5993386fdf7ed1d2f68cb899517510ef488b2006a7bb9c1a8e511d23622e0342bdc70410c90291aad60adb2ac5db20c00b40a11508700'
             'SKIP'
-            '474fcfad6c447fded19c8d678b5e29e21d6e1406a3350453e483fd1fe4031c5b3da754fdb94174a538c026ab0b266f7f794f60868c5d6b438aacbdbd214c1046'
-            '9aea747fe09593ca407cb638964613720f871cbf2ae480b300e881d3f209692dace6f7c3ee65478a8f3715949bc8b41460dbd25344433df9facdcf318815a177')
+            '2d45a7afd7e22bf558a24fa7777976ee6bbe5aa7c73b6fcccab32c28c52bb76de2647e5b8c1560bb6f9dd0e2e5c36befb1a776257c5f412437cdaa8f96290864')
 validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver/src
+  cd $srcdir/$pkgname-$pkgver
 
   # do not download toolchains so we can build offline
-  patch -p1 -i $srcdir/remove-external-toolchains.patch
-
-  # https://labs.parabola.nu/issues/1445
-  patch -p1 -i $srcdir/install-ath9k_htc-on-prefix-ath9k_htc-too.patch
+  patch -p0 -i ../remove-external-toolchains.patch
 }  
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make
+  cd $srcdir/$pkgname-$pkgver
+  make -C src
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/src
+  cd $srcdir/$pkgname-$pkgver
 
   install -dm755 $pkgdir/usr/lib/firmware
-  make prefix=$pkgdir/usr/lib/firmware install
+  make -C src prefix=$pkgdir/usr/lib/firmware install
 
-  install -Dm644 WHENCE $pkgdir/usr/share/licenses/$pkgname/WHENCE
+  install -Dm644 src/WHENCE $pkgdir/usr/share/licenses/$pkgname/WHENCE
 }