diff -pruN 1.3.1~dfsg0-1/debian/changelog 1.3.1~dfsg0-1ubuntu2/debian/changelog --- 1.3.1~dfsg0-1/debian/changelog 2022-10-15 20:04:48.000000000 +0000 +++ 1.3.1~dfsg0-1ubuntu2/debian/changelog 2023-05-22 11:30:29.000000000 +0000 @@ -1,3 +1,20 @@ +libmysofa (1.3.1~dfsg0-1ubuntu2) mantic; urgency=medium + + * debian/patches/git_s390x_tests.patch: + - cherry pick upstream fix for s390x tests issues + + -- Sebastien Bacher Mon, 22 May 2023 13:30:29 +0200 + +libmysofa (1.3.1~dfsg0-1ubuntu1) mantic; urgency=medium + + * debian/control, debian/rules: + - enable build tests, unless we are on i386 or s390x + * debian/patches/ubuntu_ignore_tests.patch: + - ignore tests that require .sofa files which are excluded from the dfsg + tarball. + + -- Sebastien Bacher Wed, 17 May 2023 11:36:35 +0200 + libmysofa (1.3.1~dfsg0-1) unstable; urgency=medium * New upstream version 1.3.1~dfsg0 diff -pruN 1.3.1~dfsg0-1/debian/control 1.3.1~dfsg0-1ubuntu2/debian/control --- 1.3.1~dfsg0-1/debian/control 2022-10-15 20:04:48.000000000 +0000 +++ 1.3.1~dfsg0-1ubuntu2/debian/control 2023-05-17 09:36:35.000000000 +0000 @@ -1,12 +1,14 @@ Source: libmysofa Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: IOhannes m zmölnig (Debian/GNU) , Build-Depends: cmake, debhelper-compat (= 13), libcunit1-dev, + nodejs [!i386] , zlib1g-dev | libz-dev, Standards-Version: 4.6.1 Rules-Requires-Root: no diff -pruN 1.3.1~dfsg0-1/debian/patches/git_s390x_tests.patch 1.3.1~dfsg0-1ubuntu2/debian/patches/git_s390x_tests.patch --- 1.3.1~dfsg0-1/debian/patches/git_s390x_tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.3.1~dfsg0-1ubuntu2/debian/patches/git_s390x_tests.patch 2023-05-22 11:30:29.000000000 +0000 @@ -0,0 +1,49 @@ +From 8fa76a79e9fbfbf0b07cdc3543c5cad86218cad3 Mon Sep 17 00:00:00 2001 +From: Christian Hoene +Date: Wed, 17 May 2023 18:15:09 +0000 +Subject: [PATCH] fix big endian convertion of double value + +--- + src/hrtf/reader.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +Index: libmysofa-1.3.1~dfsg0/src/hrtf/reader.c +=================================================================== +--- libmysofa-1.3.1~dfsg0.orig/src/hrtf/reader.c 2023-05-22 13:32:09.166449202 +0200 ++++ libmysofa-1.3.1~dfsg0/src/hrtf/reader.c 2023-05-22 13:32:31.654100536 +0200 +@@ -11,8 +11,8 @@ + #include + #include + +-#include "../config.h" + #include "../hdf/reader.h" ++#include "../config.h" + #include "mysofa.h" + #include "mysofa_export.h" + +@@ -151,7 +151,7 @@ + + static int getArray(struct MYSOFA_ARRAY *array, struct DATAOBJECT *dataobject) { + float *p1; +- double *p2; ++ uint64_t *p2; + unsigned int i; + + struct MYSOFA_ATTRIBUTE *attr = dataobject->attributes; +@@ -170,8 +170,14 @@ + + p1 = dataobject->data; + p2 = dataobject->data; +- for (i = 0; i < array->elements; i++) +- *p1++ = (float)*p2++; ++ for (i = 0; i < array->elements; i++) { ++ union { ++ uint64_t i; ++ double d; ++ } u; ++ u.i = le64toh(*p2++); ++ *p1++ = (float)u.d; ++ } + array->values = realloc(dataobject->data, array->elements * sizeof(float)); + + dataobject->data = NULL; diff -pruN 1.3.1~dfsg0-1/debian/patches/series 1.3.1~dfsg0-1ubuntu2/debian/patches/series --- 1.3.1~dfsg0-1/debian/patches/series 2022-10-15 20:04:48.000000000 +0000 +++ 1.3.1~dfsg0-1ubuntu2/debian/patches/series 2023-05-22 11:30:21.000000000 +0000 @@ -1 +1,3 @@ dynamically-link-tools.patch +ubuntu_ignore_tests.patch +git_s390x_tests.patch diff -pruN 1.3.1~dfsg0-1/debian/patches/ubuntu_ignore_tests.patch 1.3.1~dfsg0-1ubuntu2/debian/patches/ubuntu_ignore_tests.patch --- 1.3.1~dfsg0-1/debian/patches/ubuntu_ignore_tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.3.1~dfsg0-1ubuntu2/debian/patches/ubuntu_ignore_tests.patch 2023-05-22 11:30:21.000000000 +0000 @@ -0,0 +1,27 @@ +# Description: ignore tests which depend on non dfsg files that Debian +# is removing from the tarball +# Upstream: not-needed +Index: libmysofa-1.3.1~dfsg0/CMakeLists.txt +=================================================================== +--- libmysofa-1.3.1~dfsg0.orig/CMakeLists.txt 2022-10-04 18:31:49.000000000 +0200 ++++ libmysofa-1.3.1~dfsg0/CMakeLists.txt 2023-05-17 15:38:45.843397388 +0200 +@@ -57,8 +57,6 @@ + ${PROJECT_SOURCE_DIR}/tests/Mesh2HRTF.sofa) + add_test(D1_48K_24bit_0.3s_FIR_SOFA src/mysofa2json + ${PROJECT_SOURCE_DIR}/tests/D1_48K_24bit_0.3s_FIR_SOFA.sofa) +- add_test(H20_44K_16bit_256tap_FIR_SOFA ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh +- ${PROJECT_SOURCE_DIR}/tests/H20_44K_16bit_256tap_FIR_SOFA) + add_test(MIT_KEMAR_large_pinna ${PROJECT_SOURCE_DIR}/tests/compare.sh + ${PROJECT_SOURCE_DIR}/tests/MIT_KEMAR_large_pinna) + add_test(MIT_KEMAR_normal_pinna ${PROJECT_SOURCE_DIR}/tests/compareIgnoreNew.sh +@@ -104,10 +102,6 @@ + ${PROJECT_SOURCE_DIR}/tests/LISTEN_1002_IRC_1002_C_HRIR) + add_test(Pulse ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/Pulse) + add_test(Tester ${PROJECT_SOURCE_DIR}/tests/compare.sh ${PROJECT_SOURCE_DIR}/tests/tester) +- add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m ${PROJECT_SOURCE_DIR}/tests/compare.sh +- ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5_1_2_3_m) +- add_test(TU-Berlin_QU_KEMAR_anechoic_radius_0.5m ${PROJECT_SOURCE_DIR}/tests/compare.sh +- ${PROJECT_SOURCE_DIR}/tests/TU-Berlin_QU_KEMAR_anechoic_radius_0.5m) + add_test(example_dummy_sofa48 ${PROJECT_SOURCE_DIR}/tests/compare.sh + ${PROJECT_SOURCE_DIR}/tests/example_dummy_sofa48) + add_test(TestSOFA48_netcdf472 ${PROJECT_SOURCE_DIR}/tests/compare.sh diff -pruN 1.3.1~dfsg0-1/debian/rules 1.3.1~dfsg0-1ubuntu2/debian/rules --- 1.3.1~dfsg0-1/debian/rules 2022-10-15 20:04:48.000000000 +0000 +++ 1.3.1~dfsg0-1ubuntu2/debian/rules 2023-05-22 11:30:29.000000000 +0000 @@ -13,8 +13,9 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# the tests have hardcoded reference to build/src %: - dh $@ + dh $@ --builddirectory=build override_dh_auto_configure: dh_auto_configure -- \ @@ -23,9 +24,13 @@ override_dh_auto_configure: -DCODE_COVERAGE=OFF \ $(empty) +# no-parallel otherwise we are hitting test errors override_dh_auto_test: - # tests have been disabled, until we figure out how to make them not stall - @echo "skipping tests" +ifeq (,$(filter $(DEB_HOST_ARCH), i386)) + dh_auto_test --no-parallel +else + dh_auto_test --no-parallel || true +endif override_dh_clean: dh_clean