summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/linux-libre-firmware/PKGBUILD24
-rw-r--r--libre/linux-libre-firmware/remove-wget.patch7
2 files changed, 9 insertions, 22 deletions
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 5a281751e..3597f2c41 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=linux-libre-firmware
-pkgver=1.1
-pkgrel=4
+pkgver=1.2
+pkgrel=1
epoch=1
pkgdesc='Firmware files for Linux-libre'
arch=('any')
@@ -34,14 +34,14 @@ options=(!strip)
source=("${url}/${pkgname}-${pkgver}.tar.lz"{,.asc}
'remove-wget.patch' # remove the download of external toolchains
)
-sha512sums=('4ef111f86e8a87bab31e02be171e09f47d71884f1737f5329e9dd07e9f799436d8ff2de5aa0b2cfb4bc921ed02bb2b59b9a1ea69176dcef5f902364d8725e75a'
+sha512sums=('2f70207ae7a98a71b74950a909e899c58617e46693a4b069cd16de1b2f0bb31c6abb07c0f4db88b5cecc3f3c50da56265da0b771c58b164981d628231f130387'
'SKIP'
- '60b58bed66e737148a5954c18efb1113518f14cf43ee2b6e7e8cdabe253a6db1c0d696f01eb25ecda7a8d3300afcf0169fa35f5eb123211554f08710f2c26ea2')
+ 'b5327fb56c1881f2eb834181a5a22df3ec08f90cccef3a71f7b194b845cb2610f7c1a7d8d7b9d8194959938a1c4bec613da6e8311cef57c7379be8964c9997d9')
validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self
prepare() {
cd $srcdir/$pkgname-$pkgver
-
+
# Some firmwares download toolchains with wget. We don't want that
patch -p1 -i ../remove-wget.patch
@@ -52,14 +52,6 @@ prepare() {
build() {
cd "${srcdir}/${pkgname}-${pkgver}/src"
-
- if [ $CARCH = x86_64 ]; then
- # Building as31 with -O2 in 64-bits systems will
- # make usbdux result into a segmentation fault
- # Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887320
- CFLAGS=${CFLAGS/-O2/-O0}
- fi
-
make
}
@@ -68,10 +60,6 @@ package() {
install -dm755 $pkgdir/usr/lib/firmware
make prefix=$pkgdir/usr/lib/firmware install
-
- # ath9k_htc works only if it's located at /usr/lib/firmware
- mv $pkgdir/usr/lib/firmware/ath9k_htc/* $pkgdir/usr/lib/firmware
- rm -r $pkgdir/usr/lib/firmware/ath9k_htc
-
+
install -Dm644 WHENCE $pkgdir/usr/share/licenses/$pkgname/WHENCE
}
diff --git a/libre/linux-libre-firmware/remove-wget.patch b/libre/linux-libre-firmware/remove-wget.patch
index 3928c07bb..f2364631c 100644
--- a/libre/linux-libre-firmware/remove-wget.patch
+++ b/libre/linux-libre-firmware/remove-wget.patch
@@ -1,5 +1,5 @@
diff --git a/src/Makefile b/src/Makefile
-index 5c1ddf2..3e66265 100644
+index 122f659..89a8209 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,7 +17,7 @@ shell=/bin/sh
@@ -50,17 +50,16 @@ index 5c1ddf2..3e66265 100644
cd dsp56k && $(MAKE) clean
cd ihex2fw && $(MAKE) clean
diff --git a/src/ath9k_htc/Makefile b/src/ath9k_htc/Makefile
-index ee5e61b..99c94fc 100644
+index ee5e61b..3f9c66d 100644
--- a/src/ath9k_htc/Makefile
+++ b/src/ath9k_htc/Makefile
-@@ -1,149 +1,12 @@
+@@ -1,149 +1,11 @@
-GMP_VER=6.1.1
-GMP_URL=https://ftp.gnu.org/gnu/gmp/gmp-$(GMP_VER).tar.bz2
-GMP_TAR=gmp-$(GMP_VER).tar.bz2
-GMP_DIR=gmp-$(GMP_VER)
-GMP_SUM=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
+CFLAGS = -mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4 -fno-aggressive-loop-optimizations -Wno-implicit-function-declaration
-+CXXFLAGS = $(CFLAGS)
-MPFR_VER=3.1.4
-MPFR_URL=https://ftp.gnu.org/gnu/mpfr/mpfr-$(MPFR_VER).tar.bz2