From dfda3d28a70206128a5bb0aac36da01ca09e6c33 Mon Sep 17 00:00:00 2001
From: erebion <noreply@erebion.eu>
Date: Mon, 10 Feb 2025 01:57:24 +0100
Subject: [PATCH] remove workarounds that are no longer required, use a
 different ALSA UCM conf that works better for now

---
 ansible/audio.yml | 88 +++--------------------------------------------
 1 file changed, 5 insertions(+), 83 deletions(-)

diff --git a/ansible/audio.yml b/ansible/audio.yml
index 3d81332..198b03b 100644
--- a/ansible/audio.yml
+++ b/ansible/audio.yml
@@ -12,7 +12,8 @@
 
     - name: "Download https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/master/alsa-ucm-conf-master.tar.gz"
       ansible.builtin.get_url:
-        url: "https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/master/alsa-ucm-conf-master.tar.gz"
+        #url: "https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/master/alsa-ucm-conf-master.tar.gz"
+        url: "https://gitlab.com/a-wai/alsa-ucm-conf-sdm670/-/archive/master/alsa-ucm-conf-master.tar.gz"
         dest: /root/alsa-ucm-conf-master.tar.gz
         force: true # overwrite if the already have a previous version
         mode: '0440'
@@ -61,86 +62,7 @@
           - libtinyalsa      # package will have to be renamed for the repos
           - libtinyalsa-dev
           - tinyalsa
+          - q6voiced
+          - libtinyalsa2
+          - libtinyalsa2-dev
         state: absent
-
-    ### Call Audio ###
-
-    - name: "Install dependencies"
-      ansible.builtin.apt:
-        pkg:
-          - gcc
-          - git
-          - libdbus-1-dev
-          - libdbus-cpp-dev
-          - make
-          - devscripts
-          - doxygen
-          - graphviz
-        state: present
-        update_cache: true
-
-    - name: "Add directory that the repos get cloned into"
-      ansible.builtin.file:
-        path: "/opt/repos"
-        state: "directory"
-        owner: nobody
-        group: nogroup
-
-    - name: "chown repo directories to nobody:nogroup"
-      ansible.builtin.file:
-        path: "/opt/repos/"
-        recurse: true
-        owner: nobody
-        group: nogroup
-
-    - name: "Remove repos that already exist"
-      ansible.builtin.file:
-        path: "/opt/repos/{{ item }}"
-        state: "absent"
-        owner: nobody
-        group: nogroup
-      loop:
-        - "tinyalsa"
-        - "q6voiced"
-
-    - name: "Clone tinyalsa repo"
-      ansible.builtin.git:
-        repo: 'https://salsa.debian.org/erebion/tinyalsa.git'
-        dest: /opt/repos/tinyalsa
-        version: 8ebe2c17c1ec8a933873cefec66c90744a4f7181
-      become_user: nobody
-      delay: 2
-      retries: 20
-
-    - name: "Clone q6voiced repo"
-      ansible.builtin.git:
-        repo: 'https://salsa.debian.org/erebion/q6voiced.git'
-        dest: /opt/repos/q6voiced
-        version: d9acbd1f5120c57586d808d60e9ccf425ae5bee0
-      become_user: nobody
-      delay: 2
-      retries: 20
-
-    - name: "Build Debian packages for tinyalsa"
-      ansible.builtin.shell:
-        cmd: debuild -i -us -uc -b
-        chdir: "/opt/repos/tinyalsa/"
-      become_user: nobody
-
-    - name: "Install tinyalsa"
-      ansible.builtin.apt:
-        deb: "/opt/repos/{{ item }}"
-      loop:
-        - "libtinyalsa2_2.0.0+git20240621-1_arm64.deb"
-        - "libtinyalsa2-dev_2.0.0+git20240621-1_arm64.deb"
-        - "tinyalsa_2.0.0+git20240621-1_arm64.deb"
-
-    - name: "Build Debian package for q6voiced"
-      ansible.builtin.shell:
-        cmd: debuild -i -us -uc -b
-        chdir: "/opt/repos/q6voiced/"
-      become_user: nobody
-
-    - name: "Install tinyalsa and q6voiced"
-      ansible.builtin.apt:
-        deb: "/opt/repos/q6voiced_0.0.0+git20240607-1_arm64.deb"