update pkgver to 1.1.7

3 files changed, 50 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27009e64a094..7090dea05992 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 # Generated by mksrcinfo v8
-# Thu Dec  1 16:49:08 UTC 2016
+# Sat Dec  2 00:59:22 UTC 2017
 pkgbase = libsnappy
 	pkgdesc = A fast compression/decompression library
-	pkgver = 1.1.3
-	pkgrel = 4
+	pkgver = 1.1.7
+	pkgrel = 1
 	url = https://google.github.io/snappy/
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = autoconf
-	makedepends = automake
+	makedepends = cmake
 	makedepends = git
-	makedepends = libtool
-	makedepends = m4
 	makedepends = make
 	makedepends = pkg-config
+	depends = lzo
+	depends = zlib
 	provides = snappy
 	conflicts = snappy
-	source = libsnappy-1.1.3::git+https://github.com/google/snappy
-	sha256sums = SKIP
+	source = libsnappy-1.1.7.tar.gz::https://codeload.github.com/google/snappy/tar.gz/1.1.7
+	source = snappy.pc
+	sha256sums = 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4
+	sha256sums = d210ff4d3ffe9a987b974a8387d967af66a93bf90d72fedce94a2159d937813e
 
 pkgname = libsnappy
 
diff --git a/PKGBUILD b/PKGBUILD
index b6262eb6da89..c8340037230c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,42 +3,54 @@
 # Contributor: Antony Male <antony dot male at geemail dot com>>
 
 pkgname=libsnappy
-pkgver=1.1.3
-pkgrel=4
+pkgver=1.1.7
+pkgrel=1
 pkgdesc="A fast compression/decompression library"
 arch=('i686' 'x86_64')
-makedepends=('autoconf' 'automake' 'git' 'libtool' 'm4' 'make' 'pkg-config')
+depends=('lzo' 'zlib')
+makedepends=('cmake' 'git' 'make' 'pkg-config')
 url="https://google.github.io/snappy/"
 license=('BSD')
-source=($pkgname-$pkgver::git+https://github.com/google/snappy)
-sha256sums=('SKIP')
+source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/google/${pkgname#lib}/tar.gz/$pkgver
+        snappy.pc)
+sha256sums=('3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4'
+            'd210ff4d3ffe9a987b974a8387d967af66a93bf90d72fedce94a2159d937813e')
 provides=('snappy')
 conflicts=('snappy')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/${pkgname#lib}-$pkgver"
 
   msg2 'Building...'
   # compile without assertions
-  export CXXFLAGS+=\ -DNDEBUG
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/snappy \
-    --sysconfdir=/etc \
-    --sharedstatedir=/usr/share/snappy \
-    --localstatedir=/var/lib/snappy \
-    --with-gnu-ld
+  CXXFLAGS+=\ -DNDEBUG
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=on \
+    .
   make
 }
 
+check() {
+  cd "$srcdir/${pkgname#lib}-$pkgver"
+
+  # compile without assertions
+  CXXFLAGS+=\ -DNDEBUG
+  make test
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/${pkgname#lib}-$pkgver"
 
   msg2 'Installing license...'
-  install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/libsnappy"
+  install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
 
   msg2 'Installing...'
   make DESTDIR="$pkgdir" install
+
+  # remove this after the file exists upstream again
+  # https://github.com/google/snappy/pull/55
+  install -Dm 644 "$srcdir/snappy.pc" -t "$pkgdir/usr/lib/pkgconfig"
 }
diff --git a/snappy.pc b/snappy.pc
new file mode 100644
index 000000000000..c5ec37dd7ba9
--- /dev/null
+++ b/snappy.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: snappy
+Description: A fast compression/decompression library
+Version: 1.1.4
+Libs: -L${libdir} -lsnappy
+Cflags: -I${includedir}