diff options
| author | TBK <tbk@jjtc.eu> | 2018-06-23 21:10:00 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-22 14:28:46 +0200 |
| commit | 5220530cc587c8cebc12e88b8013dddba10bca81 (patch) | |
| tree | 2775cdcb4cf59b9b976ce062d570be3db0af3e4f /main | |
| parent | 154a02a72aef756304d0b7ac575a06a08913cd73 (diff) | |
| download | aports-5220530cc587c8cebc12e88b8013dddba10bca81.tar.bz2 aports-5220530cc587c8cebc12e88b8013dddba10bca81.tar.xz | |
main/snappy: upgrade to 1.1.7 and rebuild dependent packages
Diffstat (limited to 'main')
| -rw-r--r-- | main/qemu/APKBUILD | 2 | ||||
| -rw-r--r-- | main/snappy/APKBUILD | 34 | ||||
| -rw-r--r-- | main/snappy/fix-GetHashTable.patch | 16 | ||||
| -rw-r--r-- | main/snappy/fix-UnalignedCopy64.patch | 13 |
4 files changed, 19 insertions, 46 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 2495b83f45..c3cfe14ef3 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu pkgver=2.12.0 -pkgrel=3 +pkgrel=4 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://qemu.org/" arch="all" diff --git a/main/snappy/APKBUILD b/main/snappy/APKBUILD index 749ede109e..9b1333ae38 100644 --- a/main/snappy/APKBUILD +++ b/main/snappy/APKBUILD @@ -1,37 +1,39 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=snappy -pkgver=1.1.4 -pkgrel=4 +pkgver=1.1.7 +pkgrel=0 pkgdesc="Fast compression and decompression library" -url="http://google.github.io/snappy/" +url="https://google.github.io/snappy/" arch="all" license="BSD-3-Clause" +makedepends="cmake" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc" -source="https://github.com/google/snappy/releases/download/$pkgver/snappy-$pkgver.tar.gz - fix-UnalignedCopy64.patch - fix-GetHashTable.patch - " -builddir="$srcdir/$pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz" build() { cd "$builddir" - ./configure \ - --prefix=/usr \ - --disable-static - make + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DBUILD_SHARED_LIBS=ON + cmake --build . } check() { cd "$builddir" - make check + ctest --verbose } package() { cd "$builddir" make DESTDIR="$pkgdir" install + + local file; for file in AUTHORS CONTRIBUTING.md COPYING NEWS README.md \ + format_description.txt framing_format.txt; do + install -m644 -D $file "$pkgdir"/usr/share/doc/$pkgname/$file + done } -sha512sums="4f522f1d541e3f00d82ccaf6dda5c6ede28d4db19c53717003d8057261fe8630516ed6ff2a28615da032e0de9c6200b560ed5fce4f8714df9916d50d6a7c2178 snappy-1.1.4.tar.gz -a086dbdfe2cb21419b33c2f8a2739224a8e843f2c6a51715100c723b9fbd9aed14bcfa791c20dae785b33ac1d1cf4812ed2c5c5d4058c5b8e56a0e004e9a8c60 fix-UnalignedCopy64.patch -8db7a634c9147286f01eb4bd0a5ff2138540c06acad5fb77aa2977f7b64a19b91ff0f886f650b0a38834a33895f7a1dd4bcfb93af7f6676d59e3fdb8b6efbea0 fix-GetHashTable.patch" +sha512sums="32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf snappy-1.1.7.tar.gz" diff --git a/main/snappy/fix-GetHashTable.patch b/main/snappy/fix-GetHashTable.patch deleted file mode 100644 index 0fdf88e472..0000000000 --- a/main/snappy/fix-GetHashTable.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix for armhf. - -See: https://groups.google.com/d/msg/snappy-compression/uhELq553TrI/J34d3D8_BwAJ - https://bugs.alpinelinux.org/issues/8921 - ---- a/snappy.cc -+++ b/snappy.cc -@@ -323,7 +323,7 @@ - *table_size = 256; - } else { - // Since table size must be a power of 2, round up to the next power of 2. -- *table_size = 1 << (std::numeric_limits<size_t>::digits - -+ *table_size = 1 << std::max(1, std::numeric_limits<size_t>::digits - - __builtin_clzll(input_size - 1)); - } - if (*table_size <= ARRAYSIZE(small_table_)) { diff --git a/main/snappy/fix-UnalignedCopy64.patch b/main/snappy/fix-UnalignedCopy64.patch deleted file mode 100644 index ea64639a17..0000000000 --- a/main/snappy/fix-UnalignedCopy64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/snappy.cc b/snappy.cc -index 4bcea0b..2db94b7 100644 ---- a/snappy.cc -+++ b/snappy.cc -@@ -89,7 +89,7 @@ size_t MaxCompressedLength(size_t source_len) { - namespace { - - void UnalignedCopy64(const void* src, void* dst) { -- memcpy(dst, src, 8); -+ memmove(dst, src, 8); - } - - void UnalignedCopy128(const void* src, void* dst) { |