aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2020-12-25 20:17:58 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2020-12-29 10:18:30 +0000
commite56dec2e9fc27a3678e5c34f808d652cfcd02e8a (patch)
tree2f70b8d5c6c6b67c51163c1a075e5a231796d5ac
parent8c1b793f43fa3d72db150f0af62ca35a9265d859 (diff)
downloadaports-e56dec2e9fc27a3678e5c34f808d652cfcd02e8a.tar.gz
aports-e56dec2e9fc27a3678e5c34f808d652cfcd02e8a.tar.bz2
aports-e56dec2e9fc27a3678e5c34f808d652cfcd02e8a.tar.xz
community/snappy-java: upgrade to 1.1.8.2
-rw-r--r--community/java-snappy/APKBUILD12
-rw-r--r--community/java-snappy/unbundle-snappy.patch16
2 files changed, 12 insertions, 16 deletions
diff --git a/community/java-snappy/APKBUILD b/community/java-snappy/APKBUILD
index ec7b679e9c..3217d5b27f 100644
--- a/community/java-snappy/APKBUILD
+++ b/community/java-snappy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=java-snappy
_pkgname=snappy-java
-pkgver=1.1.7.3
+pkgver=1.1.8.2
_libver=${pkgver%.*}
pkgrel=0
pkgdesc="Snappy compressor/decompressor for Java"
@@ -13,7 +13,7 @@ options="!check" # Tests does not work correctly
depends="openjdk8-jre-base"
makedepends="bash openjdk8 perl snappy-dev>=$_libver"
subpackages="$pkgname-native"
-source="$pkgname-$pkgver.tar.gz::https://github.com/xerial/$_pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/xerial/snappy-java/archive/$pkgver.tar.gz
unbundle-snappy.patch
"
builddir="$srcdir/$_pkgname-$pkgver"
@@ -21,8 +21,6 @@ builddir="$srcdir/$_pkgname-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
-
# Get rid of bundled native binaries.
rm -r src/main/resources/org/xerial/snappy/native
@@ -33,8 +31,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
JAVA_HOME="/usr/lib/jvm/default-jvm" make
msg "Downloading SBT and then building JAR (this will take few minutes)..."
@@ -58,5 +54,5 @@ native() {
ln -sf $soname.$_libver "$subpkgdir"/usr/lib/$soname
}
-sha512sums="ece8d388c62e3c405eba2c9458c6c3d5996c6570189825b02108f87f4c05723161bb6db0ca91dbd509e58fd1830f31c4546a4c211d31fa0efd5b46065e1156a8 java-snappy-1.1.7.3.tar.gz
-3533a62aefa0f2b9943fa7a360c38c468eb6917fc709ad8ae3de597e91ae8ebe935697a24a7fdbba6ecebe2e416806e35db66cce42570c62f2c880c59c0c6e62 unbundle-snappy.patch"
+sha512sums="28560918927dffe54db7dc0a4cb85b2c585b169faaf4e51f6eb27189f1e67ffde369302527c8cb370b1950e9222295ecb63288f0325601ca41324d5d02088be7 java-snappy-1.1.8.2.tar.gz
+6531908df96e41b3c31cf6096164803223a81d6eec411b7b98e04ba9c033d387bd3cb00b1d830e923ccbb76492014946055d6fd1651afce2b7df136cfa5acf6c unbundle-snappy.patch"
diff --git a/community/java-snappy/unbundle-snappy.patch b/community/java-snappy/unbundle-snappy.patch
index edd6fd56df..bbaaafde74 100644
--- a/community/java-snappy/unbundle-snappy.patch
+++ b/community/java-snappy/unbundle-snappy.patch
@@ -7,16 +7,16 @@ snappy from the upstream.
--- a/Makefile
+++ b/Makefile
-@@ -8,7 +8,7 @@
+@@ -10,7 +10,7 @@
SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
+-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy-c.cc snappy.cc
+SNAPPY_CC:=
SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
-@@ -84,9 +84,9 @@
+@@ -86,9 +86,9 @@
cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR)
touch $@
@@ -29,15 +29,15 @@ snappy from the upstream.
$(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java
@mkdir -p $(TARGET)/jni-classes
@@ -102,7 +102,7 @@
+
$(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
- $(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.BitShuffleNative
-$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
+$(SNAPPY_SRC):
# aarch64 can use big-endian optimzied code
ifeq ($(OS_ARCH),aarch64)
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
$(CXX) $(CXXFLAGS) -c $< -o $@
$(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
@@ -46,16 +46,16 @@ snappy from the upstream.
# Workaround for strip Protocol error when using VirtualBox on Mac
cp $@ /tmp/$(@F)
$(STRIP) /tmp/$(@F)
-@@ -142,7 +142,7 @@
+@@ -144,7 +144,7 @@
native: jni-header snappy-header $(NATIVE_DLL)
native-nocmake: jni-header $(NATIVE_DLL)
-snappy: native $(TARGET)/$(snappy-jar-version).jar
+snappy: native
- native-all: win32 win64 mac64 native-arm linux32 linux64 linux-ppc64le linux-aarch64
+ native-all: native mac64 win32 win64 native-arm linux32 linux64 linux-ppc64le
-@@ -151,6 +151,7 @@
+@@ -153,6 +153,7 @@
cp $(SNAPPY_OUT)/$(LIBNAME) $@
@mkdir -p $(NATIVE_TARGET_DIR)
cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME)