From 237a6fc9242ea8c48d2bbd417a6ea14feaf7314a Mon Sep 17 00:00:00 2001
From: Johannes Demel <demel@uni-bremen.de>
Date: Sat, 5 Jun 2021 13:01:46 +0200
Subject: [PATCH] Release 2.5.0

---
 .lastrelease   |  2 +-
 CHANGELOG.md   | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 CMakeLists.txt |  4 +--
 3 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/.lastrelease b/.lastrelease
index a37212091..21222ceed 100644
--- a/.lastrelease
+++ b/.lastrelease
@@ -1 +1 @@
-v2.4.1
+v2.5.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78f6f326c..892b5b163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -443,3 +443,78 @@ Our v2.4.0 release introduced quite a lot of changes under the hood. With this b
 
 * Other
     - readme: Update TravisCI status badge
+
+
+## [2.5.0] - 2021-06-05
+
+Hi everyone!
+
+We have a new VOLK release! We are happy to announce VOLK v2.5.0! We want to thank all contributors. This release wouldn't have been possible without them.
+
+This release adds new kernel implementations and fixes. Some of these were longstanding PRs that could only be merged recently thanks to our switch from CLA to DCO.
+
+### Announcements
+
+I would like to point out one upcoming change. After this release, we will rename our development branch to `main` as discussed in [issue #461](https://github.com/gnuradio/volk/issues/461).
+
+
+I'd like to point the community to this [VOLK relicensing GREP](https://github.com/gnuradio/greps/pull/33).
+This is an ongoing effort to relicense VOLK under LGPLv3.
+We're looking for people and organizations that are interested in leading this effort.
+
+### Contributors
+
+* Aang23 <qwerty15@gmx.fr>
+* Carles Fernandez <carles.fernandez@gmail.com>
+* Florian Ritterhoff <ritterho@hm.edu>
+* Jam M. Hernandez Quiceno <jamarck96@gmail.com>, <jam_quiceno@partech.com>
+* Jaroslav Škarvada <jskarvad@redhat.com>
+* Johannes Demel <demel@uni-bremen.de>
+* Magnus Lundmark <magnus@skysense.io>
+* Michael Dickens <michael.dickens@ettus.com>
+* Steven Behnke <steven_behnke@me.com>
+* alesha72003 <alesha72003@ya.ru>
+* dernasherbrezon <rodionovamp@mail.ru>
+* rear1019 <rear1019@posteo.de>
+
+
+### Changes
+
+* Kernels
+    - volk_32f_stddev_and_mean_32f_x2: implemented Young and Cramer's algorithm
+    - volk_32fc_accumulator_s32fc: Add new kernel
+    - volk_16ic_x2_dot_prod_16ic_u_avx2: Fix Typo, was `_axv2`.
+    - Remove _mm256_zeroupper() calls
+    - Enforce consistent function prototypes
+    - 32fc_index_max: Improve speed of AVX2 version
+    - conv_k7_r2: Disable broken AVX2 code
+    - improve volk_8i_s32f_convert_32f for ARM NEON
+    - Calculate cos in AVX512F
+    - Calculate sin using AVX512F
+
+
+* Compilers
+    - MSVC
+        - Fix MSVC builds
+    - GCC
+        - Fix segmentation fault when using GCC 8
+    - MinGW
+        - add support and test for MinGW/MSYS2
+
+* The README has received several improvements
+
+* Build
+    - Fix python version detection
+    - cmake: Check that 'distutils' is available
+    - c11: Remove pre-C11 preprocessor instructions
+
+* CI
+    - Add more CI to GitHub Actions
+    - Remove redundant tests from TravisCI
+    - Add non-x86 GitHub Actions
+    - Update compiler names in CI
+    - Disable fail-fast CI
+    - Add more debug output to tests
+
+* Contributing
+    - contributing: Add CONTRIBUTING.md and DCO.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d0f7069f..e7495b0dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,8 @@ message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.")
 ########################################################################
 
 set(VERSION_INFO_MAJOR_VERSION 2)
-set(VERSION_INFO_MINOR_VERSION 4)
-set(VERSION_INFO_MAINT_VERSION 1)
+set(VERSION_INFO_MINOR_VERSION 5)
+set(VERSION_INFO_MAINT_VERSION 0)
 include(VolkVersion) #setup version info
 
 macro(set_version_str VAR)