diff -Nru ableton-link-3.1.0+dfsg/.appveyor.yml ableton-link-3.1.1+dfsg/.appveyor.yml --- ableton-link-3.1.0+dfsg/.appveyor.yml 2023-09-19 13:46:28.000000000 +0000 +++ ableton-link-3.1.1+dfsg/.appveyor.yml 2024-02-01 14:19:51.000000000 +0000 @@ -119,6 +119,7 @@ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 build_script: + - py -3 -m pip install setuptools - py -3 ci/configure.py --audio-driver %AUDIO_DRIVER% --thread-description %THREAD_DESCRIPTION% --generator "%GENERATOR%" --flags="-DCMAKE_SYSTEM_VERSION=10.0.18362.0" - py -3 ci/build.py --configuration %CONFIGURATION% test_script: diff -Nru ableton-link-3.1.0+dfsg/debian/changelog ableton-link-3.1.1+dfsg/debian/changelog --- ableton-link-3.1.0+dfsg/debian/changelog 2023-10-30 14:40:19.000000000 +0000 +++ ableton-link-3.1.1+dfsg/debian/changelog 2024-02-05 12:57:07.000000000 +0000 @@ -1,3 +1,9 @@ +ableton-link (3.1.1+dfsg-1) unstable; urgency=medium + + * New upstream version 3.1.1+dfsg + + -- IOhannes m zmölnig (Debian/GNU) Mon, 05 Feb 2024 13:57:07 +0100 + ableton-link (3.1.0+dfsg-2) unstable; urgency=medium * Fix FTBFS with catch3 (Closes: #1054677) diff -Nru ableton-link-3.1.0+dfsg/include/ableton/platforms/posix/ScanIpIfAddrs.hpp ableton-link-3.1.1+dfsg/include/ableton/platforms/posix/ScanIpIfAddrs.hpp --- ableton-link-3.1.0+dfsg/include/ableton/platforms/posix/ScanIpIfAddrs.hpp 2023-09-19 13:46:28.000000000 +0000 +++ ableton-link-3.1.1+dfsg/include/ableton/platforms/posix/ScanIpIfAddrs.hpp 2024-02-01 14:19:51.000000000 +0000 @@ -86,12 +86,13 @@ const struct ifaddrs* interface; for (interface = &interfaces; interface; interface = interface->ifa_next) { - auto addr = reinterpret_cast(interface->ifa_addr); + const auto addr = + reinterpret_cast(interface->ifa_addr); if (addr && interface->ifa_flags & IFF_RUNNING && addr->sin_family == AF_INET) { - auto bytes = reinterpret_cast(&addr->sin_addr); - auto address = discovery::makeAddress(bytes); - addrs.emplace_back(std::move(address)); + const auto bytes = reinterpret_cast(&addr->sin_addr); + const auto address = discovery::makeAddress(bytes); + addrs.emplace_back(address); IpInterfaceNames.insert(std::make_pair(interface->ifa_name, address)); } } @@ -101,17 +102,19 @@ const struct ifaddrs* interface; for (interface = &interfaces; interface; interface = interface->ifa_next) { - auto addr = reinterpret_cast(interface->ifa_addr); - if (addr && interface->ifa_flags & IFF_RUNNING && addr->sin_family == AF_INET6) + const auto addr = + reinterpret_cast(interface->ifa_addr); + if (IpInterfaceNames.find(interface->ifa_name) != IpInterfaceNames.end() && addr + && interface->ifa_flags & IFF_RUNNING && addr->sin_family == AF_INET6) { - auto addr6 = reinterpret_cast(addr); - auto bytes = reinterpret_cast(&addr6->sin6_addr); - auto scopeId = addr6->sin6_scope_id; - auto address = discovery::makeAddress(bytes, scopeId); - if (IpInterfaceNames.find(interface->ifa_name) != IpInterfaceNames.end() - && !address.is_loopback() && address.is_link_local()) + const auto addr6 = reinterpret_cast(addr); + const auto bytes = reinterpret_cast(&addr6->sin6_addr); + const auto scopeId = addr6->sin6_scope_id; + const auto address = + discovery::makeAddress(bytes, scopeId); + if (!address.is_loopback() && address.is_link_local()) { - addrs.emplace_back(std::move(address)); + addrs.emplace_back(address); } } } diff -Nru ableton-link-3.1.0+dfsg/include/ableton/platforms/windows/ScanIpIfAddrs.hpp ableton-link-3.1.1+dfsg/include/ableton/platforms/windows/ScanIpIfAddrs.hpp --- ableton-link-3.1.0+dfsg/include/ableton/platforms/windows/ScanIpIfAddrs.hpp 2023-09-19 13:46:28.000000000 +0000 +++ ableton-link-3.1.1+dfsg/include/ableton/platforms/windows/ScanIpIfAddrs.hpp 2024-02-01 14:19:51.000000000 +0000 @@ -120,8 +120,9 @@ // IPv4 SOCKADDR_IN* addr4 = reinterpret_cast(address->Address.lpSockaddr); - auto bytes = reinterpret_cast(&addr4->sin_addr); - auto ipv4address = discovery::makeAddress(bytes); + const auto bytes = reinterpret_cast(&addr4->sin_addr); + const auto ipv4address = + discovery::makeAddress(bytes); addrs.emplace_back(ipv4address); IpInterfaceNames.insert( std::make_pair(networkInterface->AdapterName, ipv4address)); @@ -145,8 +146,10 @@ { SOCKADDR_IN6* sockAddr = reinterpret_cast(address->Address.lpSockaddr); - auto bytes = reinterpret_cast(&sockAddr->sin6_addr); - auto addr6 = discovery::makeAddress(bytes); + const auto scopeId = sockAddr->sin6_scope_id; + const auto bytes = reinterpret_cast(&sockAddr->sin6_addr); + const auto addr6 = + discovery::makeAddress(bytes, scopeId); if (!addr6.is_loopback() && addr6.is_link_local()) { addrs.emplace_back(addr6);