summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD57
2 files changed, 33 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c3b89645a5a..d7cf28c86e7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
-# Generated by mksrcinfo v8
-# Tue Jan 19 20:31:59 UTC 2016
pkgbase = brotli
- pkgdesc = Python compression library
- pkgver = 0.3.0
+ pkgdesc = Brotli compression library
+ pkgver = 0.6.0
pkgrel = 1
url = https://github.com/google/brotli
arch = i686
arch = x86_64
- license = Apache
+ license = MIT
+ makedepends = cmake
makedepends = python
makedepends = python2
- source = brotli-0.3.0.tar.gz::https://github.com/google/brotli/archive/v0.3.0.tar.gz
- sha256sums = 5d49eb1a6dd19304dd683c293abf66c8a419728f4c6d0f390fa7deb2a39eaae2
+ depends = gcc-libs
+ source = brotli-0.6.0.tar.gz::https://github.com/google/brotli/archive/v0.6.0.tar.gz
+ sha256sums = 69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f
pkgname = brotli
diff --git a/PKGBUILD b/PKGBUILD
index ea0afe3af1ef..d4a10728ded4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,54 @@
# Contributor: Lex Black <autumn-wind at web dot de>
# Contributor: TingPing <tingping@tingping.se>
+# Maintainer: Guillaume Horel <guillaume.horel@gmail.com>
pkgbase=brotli
pkgname=('brotli' 'python-brotli' 'python2-brotli')
-pkgver=0.3.0
+pkgver=0.6.0
pkgrel=1
-pkgdesc='Python compression library'
+pkgdesc='Brotli compression library'
arch=('i686' 'x86_64')
-license=('Apache')
+license=('MIT')
url='https://github.com/google/brotli'
-makedepends=('python' 'python2')
+depends=('gcc-libs')
+makedepends=('cmake' 'python' 'python2')
source=("$pkgbase-$pkgver.tar.gz::https://github.com/google/$pkgbase/archive/v$pkgver.tar.gz")
-sha256sums=('5d49eb1a6dd19304dd683c293abf66c8a419728f4c6d0f390fa7deb2a39eaae2')
+sha256sums=('69cdbdf5709051dd086a2f020f5abf9e32519eafe0ad6be820c667c3a9c9ee0f')
build() {
- cd "$pkgbase-$pkgver"
-
- msg 'Building Python 3...'
- python ./setup.py build_ext
-
- msg 'Building Python 2...'
- python2 ./setup.py build_ext
-
- msg 'Building bro...'
- cd tools && make
+ cd "$pkgbase-$pkgver"
+ python ./setup.py build
+ python2 ./setup.py build
+
+ mkdir -p build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_INSTALL_LIBDIR="/usr/lib"
+ make
}
check() {
- cd "$pkgbase-$pkgver"
-
- msg 'Testing Python 3...'
- python ./setup.py test
-
- msg 'Testing Python 2...'
- python2 ./setup.py test
+ cd "$pkgbase-$pkgver"
+ make test
}
package_brotli() {
- cd "$pkgbase-$pkgver/tools"
-
- install -Dm755 bro "$pkgdir/usr/bin/bro"
+ cd "$pkgbase-$pkgver/build"
+ make DESTDIR="$pkgdir" install
+ install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
package_python-brotli() {
- depends=('python')
+ depends=('python')
- cd "$pkgbase-$pkgver"
+ cd "$pkgbase-$pkgver"
- python ./setup.py install --skip-build --root="$pkgdir/"
+ python ./setup.py install --skip-build --root="$pkgdir/"
}
package_python2-brotli() {
- depends=('python2')
+ depends=('python2')
- cd "$pkgbase-$pkgver"
+ cd "$pkgbase-$pkgver"
- python2 ./setup.py install --skip-build --root="$pkgdir/"
+ python2 ./setup.py install --skip-build --root="$pkgdir/"
}