Makefile

@@ -106,8 +106,10 @@ $(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
 
 # aarch64 can use big-endian optimzied code
 ifeq ($(OS_ARCH),aarch64)
+ifeq ($(ENDIANESS),$(BIG_ENDIAN))
 SNAPPY_CXX_OPTS:=-DSNAPPY_IS_BIG_ENDIAN
 endif
+endif
 
 $(SNAPPY_OUT)/%.o: $(SNAPPY_SRC_DIR)/%.cc
 	@mkdir -p $(@D)

Makefile.common

@@ -11,6 +11,8 @@ JAVA  := "$$JAVA_HOME/bin/java"
 JAVAC := "$$JAVA_HOME/bin/javac"
 JAVAH := "$$JAVA_HOME/bin/javah"
 
+LITTLE_ENDIAN	:= "Little Endian"
+BIG_ENDIAN	:= "Big Endian"
 OSINFO_CLASS := org.xerial.snappy.OSInfo
 OSINFO_PROG := lib/org/xerial/snappy/OSInfo.class
 
@@ -24,6 +26,7 @@ OS_ARCH := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch)
 LIB_FOLDER := $(shell $(JAVA) -cp lib $(OSINFO_CLASS))
 IBM_JDK_LIB := lib/inc_ibm
 
+ENDIANESS=$(shell lscpu | grep "Byte Order" |cut -d ":" -f2)
 # Windows uses different path separators
 ifeq ($(OS_NAME),Windows)
 	sep := ;

build.sbt

@@ -109,10 +109,13 @@ libraryDependencies ++= Seq(
 
 enablePlugins(SbtOsgi)
 
+osgiSettings
+
 OsgiKeys.exportPackage := Seq("org.xerial.snappy", "org.xerial.snappy.buffer")
 OsgiKeys.bundleSymbolicName := "org.xerial.snappy.snappy-java"
 OsgiKeys.bundleActivator := Option("org.xerial.snappy.SnappyBundleActivator")
 OsgiKeys.importPackage := Seq("""org.osgi.framework;version="[1.5,2)"""")
+OsgiKeys.requireCapability := """osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))""""
 
 OsgiKeys.additionalHeaders := Map(
   "Bundle-NativeCode" -> Seq(
@@ -128,7 +131,7 @@ OsgiKeys.additionalHeaders := Map(
     "org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86",
     "org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so;osname=linux;processor=aarch64",
     "org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm",
-    "org/xerial/snappy/native/Linux/arm7/libsnappyjava.so;osname=linux;processor=arm_le",
+    "org/xerial/snappy/native/Linux/armv7/libsnappyjava.so;osname=linux;processor=arm_le",
     "org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le",
     "org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x",
     "org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc",

debian/changelog

+snappy-java (1.1.7.2-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Standards-Version updated to 4.2.1
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 05 Oct 2018 01:16:23 +0200
+
 snappy-java (1.1.7.1+dfsg-1) unstable; urgency=medium
 
   * Turn exclusions of orig-tar.sh into Files-Excluded

debian/control

 Source: snappy-java
-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Charles Plessy <plessy@debian.org>,
-           Andreas Tille <tille@debian.org>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders:
+ Charles Plessy <plessy@debian.org>,
+ Andreas Tille <tille@debian.org>
+Build-Depends:
+ debhelper (>= 11~),
+ libmaven-bundle-plugin-java,
  libsnappy-dev,
  maven-debian-helper
-Build-Depends-Indep: libmaven-bundle-plugin-java
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/java-team/snappy-java
 Vcs-Git: https://salsa.debian.org/java-team/snappy-java.git
 Homepage: https://github.com/xerial/snappy-java
 
 Package: libsnappy-java
 Architecture: all
-Depends: ${misc:Depends},
-         ${maven:Depends},
-         libsnappy-jni
+Depends: ${misc:Depends}, ${maven:Depends}, libsnappy-jni
 Description: Snappy for Java, a fast compressor/decompresser
  Java port of Snappy, a fast compresser/decompresser written in C++,
  originally developed by Google.
@@ -29,8 +29,7 @@ Description: Snappy for Java, a fast compressor/decompresser
 
 Package: libsnappy-jni
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Snappy for Java, a fast compressor/decompresser (JNI library)
  Java port of Snappy, a fast compresser/decompresser written in C++,
  originally developed by Google.

debian/watch

 version=4
-
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,repack,compression=xz" \
+opts="dversionmangle=s/\+dfsg//g,repack,compression=xz" \
   https://github.com/xerial/snappy-java/tags .*/([\d\.]+).tar.gz

src/main/java/org/xerial/snappy/SnappyOutputStream.java

@@ -41,6 +41,7 @@ import java.io.OutputStream;
  * The output data format is:
  * <ol>
  * <li>snappy codec header defined in {@link SnappyCodec} (8 bytes)
+ * <li>codec version (4 bytes integer, at least 1) and compatible version (4 bytes integer)
  * <li>compressed block 1 : a pair of (compressed data size [4 byte integer.
  * Big-endian], compressed data...)
  * <li>compressed block 2

version.sbt

-version in ThisBuild := "1.1.7.1"
+version in ThisBuild := "1.1.7.2"