From 11d1187db0437a873f6c1ad297df5f3b076be75f Mon Sep 17 00:00:00 2001
From: sekrit-twc <noreply@example.com>
Date: Fri, 16 Apr 2021 12:23:17 -0700
Subject: [PATCH 1/2] common: fix alignment for ARM

(cherry picked from commit 90bf82c7202fa5fd37775db3c98799be899231f6)
---
 src/zimg/common/align.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zimg/common/align.h b/src/zimg/common/align.h
index a30468c1..d53bd72b 100644
--- a/src/zimg/common/align.h
+++ b/src/zimg/common/align.h
@@ -8,9 +8,12 @@ namespace zimg {
 /**
  * 64-byte alignment allows the use of instructions up to AVX-512.
  */
-#ifdef ZIMG_X86
+#if defined(ZIMG_X86)
 constexpr int ALIGNMENT = 64;
 constexpr int ALIGNMENT_RELAXED = 32;
+#elif defined(ZIMG_ARM)
+constexpr int ALIGNMENT = 16;
+constexpr int ALIGNMENT_RELAXED = 16;
 #else
 constexpr int ALIGNMENT = sizeof(long double);
 constexpr int ALIGNMENT_RELAXED = sizeof(long double);

From 8d0b8396de15cbcbba06f1378243019e234b1bec Mon Sep 17 00:00:00 2001
From: sekrit-twc <noreply@example.com>
Date: Fri, 30 Apr 2021 16:35:18 -0700
Subject: [PATCH 2/2] Update version to 3.0.2

---
 ChangeLog             | 4 ++++
 configure.ac          | 2 +-
 src/zimg/api/zimg.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28e0d81c..674d5d28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+3.0.2
+colorspace: fix underflow in AVX-512 ST.2084 transfer functions
+arm: fix data alignment
+
 3.0.1
 graph: fix handling of default nominal_peak_luminance (introduced in 3.0)
 
diff --git a/configure.ac b/configure.ac
index e2a202b1..7ce9a83c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([zimg], [3.0.1], [https://github.com/sekrit-twc/zimg/pulls], [zimg], [https://github.com/sekrit-twc/zimg])
+AC_INIT([zimg], [3.0.2], [https://github.com/sekrit-twc/zimg/pulls], [zimg], [https://github.com/sekrit-twc/zimg])
 AC_CONFIG_MACRO_DIR([m4])
 
 : ${CFLAGS=""}
diff --git a/src/zimg/api/zimg.cpp b/src/zimg/api/zimg.cpp
index 8e1e9724..19cdf0aa 100644
--- a/src/zimg/api/zimg.cpp
+++ b/src/zimg/api/zimg.cpp
@@ -37,7 +37,7 @@ constexpr unsigned API_VERSION_2_4 = ZIMG_MAKE_API_VERSION(2, 4);
 thread_local zimg_error_code_e g_last_error = ZIMG_ERROR_SUCCESS;
 thread_local std::string g_last_error_msg;
 
-constexpr unsigned VERSION_INFO[] = { 3, 0, 1 };
+constexpr unsigned VERSION_INFO[] = { 3, 0, 2 };
 
 
 template <class T, class U>