diff -Nru libsoxr-0.1.3/debian/changelog libsoxr-0.1.3/debian/changelog --- libsoxr-0.1.3/debian/changelog 2020-05-06 14:13:53.000000000 +0000 +++ libsoxr-0.1.3/debian/changelog 2020-05-13 14:44:26.000000000 +0000 @@ -1,3 +1,11 @@ +libsoxr (0.1.3-4+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 0.1.3-1+rpi1 by Peter Michael Green at Mon, 07 Oct 2019 23:54:42 +0000] + * Disable neon until upstream clarifies whether it is behind runtime CPU + detection. + + -- Raspbian forward porter Wed, 13 May 2020 14:44:26 +0000 + libsoxr (0.1.3-4) unstable; urgency=medium * Team upload. diff -Nru libsoxr-0.1.3/debian/patches/disable-neon.patch libsoxr-0.1.3/debian/patches/disable-neon.patch --- libsoxr-0.1.3/debian/patches/disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ libsoxr-0.1.3/debian/patches/disable-neon.patch 2020-05-13 14:44:26.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Disable neon until upstream clarifies whether it is behind runtime CPU detection. +Author: Peter Michael Green + +--- libsoxr-0.1.3.orig/cmake/Modules/FindSIMD32.cmake ++++ libsoxr-0.1.3/cmake/Modules/FindSIMD32.cmake +@@ -12,10 +12,10 @@ if (DEFINED SIMD32_C_FLAGS) + elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set (TRIAL_C_FLAGS + # Gcc +- "-mfpu=neon-vfpv4 -mcpu=cortex-a7" +- "-mfpu=neon -mfloat-abi=hard" +- "-mfpu=neon -mfloat-abi=softfp" +- "-mfpu=neon -mfloat-abi=soft" ++ "-mxfpu=neon-vfpv4 -mcpu=cortex-a7" ++ "-mxfpu=neon -mfloat-abi=hard" ++ "-mxfpu=neon -mfloat-abi=softfp" ++ "-mxfpu=neon -mfloat-abi=soft" + ) + set (TEST_C_SOURCE " + #include diff -Nru libsoxr-0.1.3/debian/patches/series libsoxr-0.1.3/debian/patches/series --- libsoxr-0.1.3/debian/patches/series 2020-05-06 14:13:53.000000000 +0000 +++ libsoxr-0.1.3/debian/patches/series 2020-05-13 14:44:26.000000000 +0000 @@ -1 +1,2 @@ fix-cmake-set-project-version.patch +disable-neon.patch