From e90a72d1efa87f9e3db0bbfdce16d5926af4df16 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 15 Jul 2019 21:23:20 +0200 Subject: Make application search for helper-apps in lib/sonic-visualiser Forwarded: no Last-Update: 2017-10-05 rather than in bin/ Last-Update: 2017-10-05 Gbp-Pq: Name 01-system_helper_path.patch --- svcore/base/HelperExecPath.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/svcore/base/HelperExecPath.cpp b/svcore/base/HelperExecPath.cpp index e01ca8d..afe61c6 100644 --- a/svcore/base/HelperExecPath.cpp +++ b/svcore/base/HelperExecPath.cpp @@ -60,6 +60,7 @@ HelperExecPath::getHelperDirPaths() { QStringList dirs; QString myDir = QCoreApplication::applicationDirPath(); + dirs.push_back(myDir + "/../lib/sonic-visualiser/helpers"); dirs.push_back(myDir + "/helpers"); dirs.push_back(myDir); return dirs; -- cgit v1.2.3 From 1cec594ad663b6477fc72127bff1601eed088b82 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 15 Jul 2019 21:23:20 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 010b29eb9483fd01e4a627d6651a7761c6a87239 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 15 Jul 2019 21:23:20 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 6b20595..9e3ae5a 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -433,6 +433,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From de086c7b174084593b38821c50accf6a7df74d3c Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 15 Jul 2019 21:23:20 +0200 Subject: Find tools for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2018-07-17 Last-Update: 2018-07-17 Gbp-Pq: Name 04-crosscompilation.patch --- acinclude.m4 | 6 +++--- svapp/acinclude.m4 | 6 +++--- svcore/acinclude.m4 | 6 +++--- svgui/acinclude.m4 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 572d8c7..99187db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svapp/acinclude.m4 b/svapp/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svapp/acinclude.m4 +++ b/svapp/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svcore/acinclude.m4 b/svcore/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svcore/acinclude.m4 +++ b/svcore/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svgui/acinclude.m4 b/svgui/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svgui/acinclude.m4 +++ b/svgui/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ -- cgit v1.2.3 From b7c0a5fba613ac9cf6ad33a1694283359e4c3641 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 15 Jul 2019 21:23:20 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ test-svcore-base.pro | 6 +----- test-svcore-data-fileio.pro | 6 +----- test-svcore-data-model.pro | 6 +----- test-svcore-system.pro | 6 +----- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe diff --git a/test-svcore-base.pro b/test-svcore-base.pro index 27c59cf..8053b22 100644 --- a/test-svcore-base.pro +++ b/test-svcore-base.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,7 +27,3 @@ include(svcore/base/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } - -!win32* { - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro index 9fb18c4..b4ac9e8 100644 --- a/test-svcore-data-fileio.pro +++ b/test-svcore-data-fileio.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,7 +27,3 @@ include(svcore/data/fileio/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } - -!win32* { - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro index 502c29e..c6a9890 100644 --- a/test-svcore-data-model.pro +++ b/test-svcore-data-model.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,7 +27,3 @@ include(svcore/data/model/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } - -!win32* { - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-system.pro b/test-svcore-system.pro index c38d641..b09ab3c 100644 --- a/test-svcore-system.pro +++ b/test-svcore-system.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,7 +27,3 @@ include(svcore/system/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) } - -!win32* { - QMAKE_POST_LINK = ./$${TARGET} -} -- cgit v1.2.3 From e6e562afb25162deeced6da685d1688a75e399d9 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 4 Nov 2019 16:31:02 +0100 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 75cfd0f7af7450eeb70e5504d34d497b984483d8 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 4 Nov 2019 16:31:02 +0100 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8583690..0f46ea4 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -433,6 +433,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From c37690444048c3c958cfe0e7976ca4cbcda6f5d1 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 4 Nov 2019 16:31:02 +0100 Subject: Find tools for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2018-07-17 Last-Update: 2018-07-17 Gbp-Pq: Name 04-crosscompilation.patch --- acinclude.m4 | 6 +++--- svapp/acinclude.m4 | 6 +++--- svcore/acinclude.m4 | 6 +++--- svgui/acinclude.m4 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 572d8c7..99187db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svapp/acinclude.m4 b/svapp/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svapp/acinclude.m4 +++ b/svapp/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svcore/acinclude.m4 b/svcore/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svcore/acinclude.m4 +++ b/svcore/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svgui/acinclude.m4 b/svgui/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svgui/acinclude.m4 +++ b/svgui/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ -- cgit v1.2.3 From 8bd788475a9e5a1783fbcfbc7f626f4dea46a99f Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 4 Nov 2019 16:31:02 +0100 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ test-svcore-base.pro | 7 +------ test-svcore-data-fileio.pro | 7 +------ test-svcore-data-model.pro | 7 +------ test-svcore-system.pro | 7 +------ 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe diff --git a/test-svcore-base.pro b/test-svcore-base.pro index 275cb58..8053b22 100644 --- a/test-svcore-base.pro +++ b/test-svcore-base.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/base/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro index 7b53ca1..b4ac9e8 100644 --- a/test-svcore-data-fileio.pro +++ b/test-svcore-data-fileio.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro index 3b45ac0..c6a9890 100644 --- a/test-svcore-data-model.pro +++ b/test-svcore-data-model.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-system.pro b/test-svcore-system.pro index 6ef7db7..b09ab3c 100644 --- a/test-svcore-system.pro +++ b/test-svcore-system.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/system/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} -- cgit v1.2.3 From 0eede1ff11f2830a74a121c5737b87b8624b8ca4 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 8 Jan 2020 10:01:20 +0100 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 347e0a7d91caaf6ba6163968fe2cdb8cba28f583 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 8 Jan 2020 10:01:20 +0100 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8583690..0f46ea4 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -433,6 +433,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From ae3a36465052e05d4e46538149b2fdfbf08489bb Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 8 Jan 2020 10:01:20 +0100 Subject: Find tools for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2018-07-17 Last-Update: 2018-07-17 Gbp-Pq: Name 04-crosscompilation.patch --- acinclude.m4 | 6 +++--- svapp/acinclude.m4 | 6 +++--- svcore/acinclude.m4 | 6 +++--- svgui/acinclude.m4 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 572d8c7..99187db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svapp/acinclude.m4 b/svapp/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svapp/acinclude.m4 +++ b/svapp/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svcore/acinclude.m4 b/svcore/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svcore/acinclude.m4 +++ b/svcore/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svgui/acinclude.m4 b/svgui/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svgui/acinclude.m4 +++ b/svgui/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ -- cgit v1.2.3 From aed56307b871ed5e84bdb0a633f91e0df9bb9d66 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 8 Jan 2020 10:01:20 +0100 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ test-svcore-base.pro | 7 +------ test-svcore-data-fileio.pro | 7 +------ test-svcore-data-model.pro | 7 +------ test-svcore-system.pro | 7 +------ 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe diff --git a/test-svcore-base.pro b/test-svcore-base.pro index 275cb58..8053b22 100644 --- a/test-svcore-base.pro +++ b/test-svcore-base.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/base/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro index 7b53ca1..b4ac9e8 100644 --- a/test-svcore-data-fileio.pro +++ b/test-svcore-data-fileio.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro index 3b45ac0..c6a9890 100644 --- a/test-svcore-data-model.pro +++ b/test-svcore-data-model.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-system.pro b/test-svcore-system.pro index 6ef7db7..b09ab3c 100644 --- a/test-svcore-system.pro +++ b/test-svcore-system.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/system/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} -- cgit v1.2.3 From d933477af6a78a669531ca1b29d9319357f44d30 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 15 Jul 2020 14:58:01 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 2c43299b884f590a224872bbea84ef584b650e6e Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 15 Jul 2020 14:58:01 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8583690..0f46ea4 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -433,6 +433,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From cf4544c491704051d3b6151f7d371713e51df27d Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 15 Jul 2020 14:58:01 +0200 Subject: Find tools for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2018-07-17 Last-Update: 2018-07-17 Gbp-Pq: Name 04-crosscompilation.patch --- acinclude.m4 | 6 +++--- svapp/acinclude.m4 | 6 +++--- svcore/acinclude.m4 | 6 +++--- svgui/acinclude.m4 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 572d8c7..99187db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svapp/acinclude.m4 b/svapp/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svapp/acinclude.m4 +++ b/svapp/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svcore/acinclude.m4 b/svcore/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svcore/acinclude.m4 +++ b/svcore/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svgui/acinclude.m4 b/svgui/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svgui/acinclude.m4 +++ b/svgui/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ -- cgit v1.2.3 From 72833063da30a01315cae551c22d064104796441 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 15 Jul 2020 14:58:01 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ test-svcore-base.pro | 7 +------ test-svcore-data-fileio.pro | 7 +------ test-svcore-data-model.pro | 7 +------ test-svcore-system.pro | 7 +------ 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe diff --git a/test-svcore-base.pro b/test-svcore-base.pro index 275cb58..8053b22 100644 --- a/test-svcore-base.pro +++ b/test-svcore-base.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/base/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro index 7b53ca1..b4ac9e8 100644 --- a/test-svcore-data-fileio.pro +++ b/test-svcore-data-fileio.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro index 3b45ac0..c6a9890 100644 --- a/test-svcore-data-model.pro +++ b/test-svcore-data-model.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-system.pro b/test-svcore-system.pro index 6ef7db7..b09ab3c 100644 --- a/test-svcore-system.pro +++ b/test-svcore-system.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/system/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} -- cgit v1.2.3 From 3235bc600413d8e34d0b0c09edb9c8b9aec08c9f Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 17 Aug 2020 22:42:37 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 6831809707e5248d37cac1a1d1c563a630208bb6 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 17 Aug 2020 22:42:37 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8583690..0f46ea4 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -433,6 +433,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From 4067d26e691625a579c4d6ab88b11f0829217538 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 17 Aug 2020 22:42:37 +0200 Subject: Find tools for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: IOhannes m zmölnig Last-Update: 2018-07-17 Last-Update: 2018-07-17 Gbp-Pq: Name 04-crosscompilation.patch --- acinclude.m4 | 6 +++--- svapp/acinclude.m4 | 6 +++--- svcore/acinclude.m4 | 6 +++--- svgui/acinclude.m4 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 572d8c7..99187db 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svapp/acinclude.m4 b/svapp/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svapp/acinclude.m4 +++ b/svapp/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svcore/acinclude.m4 b/svcore/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svcore/acinclude.m4 +++ b/svcore/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ diff --git a/svgui/acinclude.m4 b/svgui/acinclude.m4 index 07a6a2a..e234067 100644 --- a/svgui/acinclude.m4 +++ b/svgui/acinclude.m4 @@ -78,13 +78,13 @@ if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake.exe, $QTDIR/bin/qmake.exe,,$QTDIR/bin/) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) + AC_PATH_TOOL(QMAKE, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qt5-qmake,,$PATH) fi if test x$QMAKE = x ; then - AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) + AC_PATH_TOOL(QMAKE, qmake,,$PATH) fi if test x$QMAKE = x ; then AC_MSG_ERROR([ -- cgit v1.2.3 From 5bd2edca5f4fc8d6c5b6582905fa520de7c956cc Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 17 Aug 2020 22:42:37 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ test-svcore-base.pro | 7 +------ test-svcore-data-fileio.pro | 7 +------ test-svcore-data-model.pro | 7 +------ test-svcore-system.pro | 7 +------ 5 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe diff --git a/test-svcore-base.pro b/test-svcore-base.pro index 275cb58..8053b22 100644 --- a/test-svcore-base.pro +++ b/test-svcore-base.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/base/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro index 7b53ca1..b4ac9e8 100644 --- a/test-svcore-data-fileio.pro +++ b/test-svcore-data-fileio.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro index 3b45ac0..c6a9890 100644 --- a/test-svcore-data-model.pro +++ b/test-svcore-data-model.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} diff --git a/test-svcore-system.pro b/test-svcore-system.pro index 6ef7db7..b09ab3c 100644 --- a/test-svcore-system.pro +++ b/test-svcore-system.pro @@ -11,7 +11,7 @@ exists(config.pri) { include(base.pri) -CONFIG += console +CONFIG += console testcase QT += network xml testlib QT -= gui @@ -27,8 +27,3 @@ include(svcore/system/test/files.pri) for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) } for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) } - -!win32* { - POST_TARGETDEPS += $$PWD/libbase.a - QMAKE_POST_LINK = ./$${TARGET} -} -- cgit v1.2.3 From 3634e278fe7922387bb75df1d7b71a86bcec6314 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 27 Sep 2021 18:15:41 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 358b2fa278d1c2f3d91e29562dba5a6366e0579b Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 27 Sep 2021 18:15:41 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8c7c70f..0bac2f1 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -431,6 +431,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From ae5f0a92e7d2863f74316a63cc252119793a0d76 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 27 Sep 2021 18:15:41 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe -- cgit v1.2.3 From b7c7cc5afa39f5400162c0f934c7a1a14d046068 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sat, 27 Nov 2021 22:08:55 +0100 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From a50a4a818d238cc97cb9a0ae89c77d0dac80c64b Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Sat, 27 Nov 2021 22:08:55 +0100 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8c7c70f..0bac2f1 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -431,6 +431,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From 918b00f719ba46fbe9b5f63a8bcdff605f59a7d3 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 27 Nov 2021 22:08:55 +0100 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe -- cgit v1.2.3 From d5c95919a7eb241e028232f09d166afc2aaa14b7 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 29 Nov 2021 12:47:35 +0100 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From e27e6192f876e1a63322999a4acc7c099eafaeb3 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 29 Nov 2021 12:47:35 +0100 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8c7c70f..0bac2f1 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -431,6 +431,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From e80421790a1359c3a5c28cd47e9b56eba0a1a2b9 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 29 Nov 2021 12:47:35 +0100 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe -- cgit v1.2.3 From 0d8b450947db7acb1d07ad4544ca430e0ea69564 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Tue, 19 Apr 2022 11:05:51 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From 03566502b936d94eb695c67c324a626962951c7c Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Tue, 19 Apr 2022 11:05:51 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8c7c70f..0bac2f1 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -431,6 +431,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From 602f55768646a42449174e9f8bbe7ab9f0930239 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Tue, 19 Apr 2022 11:05:51 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe -- cgit v1.2.3 From 5e2820c680d99c42f94e879ae6276167e1f1b38d Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 5 Aug 2022 20:24:37 +0200 Subject: Fix FTBFS due to underlinking with libserd Forwarded: not-needed Applied-Upstream: 865fbe253cde8e966709bb11dc8c441ceb3891ed Last-Update: 2022-08-05 linking piper-vamp-simple-server failed with a cryptic error, the reason being that it did not explicitely link against libserd-0 Last-Update: 2022-08-05 Gbp-Pq: Name 01-libserd.patch --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 59a635f..d384510 100644 --- a/meson.build +++ b/meson.build @@ -1268,6 +1268,7 @@ executable( dependencies: [ capnp_gen_header_dep, server_dependencies, + serd_dep, ], link_args: [ feature_additional_libs, -- cgit v1.2.3 From 47c17199b1b160a1724886a4d81cb12cea643128 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 5 Aug 2022 20:24:37 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From ef88c633745eea59e73792a98b7cdc824b5d0b13 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 5 Aug 2022 20:24:37 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8c7c70f..0bac2f1 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -431,6 +431,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From b36e966b15a5c4b30d4d89e86229eb34ec77726f Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 5 Aug 2022 20:24:37 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe -- cgit v1.2.3 From 1dfbecf85ebde001bfa9b94e55192fb25984491f Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Sep 2022 10:39:25 +0200 Subject: Fix FTBFS due to underlinking with libserd Forwarded: not-needed Applied-Upstream: 865fbe253cde8e966709bb11dc8c441ceb3891ed Last-Update: 2022-08-05 linking piper-vamp-simple-server failed with a cryptic error, the reason being that it did not explicitely link against libserd-0 Last-Update: 2022-08-05 Gbp-Pq: Name 01-libserd.patch --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 59a635f..d384510 100644 --- a/meson.build +++ b/meson.build @@ -1268,6 +1268,7 @@ executable( dependencies: [ capnp_gen_header_dep, server_dependencies, + serd_dep, ], link_args: [ feature_additional_libs, -- cgit v1.2.3 From 94932a6bf9286f2eac86d00110f07473b7e79d3d Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Sep 2022 10:39:25 +0200 Subject: Build against systemwide dataquay Forwarded: No Gbp-Pq: Name 02-disable-internal-dataquay.patch --- svcore/svcore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svcore/svcore.pro b/svcore/svcore.pro index 70511f5..6cbdba7 100644 --- a/svcore/svcore.pro +++ b/svcore/svcore.pro @@ -13,8 +13,8 @@ QT -= gui TARGET = svcore -DEPENDPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp -INCLUDEPATH += . data plugin plugin/api/alsa ../dataquay ../checker ../piper-cpp +DEPENDPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp +INCLUDEPATH += . data plugin plugin/api/alsa ../checker ../piper-cpp OBJECTS_DIR = o MOC_DIR = o -- cgit v1.2.3 From facb290fda9fb24dcbb168cae93a87a7b8fad7d3 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Wed, 28 Sep 2022 10:39:25 +0200 Subject: make tests slightly more tolerant to pass on exotic archs Bug: https://sourceforge.net/p/sv1/bugs/244/ Last-Update: 2018-01-05 Last-Update: 2018-01-05 Gbp-Pq: Name 03-tests-on-archs.patch --- svcore/data/fileio/test/AudioFileReaderTest.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/svcore/data/fileio/test/AudioFileReaderTest.h b/svcore/data/fileio/test/AudioFileReaderTest.h index 8c7c70f..0bac2f1 100644 --- a/svcore/data/fileio/test/AudioFileReaderTest.h +++ b/svcore/data/fileio/test/AudioFileReaderTest.h @@ -431,6 +431,12 @@ private slots: // ouch! if (offset == -1) offset = 0; } +#if (defined __alpha__) || (defined __aarch64__) || (defined __hppa__) || (defined __m68k__) || (defined __sh__) || (defined __s390x__) + if (format == "mp3") { + // ouch! + if (offset == -1) offset = 0; + } +#endif QCOMPARE(offset, 0); } } -- cgit v1.2.3 From 2c99245e1cd453ac27fcb9320dd442d3529c8e21 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Wed, 28 Sep 2022 10:39:25 +0200 Subject: honour DEB_BUILD_OPTIONS=nocheck Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918718 Last-Update: 2019-01-11 Last-Update: 2019-01-11 Gbp-Pq: Name 05-nocheck.patch --- dataquay/tests/tests.pro | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dataquay/tests/tests.pro b/dataquay/tests/tests.pro index fb6950e..9bd0082 100644 --- a/dataquay/tests/tests.pro +++ b/dataquay/tests/tests.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += debug console warn_on c++11 +CONFIG += debug console warn_on c++11 testcase QT += testlib QT -= gui TARGET = test-dataquay @@ -40,14 +40,3 @@ exists(./platform.pri) { include(../platform.pri) } } - -!win32 { - !macx* { - QMAKE_POST_LINK=$${DESTDIR}/$${TARGET} - } - macx* { - QMAKE_POST_LINK=./$${TARGET}.app/Contents/MacOS/$${TARGET} - } -} - -win32:QMAKE_POST_LINK=$${TARGET}.exe -- cgit v1.2.3