From fee12be4ffe3b77a4adb525807a3275344f73830 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Thu, 25 Feb 2021 10:07:58 +0100 Subject: [PATCH 1/2] Update SWIG with upstream 4.1-aligned branch --- native_client/definitions.mk | 8 ++++---- taskcluster/.shared.yml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/native_client/definitions.mk b/native_client/definitions.mk index ecc4a626..737ec8f9 100644 --- a/native_client/definitions.mk +++ b/native_client/definitions.mk @@ -209,11 +209,11 @@ endef SWIG_DIST_URL ?= ifeq ($(SWIG_DIST_URL),) ifeq ($(findstring Linux,$(OS)),Linux) -SWIG_DIST_URL := "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.linux.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0/artifacts/public/ds-swig.tar.gz" +SWIG_DIST_URL := "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.linux.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0/artifacts/public/ds-swig.tar.gz" else ifeq ($(findstring Darwin,$(OS)),Darwin) -SWIG_DIST_URL := "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.darwin.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0/artifacts/public/ds-swig.tar.gz" +SWIG_DIST_URL := "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.darwin.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0/artifacts/public/ds-swig.tar.gz" else ifeq ($(findstring _NT,$(OS)),_NT) -SWIG_DIST_URL := "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.win.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0/artifacts/public/ds-swig.tar.gz" +SWIG_DIST_URL := "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.win.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0/artifacts/public/ds-swig.tar.gz" else $(error There is no prebuilt SWIG available for your platform. Please produce one and set SWIG_DIST_URL.) endif # findstring() @@ -224,7 +224,7 @@ SWIG_ROOT ?= $(abspath $(shell dirname "$(lastword $(MAKEFILE_LIST))"))/ds-swig ifeq ($(findstring _NT,$(OS)),_NT) SWIG_ROOT ?= $(shell cygpath -u "$(SWIG_ROOT)") endif -SWIG_LIB ?= $(SWIG_ROOT)/share/swig/4.0.2/ +SWIG_LIB ?= $(SWIG_ROOT)/share/swig/4.1.0/ SWIG_BIN := swig$(PLATFORM_EXE_SUFFIX) DS_SWIG_BIN := ds-swig$(PLATFORM_EXE_SUFFIX) diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index 10e7b180..e36c965e 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -172,17 +172,17 @@ system: namespace: "project.deepspeech.kenlm.689a25aae9171b3ea46bd80d4189f540f35f1a02.4.win" swig: repo: "https://github.com/lissyx/swig" - sha1: "f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2" + sha1: "fec7d5d3179833e37759ffc6532f86344982e26a" swig_build: linux: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.linux.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0/artifacts/public/ds-swig.tar.gz" - namespace: "project.deepspeech.swig.linux.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.linux.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0/artifacts/public/ds-swig.tar.gz" + namespace: "project.deepspeech.swig.linux.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0" osx: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.darwin.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0/artifacts/public/ds-swig.tar.gz" - namespace: "project.deepspeech.swig.darwin.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.darwin.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0/artifacts/public/ds-swig.tar.gz" + namespace: "project.deepspeech.swig.darwin.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0" win: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.win.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0/artifacts/public/ds-swig.tar.gz" - namespace: "project.deepspeech.swig.win.amd64.f0e5d1a0be7383abd98a29a75f47d5dc10a87ef2.0" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.swig.win.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0/artifacts/public/ds-swig.tar.gz" + namespace: "project.deepspeech.swig.win.amd64.fec7d5d3179833e37759ffc6532f86344982e26a.0" tensorflow: linux_amd64_cpu: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cpu/artifacts/public/home.tar.xz" From 206b8355b1765a97aa103722adda95449a435f3a Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Thu, 25 Feb 2021 12:37:27 +0100 Subject: [PATCH 2/2] Fix #3540: Force NAudio 1.10.0 --- taskcluster/tc-dotnet-utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskcluster/tc-dotnet-utils.sh b/taskcluster/tc-dotnet-utils.sh index 66cbabf1..e62ad6e2 100755 --- a/taskcluster/tc-dotnet-utils.sh +++ b/taskcluster/tc-dotnet-utils.sh @@ -34,7 +34,7 @@ install_nuget() ls -halR "${PROJECT_NAME}.${DS_VERSION}" - nuget install NAudio + nuget install NAudio -Version 1.10.0 cp NAudio*/lib/net35/NAudio.dll ${TASKCLUSTER_TMP_DIR}/ds/ cp ${PROJECT_NAME}.${DS_VERSION}/build/libdeepspeech.so ${TASKCLUSTER_TMP_DIR}/ds/ cp ${PROJECT_NAME}.${DS_VERSION}/lib/net46/DeepSpeechClient.dll ${TASKCLUSTER_TMP_DIR}/ds/