From fa619aaae81a1b91cdccc143f673957c195153ab Mon Sep 17 00:00:00 2001
From: Tom M <tom.mbrt@googlemail.com>
Date: Sat, 26 Feb 2022 00:05:04 +0100
Subject: [PATCH] Update Android CI to use FLAC 1.3.4 (#1056)

Update Pipeline from master and bump FLAC to 1.3.4
---
 .azure/azure-pipelines-android.yml | 53 +++---------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/.azure/azure-pipelines-android.yml b/.azure/azure-pipelines-android.yml
index 1c6fa2a5..c289b1fd 100644
--- a/.azure/azure-pipelines-android.yml
+++ b/.azure/azure-pipelines-android.yml
@@ -33,7 +33,7 @@ schedules:
 variables:
   ICONV_VERSION: '1.16'
   # Use recent master libffi, because 3.3 is broken: checking host system type... Invalid configuration `arm-none-linux-eabi': machine `arm-none-linux' not recognized
-  FFI_VERSION: 'dd5bd03075149d7cf8441875c1a344e8beb57dde'
+  FFI_VERSION: '3.4.2'
   GETTEXT_VERSION: '0.21'
   #need to switch to meson build system to use a more recent version 
   GLIB_VERSION: '2.58'
@@ -44,8 +44,7 @@ variables:
   VORBIS_VERSION: '1.3.7'
   OGG_VERSION: '1.3.5'
   OPUS_VERSION: '1.3.1'
-  # flac 1.3.3 is completely broken: pkgconfig is incorrectly installed, compilation failure, etc.; use recent master instead
-  FLAC_VERSION: '27c615706cedd252a206dd77e3910dfa395dcc49'
+  FLAC_VERSION: '1.3.4'
 
   # Android NDK sources and standalone toolchain is put here
   DEV: '$(System.DefaultWorkingDirectory)/android-build-root'
@@ -136,7 +135,7 @@ jobs:
         wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz
         tar zxf libiconv-${ICONV_VERSION}.tar.gz
 
-        wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/archive/${FFI_VERSION}.tar.gz
+        wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/releases/download/v${FFI_VERSION}/libffi-${FFI_VERSION}.tar.gz
         tar zxf libffi-${FFI_VERSION}.tar.gz
 
         wget http://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz
@@ -160,7 +159,7 @@ jobs:
         wget https://github.com/xiph/ogg/releases/download/v${OGG_VERSION}/libogg-${OGG_VERSION}.tar.gz
         tar zxf libogg-${OGG_VERSION}.tar.gz
 
-        wget -O flac-${FLAC_VERSION}.tar.gz https://github.com/xiph/flac/archive/${FLAC_VERSION}.tar.gz
+        wget -O flac-${FLAC_VERSION}.tar.gz https://github.com/xiph/flac/archive/refs/tags/${FLAC_VERSION}.tar.gz
         tar xf flac-${FLAC_VERSION}.tar.gz
 
         wget -O opus-${OPUS_VERSION}.tar.gz https://github.com/xiph/opus/archive/refs/tags/v${OPUS_VERSION}.tar.gz
@@ -470,26 +469,10 @@ jobs:
         sourceDir: 'libogg-$(OGG_VERSION)'
         cmakeArgs: '-DINSTALL_DOCS=0'
 
-    - script: |
-        ls -la libogg-${OGG_VERSION}/build/CMakeFiles/
-        cat libogg-${OGG_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print OGG Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     - template: cmake-android.yml
       parameters:
         sourceDir: 'libvorbis-$(VORBIS_VERSION)'
 
-    - script: |
-        ls -la libvorbis-${VORBIS_VERSION}/build/CMakeFiles/
-        cat libvorbis-${VORBIS_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print Vorbis Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     # flac uses c99 macros, but doesnt specify a standard, so we need to do it explicitly.
     # On i686, they invoke yasm with -fstack-protector-strong flag... turn off asm optimizations.
     - template: cmake-android.yml
@@ -497,42 +480,17 @@ jobs:
         sourceDir: 'flac-$(FLAC_VERSION)'
         cmakeArgs: '-DCMAKE_C_STANDARD=99 -DCMAKE_C_STANDARD_REQUIRED=1 -DWITH_ASM=0 -DBUILD_CXXLIBS=0 -DBUILD_PROGRAMS=0 -DBUILD_EXAMPLES=0 -DBUILD_DOCS=0 -DINSTALL_MANPAGES=0'
 
-    - script: |
-        ls -la flac-${FLAC_VERSION}/build/CMakeFiles/
-        cat flac-${FLAC_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print FLAC Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     # another broken xiph project that doesn't specify the C standard and keeps complaining of you don't have C99
     - template: cmake-android.yml
       parameters:
         sourceDir: 'opus-$(OPUS_VERSION)'
         cmakeArgs: '-DBUILD_PROGRAMS=0 -DOPUS_MAY_HAVE_NEON=1 -DCMAKE_C_STANDARD=99 -DCMAKE_C_STANDARD_REQUIRED=1'
 
-    - script: |
-        ls -la opus-${OPUS_VERSION}/build/CMakeFiles/
-        cat opus-${OPUS_VERSION}/build/CMakeFiles/CMakeError.log
-        cat opus-${OPUS_VERSION}/build/CMakeFiles/CMakeOutput.log
-        true
-      displayName: 'Print OPUS Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     - template: cmake-android.yml
       parameters:
         sourceDir: 'libsndfile-$(SNDFILE_VERSION)'
         cmakeArgs: '-DBUILD_PROGRAMS=0 -DBUILD_EXAMPLES=0'
 
-    - script: |
-        ls -la libsndfile-${SNDFILE_VERSION}/build/CMakeFiles/
-        cat libsndfile-${SNDFILE_VERSION}/build/CMakeFiles/CMakeError.log
-        true
-      displayName: 'Print libsndfile Cmake Error Log'
-      condition: always()
-      workingDirectory: $(DEV)
-
     - template: cmake-android.yml
       parameters:
         sourceDir: 'oboe-$(OBOE_VERSION)'
@@ -598,12 +556,11 @@ jobs:
         sourceDir: '.'
         condition: succeeded()
         installCommand: 'cp *.so ${PREFIX}/lib/'
-      
 
     - script: |
         ls -Rg $(PREFIX)
       displayName: 'Show cross-compiled files in $(PREFIX)'
-      condition: always()
+      condition: or(succeeded(), failed())
 
     - script: |
         set -ex