diff -Nru volk-2.3.0/debian/changelog volk-2.3.0/debian/changelog
--- volk-2.3.0/debian/changelog	2020-06-30 23:48:20.000000000 +0000
+++ volk-2.3.0/debian/changelog	2020-07-06 14:22:31.000000000 +0000
@@ -1,3 +1,13 @@
+volk (2.3.0-3+rpi1) bullseye-staging; urgency=medium
+
+  [changes brought forward from 1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 20 Sep 2015 20:30:19 +0000]
+  * Disable neon.
+
+  [changes introduced in 2.1.0-2+rpi1 by Peter Michael Green]
+  * Add bulid-depends-indep on texlive-latex-extra.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Jul 2020 14:22:31 +0000
+
 volk (2.3.0-3) unstable; urgency=medium
 
   * update to v2.3.0-14-g91e5d07
diff -Nru volk-2.3.0/debian/control volk-2.3.0/debian/control
--- volk-2.3.0/debian/control	2020-05-09 20:07:38.000000000 +0000
+++ volk-2.3.0/debian/control	2020-07-06 14:22:31.000000000 +0000
@@ -9,7 +9,7 @@
                liborc-0.4-dev,
 	       python3-dev,
 	       python3-mako
-Build-Depends-Indep: doxygen
+Build-Depends-Indep: doxygen, texlive-latex-extra,
 Standards-Version: 4.5.0
 Homepage: http://libvolk.org
 Vcs-Browser: https://salsa.debian.org/bottoms/pkg-volk
diff -Nru volk-2.3.0/debian/patches/disable-neon volk-2.3.0/debian/patches/disable-neon
--- volk-2.3.0/debian/patches/disable-neon	1970-01-01 00:00:00.000000000 +0000
+++ volk-2.3.0/debian/patches/disable-neon	2020-07-06 14:22:31.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Disable neon.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- volk-2.1.0.orig/lib/CMakeLists.txt
++++ volk-2.1.0/lib/CMakeLists.txt
+@@ -273,7 +273,8 @@ else(neon_compile_result)
+     OVERRULE_ARCH(neonv8 "Compiler doesn't support NEON")
+ endif(neon_compile_result)
+ 
+-########################################################################
++OVERRULE_ARCH(neon "We don't want neon on raspbian")
++
+ # implement overruling in the ORC case,
+ # since ORC always passes flag detection
+ ########################################################################
+@@ -441,7 +442,7 @@ set(FULL_C_FLAGS "${CMAKE_C_FLAGS}" "${C
+ # set up the assembler flags and include the source files
+ foreach(ARCH ${ASM_ARCHS_AVAILABLE})
+   string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}")
+-if( ASM_ARCH STREQUAL "neonv7" )
++if( ASM_ARCH STREQUAL "neonv7xxxxxxxxxx" )
+   message(STATUS "---- Adding ASM files") # we always use ATT syntax
+   message(STATUS "-- Detected neon architecture; enabling ASM")
+   # architecture specific assembler flags are now set in the cmake toolchain file
diff -Nru volk-2.3.0/debian/patches/series volk-2.3.0/debian/patches/series
--- volk-2.3.0/debian/patches/series	2020-06-30 23:37:15.000000000 +0000
+++ volk-2.3.0/debian/patches/series	2020-07-06 14:22:31.000000000 +0000
@@ -10,3 +10,4 @@
 make-acc-happy
 optional-static-apps
 remove-external-HTML-resources
+disable-neon
\ No newline at end of file