version bump

3 files changed, 39 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfdef69dc69d..b3043b171451 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = apache-orc
 	pkgdesc = A columnar storage for Hadoop workloads.
-	pkgver = 1.5.6
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = https://orc.apache.org
 	arch = x86_64
@@ -10,9 +10,12 @@ pkgbase = apache-orc
 	makedepends = protobuf-static
 	makedepends = snappy-static
 	makedepends = zlib-static
+	makedepends = zstd-static
 	options = staticlibs
-	source = orc-1.5.6.tar.gz::https://github.com/apache/orc/archive/rel/release-1.5.6.tar.gz
-	sha256sums = d19e6dc84c928e7a7f4feea48fc1d51541d0f930349531b3520a69c047864bc2
+	source = orc-1.6.1.tar.gz::https://github.com/apache/orc/archive/rel/release-1.6.1.tar.gz
+	source = cmake.patch
+	sha256sums = 92948388c7b188e2e1f3b880cae2c87571a9f8f312c32f58f64f5ab59bcdadfe
+	sha256sums = e670220ab16b05c7d847d3631d459a165ae07c2714725603ce30f5060ca98ea6
 
 pkgname = apache-orc
 
diff --git a/PKGBUILD b/PKGBUILD
index 54128b92269d..d291c66a0811 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume Horel <guillaume.horel@gmail.com>
 
 pkgname='apache-orc'
-pkgver=1.5.6
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="A columnar storage for Hadoop workloads."
 arch=('x86_64')
@@ -10,12 +10,15 @@ license=('Apache')
 depends=()
 options=('staticlibs')
 optdepends=()
-makedepends=('cmake' 'lz4-static' 'protobuf-static' 'snappy-static' 'zlib-static')
-source=("orc-$pkgver.tar.gz::https://github.com/apache/orc/archive/rel/release-$pkgver.tar.gz")
-sha256sums=('d19e6dc84c928e7a7f4feea48fc1d51541d0f930349531b3520a69c047864bc2')
+makedepends=('cmake' 'lz4-static' 'protobuf-static' 'snappy-static' 'zlib-static' 'zstd-static')
+source=("orc-$pkgver.tar.gz::https://github.com/apache/orc/archive/rel/release-$pkgver.tar.gz"
+  "cmake.patch")
+sha256sums=('92948388c7b188e2e1f3b880cae2c87571a9f8f312c32f58f64f5ab59bcdadfe'
+            'e670220ab16b05c7d847d3631d459a165ae07c2714725603ce30f5060ca98ea6')
 
 prepare() {
   cd "$srcdir"
+  patch -p0 < cmake.patch
   mkdir -p build
 }
 
@@ -31,6 +34,8 @@ build(){
   -DSNAPPY_HOME="/usr" \
   -DBUILD_LIBHDFSPP=OFF \
   -DBUILD_JAVA=OFF \
+  -DZSTD_HOME="/usr" \
+  -DINSTALL_VENDORED_LIBS=OFF \
   ../orc-rel-release-$pkgver
   make
 }
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..59d3f963a63f
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,24 @@
+diff -urN orc-rel-release-1.6.1-orig/cmake_modules/FindZSTD.cmake orc-rel-release-1.6.1/cmake_modules/FindZSTD.cmake
+--- orc-rel-release-1.6.1-orig/cmake_modules/FindZSTD.cmake	2019-10-23 12:18:30.000000000 -0400
++++ orc-rel-release-1.6.1/cmake_modules/FindZSTD.cmake	2019-11-13 13:38:47.394063996 -0500
+@@ -32,7 +32,7 @@
+         NO_DEFAULT_PATH
+         PATH_SUFFIXES "include")
+ 
+-find_library (ZSTD_LIBRARIES NAMES ${ZSTD_STATIC_LIB_NAME} HINTS
++find_library (ZSTD_LIBRARIES NAMES zstd HINTS
+         ${_zstd_path}
+         PATH_SUFFIXES "lib")
+ 
+diff -urN orc-rel-release-1.6.1-orig/cmake_modules/ThirdpartyToolchain.cmake orc-rel-release-1.6.1/cmake_modules/ThirdpartyToolchain.cmake
+--- orc-rel-release-1.6.1-orig/cmake_modules/ThirdpartyToolchain.cmake	2019-10-23 12:18:30.000000000 -0400
++++ orc-rel-release-1.6.1/cmake_modules/ThirdpartyToolchain.cmake	2019-11-13 13:38:25.926669476 -0500
+@@ -136,7 +136,7 @@
+ # Zstd
+ 
+ if (NOT "${ZSTD_HOME}" STREQUAL "")
+-  find_package (zstd REQUIRED)
++  find_package (ZSTD REQUIRED)
+   set(ZSTD_VENDORED FALSE)
+ else ()
+   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")