From 6986e4f5c74bf23a0c4a63b2bac91a5e0465d958 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 10 Jun 2024 18:02:03 +0200
Subject: [PATCH] Add libvorbis patch

---
 .github/workflows/build.yml   | 10 ++++++++++
 patches/libvorbis-fixes.patch | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 patches/libvorbis-fixes.patch

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f90d7c..d8f07c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1693,6 +1693,16 @@ jobs:
         working-directory: build
         run: tar -xf ../downloads/libvorbis-${{env.libvorbis_version}}.tar.gz
 
+      - name: Patch libvorbis
+        shell: bash
+        working-directory: build/libvorbis-${{env.libvorbis_version}}
+        run: patch -p1 < ../../patches/libvorbis-fixes.patch
+
+      - name: libvorbis autogen
+        shell: bash
+        working-directory: build/libvorbis-${{env.libvorbis_version}}
+        run: ./autogen.sh
+
       - name: Configure libvorbis
         shell: bash
         env:
diff --git a/patches/libvorbis-fixes.patch b/patches/libvorbis-fixes.patch
new file mode 100644
index 0000000..7daf1a6
--- /dev/null
+++ b/patches/libvorbis-fixes.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 14a267f..963b74b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,9 +202,9 @@ else
+ 		CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ 		PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
+ 	*-*-darwin*)
+-		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+-		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
++		DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
++		CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
++		PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
+ 	*-*-os2*)
+ 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
+ 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"