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

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

1 files changed, 33 insertions, 29 deletions

diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 2d76e29a1..73aab20d1 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,51 +1,55 @@
 # Maintainer: David P. <megver83@parabola.nu>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=linux-libre-firmware
-pkgver=1.3
-pkgrel=2
+pkgver=1.3.1
+pkgrel=1
 epoch=1
 pkgdesc='Firmware files for Linux-libre'
-arch=('any')
+arch=(any)
 url='https://jxself.org/firmware'
-license=('GPL3' 'GPL2')
-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'
-           'kernel26-firmware'
-           'ar9170-fw'
-           'iwlwifi-1000-ucode'
-           'iwlwifi-3945-ucode'
-           'iwlwifi-4965-ucode'
-           'iwlwifi-5000-ucode'
-           'iwlwifi-5150-ucode'
-           'iwlwifi-6000-ucode'
-           'rt2870usb-fw'
-           'rt2x00-rt61-fw'
-           'rt2x00-rt71w-fw'
-           'amd-ucode'
-           'openfwwf'
-           'ath9k-htc-firmware')
+license=(GPL3)
+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
+           kernel26-firmware
+           ar9170-fw
+           iwlwifi-1000-ucode
+           iwlwifi-3945-ucode
+           iwlwifi-4965-ucode
+           iwlwifi-5000-ucode
+           iwlwifi-5150-ucode
+           iwlwifi-6000-ucode
+           rt2870usb-fw
+           rt2x00-rt61-fw
+           rt2x00-rt71w-fw
+           amd-ucode
+           openfwwf
+           ath9k-htc-firmware)
 replaces=(${conflicts[@]})
 options=(!buildflags !makeflags)
-source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch')
-sha512sums=('d3ead6924e686d0212c5993386fdf7ed1d2f68cb899517510ef488b2006a7bb9c1a8e511d23622e0342bdc70410c90291aad60adb2ac5db20c00b40a11508700'
+source=("$url/$pkgname-$pkgver.tar.lz"{,.asc}
+	0001-Add-offline-files-and-a-toolchain-option-in-Makefile.patch)
+sha512sums=('d827ec7024b4900dcdf6af8cdd4e72b02596d0ade5c2262460cd573785300498e6aa655b9a59cd22e38a6a787826a564ae33acfac52e68df1d082445e66f18df'
             'SKIP'
-            '028f18ab966bd6294034573fce4a8bb9be502ee31f28578803948847a824f5c477d59f21e3a99a8491df7ee24895631f110fd895125e319a875145eec55514fd')
+            '1aa4b3a463c0d24f295df2ea13e30d3b11a1af7abef3e03558036b07143b3262178a3b7ab6cc0cc7c255044f833e7df9a3cb18b98978e55737852fe0185dc22e')
 validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver/src
+
+  patch -p1 -i $srcdir/0001-Add-offline-files-and-a-toolchain-option-in-Makefile.patch
 
-  # do not download toolchains so we can build offline
-  patch -p0 -i ../remove-external-toolchains.patch
+  # Build carl9170 with the default config
+  sed '71s/autogen.sh/autogen.sh --alldefconfig/' -i Makefile
 }  
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make -C src
+  make toolchains= -C src
 }
 
 package() {