diff -Nru gegl-0.4.38/debian/changelog gegl-0.4.38/debian/changelog --- gegl-0.4.38/debian/changelog 2022-07-28 18:17:44.000000000 +0000 +++ gegl-0.4.38/debian/changelog 2022-08-27 12:19:28.000000000 +0000 @@ -1,3 +1,10 @@ +gegl (1:0.4.38-1+rpi1) bookworm-staging; urgency=medium + + * Disable neon, it seems to have problems on systems with first + generation neon. + + -- Peter Michael Green Sat, 27 Aug 2022 12:19:28 +0000 + gegl (1:0.4.38-1) unstable; urgency=medium * New upstream release diff -Nru gegl-0.4.38/debian/libgegl-0.4-0.symbols gegl-0.4.38/debian/libgegl-0.4-0.symbols --- gegl-0.4.38/debian/libgegl-0.4-0.symbols 2022-07-28 18:17:44.000000000 +0000 +++ gegl-0.4.38/debian/libgegl-0.4-0.symbols 2022-08-27 12:19:28.000000000 +0000 @@ -272,13 +272,13 @@ gegl_dot_visitor_get_type@Base 0.3.0 gegl_dot_visitor_set_string_to_append@Base 0.3.0 gegl_downscale_2x2@Base 0.3.0 - (arch=armel armhf)gegl_downscale_2x2_arm_neon@Base 1:0.4.36-2 + (optional=neon)gegl_downscale_2x2_arm_neon@Base 1:0.4.36-2 gegl_downscale_2x2_generic@Base 1:0.4.36 - (arch=armel armhf)gegl_downscale_2x2_get_fun_arm_neon@Base 1:0.4.36-2 + (optional=neon)gegl_downscale_2x2_get_fun_arm_neon@Base 1:0.4.36-2 gegl_downscale_2x2_get_fun_generic@Base 1:0.4.36 (arch=amd64 x32)gegl_downscale_2x2_get_fun_x86_64_v2@Base 1:0.4.36 (arch=amd64 x32)gegl_downscale_2x2_get_fun_x86_64_v3@Base 1:0.4.36 - (arch=armel armhf)gegl_downscale_2x2_nearest_arm_neon@Base 1:0.4.36-2 + (optional=neon)gegl_downscale_2x2_nearest_arm_neon@Base 1:0.4.36-2 gegl_downscale_2x2_nearest_generic@Base 1:0.4.36 (arch=amd64 x32)gegl_downscale_2x2_nearest_x86_64_v2@Base 1:0.4.36 (arch=amd64 x32)gegl_downscale_2x2_nearest_x86_64_v3@Base 1:0.4.36 @@ -733,17 +733,17 @@ gegl_render_op@Base 0.3.0 gegl_render_op_valist@Base 0.3.0 gegl_resample_bilinear@Base 0.3.2 - (arch=armel armhf)gegl_resample_bilinear_arm_neon@Base 1:0.4.36-2 + (optional=neon)gegl_resample_bilinear_arm_neon@Base 1:0.4.36-2 gegl_resample_bilinear_generic@Base 1:0.4.36 (arch=amd64 x32)gegl_resample_bilinear_x86_64_v2@Base 1:0.4.36 (arch=amd64 x32)gegl_resample_bilinear_x86_64_v3@Base 1:0.4.36 gegl_resample_boxfilter@Base 0.3.0 - (arch=armel armhf)gegl_resample_boxfilter_arm_neon@Base 1:0.4.36-2 + (optional=neon)gegl_resample_boxfilter_arm_neon@Base 1:0.4.36-2 gegl_resample_boxfilter_generic@Base 1:0.4.36 (arch=amd64 x32)gegl_resample_boxfilter_x86_64_v2@Base 1:0.4.36 (arch=amd64 x32)gegl_resample_boxfilter_x86_64_v3@Base 1:0.4.36 gegl_resample_nearest@Base 0.3.0 - (arch=armel armhf)gegl_resample_nearest_arm_neon@Base 1:0.4.36-2 + (optional=neon)gegl_resample_nearest_arm_neon@Base 1:0.4.36-2 gegl_resample_nearest_generic@Base 1:0.4.36 (arch=amd64 x32)gegl_resample_nearest_x86_64_v2@Base 1:0.4.36 (arch=amd64 x32)gegl_resample_nearest_x86_64_v3@Base 1:0.4.36 diff -Nru gegl-0.4.38/debian/patches/disable-neon.patch gegl-0.4.38/debian/patches/disable-neon.patch --- gegl-0.4.38/debian/patches/disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ gegl-0.4.38/debian/patches/disable-neon.patch 2022-08-27 12:19:28.000000000 +0000 @@ -0,0 +1,255 @@ +Description: Disable neon + it seems to have problems on systems with first generation neon. +Author: Peter Michael Green + +Index: gegl-0.4.38/gegl/buffer/meson.build +=================================================================== +--- gegl-0.4.38.orig/gegl/buffer/meson.build ++++ gegl-0.4.38/gegl/buffer/meson.build +@@ -12,11 +12,11 @@ if host_cpu_family == 'x86_64' + c_args: [gegl_cflags ] + x86_64_v3_flags + ) + elif host_cpu_family == 'arm' +- lib_gegl_arm_neon = static_library('gegl-arm-neon', 'gegl-algorithms.c', +- include_directories:[geglInclude, rootInclude], +- dependencies:[glib, babl], +- c_args: [gegl_cflags ] + arm_neon_flags +- ) ++# lib_gegl_arm_neon = static_library('gegl-arm-neon', 'gegl-algorithms.c', ++# include_directories:[geglInclude, rootInclude], ++# dependencies:[glib, babl], ++# c_args: [gegl_cflags ] + arm_neon_flags ++# ) + + endif + +Index: gegl-0.4.38/meson.build +=================================================================== +--- gegl-0.4.38.orig/meson.build ++++ gegl-0.4.38/meson.build +@@ -159,8 +159,8 @@ elif host_cpu_family == 'ppc64' + config.set10('ARCH_PPC', true) + config.set10('ARCH_PPC64', true) + elif host_cpu_family == 'arm' +- have_arm = true +- config.set10('ARCH_ARM', true) ++# have_arm = true ++# config.set10('ARCH_ARM', true) + elif host_cpu_family == 'aarch64' + have_aarch64 = true + config.set10('ARCH_AARCH64', true) +@@ -216,8 +216,8 @@ if host_cpu_family == 'x86_64' + x86_64_v3_flags += ['-DSIMD_X86_64_V3'] + + elif host_cpu_family == 'arm' +- arm_neon_flags = cc.get_supported_arguments(['-mfpu=neon-vfpv4']) +- arm_neon_flags += ['-DSIMD_ARM_NEON'] ++# arm_neon_flags = cc.get_supported_arguments(['-mfpu=neon-vfpv4']) ++# arm_neon_flags += ['-DSIMD_ARM_NEON'] + elif host_cpu_family == 'aarch64' + cflags_common += cc.get_supported_arguments(['-mfpu=neon-vfpv4']) + endif +Index: gegl-0.4.38/operations/common-cxx/meson.build +=================================================================== +--- gegl-0.4.38.orig/operations/common-cxx/meson.build ++++ gegl-0.4.38/operations/common-cxx/meson.build +@@ -84,24 +84,24 @@ if host_cpu_family == 'x86_64' + + elif host_cpu_family == 'arm' + +- gegl_common_cxx_arm_neon = shared_library('gegl-common-cxx-arm-neon', +- gegl_common_cxx_sources, opencl_headers, +- include_directories: [ rootInclude, geglInclude, ], +- dependencies: [ +- babl, +- glib, +- json_glib, +- math, +- ], +- link_with: [ +- gegl_lib, +- ], +- c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, +- cpp_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, +- name_prefix: '', +- install: true, +- install_dir: get_option('libdir') / api_name, +- ) +- gegl_operations += gegl_common_cxx_arm_neon ++# gegl_common_cxx_arm_neon = shared_library('gegl-common-cxx-arm-neon', ++# gegl_common_cxx_sources, opencl_headers, ++# include_directories: [ rootInclude, geglInclude, ], ++# dependencies: [ ++# babl, ++# glib, ++# json_glib, ++# math, ++# ], ++# link_with: [ ++# gegl_lib, ++# ], ++# c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, ++# cpp_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, ++# name_prefix: '', ++# install: true, ++# install_dir: get_option('libdir') / api_name, ++# ) ++# gegl_operations += gegl_common_cxx_arm_neon + + endif +Index: gegl-0.4.38/operations/common-gpl3+/meson.build +=================================================================== +--- gegl-0.4.38.orig/operations/common-gpl3+/meson.build ++++ gegl-0.4.38/operations/common-gpl3+/meson.build +@@ -127,24 +127,24 @@ if host_cpu_family == 'x86_64' + + elif host_cpu_family == 'arm' + +- gegl_common_gpl3_arm_neon = shared_library('gegl-common-gpl3-arm-neon', +- gegl_common_gpl3_sources, +- opencl_headers, +- include_directories: [ rootInclude, geglInclude, ], +- dependencies: [ +- babl, +- glib, +- json_glib, +- math, +- ], +- link_with: [ +- gegl_lib, +- ], +- c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, +- name_prefix: '', +- install: true, +- install_dir: get_option('libdir') / api_name, +- ) +- gegl_operations += gegl_common_gpl3_arm_neon ++# gegl_common_gpl3_arm_neon = shared_library('gegl-common-gpl3-arm-neon', ++# gegl_common_gpl3_sources, ++# opencl_headers, ++# include_directories: [ rootInclude, geglInclude, ], ++# dependencies: [ ++# babl, ++# glib, ++# json_glib, ++# math, ++# ], ++# link_with: [ ++# gegl_lib, ++# ], ++# c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, ++# name_prefix: '', ++# install: true, ++# install_dir: get_option('libdir') / api_name, ++# ) ++# gegl_operations += gegl_common_gpl3_arm_neon + + endif +Index: gegl-0.4.38/operations/common/meson.build +=================================================================== +--- gegl-0.4.38.orig/operations/common/meson.build ++++ gegl-0.4.38/operations/common/meson.build +@@ -182,15 +182,15 @@ if host_cpu_family == 'x86_64' + gegl_operations += gegl_common_x86_64_v3 + elif host_cpu_family == 'arm' + +- gegl_common_arm_neon = shared_library('gegl-common-arm-neon', +- gegl_common_sources, opencl_headers, +- include_directories: [ rootInclude, geglInclude, ], +- dependencies: [ babl, glib, json_glib, math, ], +- link_with: [ gegl_lib, ], +- c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, +- name_prefix: '', +- install: true, +- install_dir: get_option('libdir') / api_name, +- ) +- gegl_operations += gegl_common_arm_neon ++# gegl_common_arm_neon = shared_library('gegl-common-arm-neon', ++# gegl_common_sources, opencl_headers, ++# include_directories: [ rootInclude, geglInclude, ], ++# dependencies: [ babl, glib, json_glib, math, ], ++# link_with: [ gegl_lib, ], ++## c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, ++# name_prefix: '', ++# install: true, ++# install_dir: get_option('libdir') / api_name, ++# ) ++# gegl_operations += gegl_common_arm_neon + endif +Index: gegl-0.4.38/operations/generated/meson.build +=================================================================== +--- gegl-0.4.38.orig/operations/generated/meson.build ++++ gegl-0.4.38/operations/generated/meson.build +@@ -85,16 +85,16 @@ if host_cpu_family == 'x86_64' + + elif host_cpu_family == 'arm' + +- gegl_generated_arm_neon = shared_library('gegl-generated-arm-neon', +- gegl_generated_sources, opencl_headers, +- include_directories: [ rootInclude, geglInclude, ], +- dependencies: [ babl, glib, json_glib, math, ], +- link_with: [ gegl_lib, ], +- c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, +- name_prefix: '', +- install: true, +- install_dir: get_option('libdir') / api_name, +- ) +- gegl_operations += gegl_generated_arm_neon ++# gegl_generated_arm_neon = shared_library('gegl-generated-arm-neon', ++# gegl_generated_sources, opencl_headers, ++# include_directories: [ rootInclude, geglInclude, ], ++# dependencies: [ babl, glib, json_glib, math, ], ++# link_with: [ gegl_lib, ], ++# c_args: [ '-DGEGL_OP_BUNDLE' ] + arm_neon_flags, ++# name_prefix: '', ++# install: true, ++# install_dir: get_option('libdir') / api_name, ++# ) ++# gegl_operations += gegl_generated_arm_neon + + endif +Index: gegl-0.4.38/operations/transform/meson.build +=================================================================== +--- gegl-0.4.38.orig/operations/transform/meson.build ++++ gegl-0.4.38/operations/transform/meson.build +@@ -62,16 +62,16 @@ if host_cpu_family == 'x86_64' + + elif host_cpu_family == 'arm' + +- gegl_transformops_arm_neon = shared_library('gegl-transformops-arm-neon', +- gegl_transformops_sources, opencl_headers, +- include_directories: [ rootInclude, geglInclude, ], +- dependencies: [ babl, glib, json_glib, math, ], +- link_with: [ gegl_lib, ], +- c_args: arm_neon_flags, +- name_prefix: '', +- install: true, +- install_dir: get_option('libdir') / api_name, +- ) +- gegl_operations += gegl_transformops_arm_neon ++# gegl_transformops_arm_neon = shared_library('gegl-transformops-arm-neon', ++# gegl_transformops_sources, opencl_headers, ++# include_directories: [ rootInclude, geglInclude, ], ++# dependencies: [ babl, glib, json_glib, math, ], ++# link_with: [ gegl_lib, ], ++# c_args: arm_neon_flags, ++# name_prefix: '', ++# install: true, ++# install_dir: get_option('libdir') / api_name, ++# ) ++# gegl_operations += gegl_transformops_arm_neon + + endif +Index: gegl-0.4.38/gegl/meson.build +=================================================================== +--- gegl-0.4.38.orig/gegl/meson.build ++++ gegl-0.4.38/gegl/meson.build +@@ -98,7 +98,7 @@ opencl_dep = declare_dependency( + if host_cpu_family == 'x86_64' + simd_extra = [lib_gegl_x86_64_v2, lib_gegl_x86_64_v3] + elif host_cpu_family == 'arm' +- simd_extra = [lib_gegl_arm_neon] ++ simd_extra = [] + else + simd_extra = [] + endif diff -Nru gegl-0.4.38/debian/patches/series gegl-0.4.38/debian/patches/series --- gegl-0.4.38/debian/patches/series 2022-07-28 18:17:44.000000000 +0000 +++ gegl-0.4.38/debian/patches/series 2022-08-27 12:19:28.000000000 +0000 @@ -0,0 +1 @@ +disable-neon.patch