From b50b14a093751e5f72d4be175454c8d16a41e4fb Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Fri, 17 Apr 2020 17:11:24 +0200
Subject: [PATCH] Upgrade to fpcalc 1.5.0 for Windows and macOS builds

---
 .github/workflows/package.yml  | 4 ++--
 scripts/package/macos-setup.sh | 2 +-
 scripts/package/win-setup.ps1  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 6ef88e654..20f1d51ab 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: macos-latest
     env:
       DISCID_VERSION: 0.6.2
-      FPCALC_VERSION: 1.4.4-9
+      FPCALC_VERSION: 1.5.0
       PYTHON_VERSION: 3.7.6
       MACOSX_DEPLOYMENT_TARGET: 10.12
     steps:
@@ -104,7 +104,7 @@ jobs:
         New-Item -Name .\artifacts -ItemType Directory
       env:
         DISCID_VERSION: 0.6.2
-        FPCALC_VERSION: 1.4.4-9
+        FPCALC_VERSION: 1.5.0
     - name: Patch build version
       if: startsWith(github.ref, 'refs/tags/') != true
       run: |
diff --git a/scripts/package/macos-setup.sh b/scripts/package/macos-setup.sh
index fba7421d8..0ce20de75 100755
--- a/scripts/package/macos-setup.sh
+++ b/scripts/package/macos-setup.sh
@@ -24,6 +24,6 @@ fi
 cp "$HOME/libdiscid/lib/libdiscid.0.dylib" .
 
 # Install fpcalc
-wget "https://github.com/phw/chromaprint/releases/download/v$FPCALC_VERSION/chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64.tar.gz"
+wget "https://github.com/acoustid/chromaprint/releases/download/v$FPCALC_VERSION/chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64.tar.gz"
 tar -xf "chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64.tar.gz"
 cp "chromaprint-fpcalc-$FPCALC_VERSION-macos-x86_64/fpcalc" .
diff --git a/scripts/package/win-setup.ps1 b/scripts/package/win-setup.ps1
index e0958c19c..ea2c49ff7 100644
--- a/scripts/package/win-setup.ps1
+++ b/scripts/package/win-setup.ps1
@@ -33,7 +33,7 @@ Copy-Item .\build\libdiscid\discid.dll .
 
 $ArchiveFile = ".\build\fpcalc.zip"
 Write-Output "Downloading chromaprint-fpcalc to $ArchiveFile..."
-DownloadFile -Url "https://github.com/phw/chromaprint/releases/download/v$FpcalVersion/chromaprint-fpcalc-$FpcalVersion-windows-x86_64.zip" `
+DownloadFile -Url "https://github.com/acoustid/chromaprint/releases/download/v$FpcalVersion/chromaprint-fpcalc-$FpcalVersion-windows-x86_64.zip" `
     -FileName $ArchiveFile
 Expand-Archive -Path $ArchiveFile -DestinationPath .\build\fpcalc -Force
 Copy-Item .\build\fpcalc\chromaprint-fpcalc-$FpcalVersion-windows-x86_64\fpcalc.exe .