From 8d42ec7ae874bb6e5f67dbb49db9cd8915ec9364 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sat, 12 Feb 2022 22:39:21 -0800
Subject: [PATCH] rebase to fedora 35

---
 Dockerfile         | 11 ++++++-----
 Dockerfile.aarch64 | 11 ++++++-----
 Dockerfile.armhf   | 11 ++++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0b6644a..beaee15 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-fedora:34 as buildstage
+FROM ghcr.io/linuxserver/baseimage-fedora:35 as buildstage
 
-ARG XRDP_PULSE_VERSION=v0.5
+ARG XRDP_PULSE_VERSION=v0.6
 
 RUN \
   echo "**** install build deps ****" && \
@@ -9,6 +9,7 @@ RUN \
   dnf install -y \
     'dnf-command(builddep)' \
     'dnf-command(download)' \
+    libtool \
     rpmdevtools \
     wget \
     yum-utils && \
@@ -27,13 +28,13 @@ RUN \
     pulseaudio*.src.rpm
 
 RUN \
-  echo "**** run pulseaudio config ****" && \
+  echo "**** run pulseaudio meson build ****" && \
   VERSION=$(ls -1 /root/rpmbuild/SOURCES/*.tar.xz | \
     awk -F '(pulseaudio-|.tar.xz)' '/pulseaudio-/ {print $2; exit}') && \
   cd ~/rpmbuild/SOURCES/ && \
   tar -xf pulseaudio-${VERSION}.tar.xz && \
   cd pulseaudio-${VERSION} && \
-  ./configure
+  meson build
 
 RUN \
   echo "**** build pulseaudio xrdp module ****" && \
@@ -56,7 +57,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-fedora:34
+FROM ghcr.io/linuxserver/baseimage-fedora:35
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7e970c3..be7a1ce 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-34 as buildstage
+FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35 as buildstage
 
-ARG XRDP_PULSE_VERSION=v0.5
+ARG XRDP_PULSE_VERSION=v0.6
 
 RUN \
   echo "**** install build deps ****" && \
@@ -9,6 +9,7 @@ RUN \
   dnf install -y \
     'dnf-command(builddep)' \
     'dnf-command(download)' \
+    libtool \
     rpmdevtools \
     wget \
     yum-utils && \
@@ -27,13 +28,13 @@ RUN \
     pulseaudio*.src.rpm
 
 RUN \
-  echo "**** run pulseaudio config ****" && \
+  echo "**** run pulseaudio meson build ****" && \
   VERSION=$(ls -1 /root/rpmbuild/SOURCES/*.tar.xz | \
     awk -F '(pulseaudio-|.tar.xz)' '/pulseaudio-/ {print $2; exit}') && \
   cd ~/rpmbuild/SOURCES/ && \
   tar -xf pulseaudio-${VERSION}.tar.xz && \
   cd pulseaudio-${VERSION} && \
-  ./configure
+  meson build
 
 RUN \
   echo "**** build pulseaudio xrdp module ****" && \
@@ -56,7 +57,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:arm64v8-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-34
+FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index f14d07e..54473ec 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,6 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-34 as buildstage
+FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35 as buildstage
 
-ARG XRDP_PULSE_VERSION=v0.5
+ARG XRDP_PULSE_VERSION=v0.6
 
 RUN \
   echo "**** install build deps ****" && \
@@ -9,6 +9,7 @@ RUN \
   dnf install -y \
     'dnf-command(builddep)' \
     'dnf-command(download)' \
+    libtool \
     rpmdevtools \
     wget \
     yum-utils && \
@@ -27,13 +28,13 @@ RUN \
     pulseaudio*.src.rpm
 
 RUN \
-  echo "**** run pulseaudio config ****" && \
+  echo "**** run pulseaudio meson build ****" && \
   VERSION=$(ls -1 /root/rpmbuild/SOURCES/*.tar.xz | \
     awk -F '(pulseaudio-|.tar.xz)' '/pulseaudio-/ {print $2; exit}') && \
   cd ~/rpmbuild/SOURCES/ && \
   tar -xf pulseaudio-${VERSION}.tar.xz && \
   cd pulseaudio-${VERSION} && \
-  ./configure
+  meson build
 
 RUN \
   echo "**** build pulseaudio xrdp module ****" && \
@@ -56,7 +57,7 @@ RUN \
 FROM ghcr.io/linuxserver/docker-compose:arm32v7-latest as compose
 
 # runtime stage
-FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-34
+FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35
 
 # set version label
 ARG BUILD_DATE