Revert lookup of tbb library
authorBoyuan Yang <byang@debian.org>
Fri, 18 Aug 2023 14:20:52 +0000 (10:20 -0400)
committerBoyuan Yang <byang@debian.org>
Sat, 19 Aug 2023 01:47:56 +0000 (02:47 +0100)
Reverts https://github.com/wwmm/easyeffects/commit/1a940f180c94eb7e7d3e061497b4a2693b4f533f .

This may circumvent tbb lookup bug as reported in https://github.com/wwmm/easyeffects/issues/2527 .

Forwarded: https://github.com/wwmm/easyeffects/issues/2527

Gbp-Pq: Name 0001-Revert-lookup-of-tbb-library.patch

src/meson.build

index 94f58e9a2e988471dcd64741e795f7afd6a3f329..61096fd4790c5ff7f526cc5eb7cec273845ac9da 100644 (file)
@@ -128,6 +128,8 @@ cxx = meson.get_compiler('cpp')
 
 zita_convolver = cxx.find_library('zita-convolver', required: true)
 
+tbb = cxx.find_library('tbb', required: true)
+
 # always require these libraries if the respective meson option is enabled, so they can't be accidentally left out
 
 rnnoise = dependency('rnnoise', include_type: 'system', required: get_option('enable-rnnoise'))
@@ -166,7 +168,7 @@ easyeffects_deps = [
        dependency('fmt', version: '>=8.0.0', include_type: 'system'),
        dependency('gsl', include_type: 'system'),
        dependency('threads'),
-       dependency('tbb', include_type: 'system'),
+       tbb,
        zita_convolver,
        rnnoise,
        libportal,