From b282abbd4a8914646e5c3dc0d43a3d674e4f8b89 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Tue, 14 Sep 2021 14:52:38 -0400
Subject: [PATCH] fix builds (build from release tarballs)

---
 Dockerfile         | 14 +++++++++-----
 Dockerfile.aarch64 | 14 +++++++++-----
 Dockerfile.armhf   | 14 +++++++++-----
 README.md          |  1 +
 readme-vars.yml    |  1 +
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e0ffcb0..09ab95b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,11 @@ RUN \
     libasound2-dev \
     libavformat-dev \
     libgtk2.0-dev \
-    libjack-jackd2-dev && \
+    libjack-jackd2-dev \
+    python3-dev \
+    python3-pip && \
+  pip3 install -U pip && \
+  pip install conan && \
   echo "**** build audacity ****" && \
   if [ -z ${AUDACITY_VERSION+x} ]; then \
     AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \
@@ -22,10 +26,10 @@ RUN \
   fi && \
   mkdir -p /app/audacity/build && \
   curl -o \
-    /tmp/audacity.tar.xz -L \
-    "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \
+    /tmp/audacity.tar.gz -L \
+    "https://github.com/audacity/audacity/archive/refs/tags/Audacity-${AUDACITY_VERSION}.tar.gz" && \
   tar xf \
-    /tmp/audacity.tar.xz -C \
+    /tmp/audacity.tar.gz -C \
     /app/audacity --strip-components=1 && \
   cd /app/audacity/build && \
   cmake -DCMAKE_BUILD_TYPE=Release -Daudacity_use_wxwidgets=local -Daudacity_use_ffmpeg=loaded .. && \
@@ -33,7 +37,7 @@ RUN \
   make install && \
   echo "**** cleanup ****" && \
   apt-get purge --auto-remove -y \
-	build-essential \
+	  build-essential \
     cmake \
     curl \
     gcc \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index acc9425..dfe1608 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -14,7 +14,11 @@ RUN \
     libasound2-dev \
     libavformat-dev \
     libgtk2.0-dev \
-    libjack-jackd2-dev && \
+    libjack-jackd2-dev \
+    python3-dev \
+    python3-pip && \
+  pip3 install -U pip && \
+  pip install conan && \
   echo "**** build audacity ****" && \
   if [ -z ${AUDACITY_VERSION+x} ]; then \
     AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \
@@ -22,10 +26,10 @@ RUN \
   fi && \
   mkdir -p /app/audacity/build && \
   curl -o \
-    /tmp/audacity.tar.xz -L \
-    "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \
+    /tmp/audacity.tar.gz -L \
+    "https://github.com/audacity/audacity/archive/refs/tags/Audacity-${AUDACITY_VERSION}.tar.gz" && \
   tar xf \
-    /tmp/audacity.tar.xz -C \
+    /tmp/audacity.tar.gz -C \
     /app/audacity --strip-components=1 && \
   cd /app/audacity/build && \
   cmake -DCMAKE_BUILD_TYPE=Release -Daudacity_use_wxwidgets=local -Daudacity_use_ffmpeg=loaded .. && \
@@ -33,7 +37,7 @@ RUN \
   make install && \
   echo "**** cleanup ****" && \
   apt-get purge --auto-remove -y \
-	build-essential \
+	  build-essential \
     cmake \
     curl \
     gcc \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 4d1104a..375566e 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -14,7 +14,11 @@ RUN \
     libasound2-dev \
     libavformat-dev \
     libgtk2.0-dev \
-    libjack-jackd2-dev && \
+    libjack-jackd2-dev \
+    python3-dev \
+    python3-pip && \
+  pip3 install -U pip && \
+  pip install conan && \
   echo "**** build audacity ****" && \
   if [ -z ${AUDACITY_VERSION+x} ]; then \
     AUDACITY_VERSION=$(curl -sX GET "https://api.github.com/repos/audacity/audacity/releases/latest" \
@@ -22,10 +26,10 @@ RUN \
   fi && \
   mkdir -p /app/audacity/build && \
   curl -o \
-    /tmp/audacity.tar.xz -L \
-    "https://github.com/audacity/audacity/releases/download/Audacity-${AUDACITY_VERSION}/audacity-minsrc-${AUDACITY_VERSION}.tar.xz" && \
+    /tmp/audacity.tar.gz -L \
+    "https://github.com/audacity/audacity/archive/refs/tags/Audacity-${AUDACITY_VERSION}.tar.gz" && \
   tar xf \
-    /tmp/audacity.tar.xz -C \
+    /tmp/audacity.tar.gz -C \
     /app/audacity --strip-components=1 && \
   cd /app/audacity/build && \
   cmake -DCMAKE_BUILD_TYPE=Release -Daudacity_use_wxwidgets=local -Daudacity_use_ffmpeg=loaded .. && \
@@ -33,7 +37,7 @@ RUN \
   make install && \
   echo "**** cleanup ****" && \
   apt-get purge --auto-remove -y \
-	build-essential \
+	  build-essential \
     cmake \
     curl \
     gcc \
diff --git a/README.md b/README.md
index 4acd80f..8ccdc9f 100644
--- a/README.md
+++ b/README.md
@@ -225,4 +225,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.09.21:** - Fix builds (build from release tarballs).
 * **07.04.21:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 6ddeb9e..0733687 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -43,4 +43,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "14.09.21:", desc: "Fix builds (build from release tarballs)." }
   - { date: "07.04.21:", desc: "Initial release." }