linux-libre-firmware: split whence, add new conflicts

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

1 files changed, 53 insertions, 46 deletions

diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 1c995074b..236ccd303 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,57 +1,29 @@
 # 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
+pkgbase=linux-libre-firmware
+pkgname=(linux-libre-firmware{,-whence})
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Firmware files for Linux-libre'
 arch=(any)
 url='https://jxself.org/firmware'
 license=(GPL3)
-makedepends=(arm-linux-gnueabi-gcc           # av7110
-             arm-none-eabi-gcc               # aica
-             avr-gcc avr-libc dfu-util       # atusb
-             sh-elf-gcc sh-elf-newlib cmake  # carl9170fw
-             xtensa-elf-gcc                  # ath9k_htc
+makedepends=(
+  arm-linux-gnueabi-gcc           # av7110
+  arm-none-eabi-gcc               # aica
+  avr-gcc avr-libc dfu-util       # atusb
+  sh-elf-gcc sh-elf-newlib cmake  # carl9170fw
+  xtensa-elf-gcc                  # ath9k_htc
 )
-optdepends=('dfu-util: to flash the atusb firmware')
-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
-           openfwwf
-           ath9k-htc-firmware)
-replaces=(${conflicts[@]})
 options=(!buildflags !makeflags)
-source=("$url/$pkgname-$pkgver.tar.lz"{,.asc})
+source=("$url/$pkgbase-$pkgver.tar.lz"{,.asc})
 sha512sums=('3b4c8afb63c55f05df0b2686459c6bb2c0cb56db8384d5527506ff4a14b8de80e1a3037a9b57cccccd6953d869c6a71a6500c4c7b735253ea0b57c79854d9457'
             'SKIP')
-validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self
+validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self <j@jxself.org>
 
-prepare(){
-  cd "$pkgname-$pkgver/src"
-
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    patch -Np1 < "$srcdir/$src"
-  done
+prepare() {
+  cd "$pkgbase-$pkgver/src"
 
   # Use our cross compilers
   sed -e 's|$PWD/../toolchain/inst/bin/||g' \
@@ -67,13 +39,48 @@ prepare(){
       -i Makefile
 }
 
-build(){
-  make -C "$pkgname-$pkgver/src"
+build() {
+  make -C "$pkgbase-$pkgver/src"
+}
+
+package_linux-libre-firmware() {
+  provides=(linux-firmware)
+  conflicts=(
+    linux-firmware
+    linux-firmware-git
+    linux-firmware-bnx2x
+    linux-firmware-liquidio
+    linux-firmware-marvell
+    linux-firmware-mellanox
+    linux-firmware-nfp
+    linux-firmware-qcom
+    linux-firmware-qlogic
+    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
+    openfwwf
+    ath9k-htc-firmware
+  )
+  replaces=("${conflicts[@]}")
+  optdepends=('dfu-util: to flash the atusb firmware')
+
+  make -C "$pkgbase-$pkgver/src" prefix="$pkgdir/usr/lib/firmware" install
 }
 
-package(){
-  cd "$pkgname-$pkgver/src"
+package_linux-libre-firmware-whence() {
+  pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
+  provides=(linux-firmware-whence)
+  conflicts=(linux-firmware-whence)
+  replaces=(linux-firmware-whence)
 
-  make prefix="$pkgdir/usr/lib/firmware install"
+  cd "$pkgbase-$pkgver/src"
   install -Dm644 WHENCE "$pkgdir/usr/share/licenses/$pkgname/WHENCE"
 }