From c99d8b0bbacef00b647e0860566e151365112ed4 Mon Sep 17 00:00:00 2001
From: Eblo <7004497+Eblo@users.noreply.github.com>
Date: Sat, 8 Feb 2025 22:05:49 -0500
Subject: [PATCH] Fix Ruby and Vorbis at the Makefile level

(cherry picked from commit edd115a32020f8ff84fbcfb170b3806cb52feda2)
---
 linux/Makefile                 | 2 +-
 macos/Dependencies/common.make | 6 ++++--
 windows/Makefile               | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index 3ee14767..9a4a40fd 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -89,7 +89,7 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh
 	./autogen.sh
 
 $(DOWNLOADS)/vorbis/autogen.sh:
-	$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis
+	$(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis
 
 
 # Ogg, dependency of Vorbis
diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make
index 793a8ddc..d86d10ed 100644
--- a/macos/Dependencies/common.make
+++ b/macos/Dependencies/common.make
@@ -93,7 +93,8 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh
 	./autogen.sh
 
 $(DOWNLOADS)/vorbis/autogen.sh:
-	$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis
+	$(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis
+	sed -i '' 's/ -force_cpusubtype_ALL / /g' $(DOWNLOADS)/vorbis/configure.ac
 
 
 # Ogg, dependency of Vorbis
@@ -320,7 +321,8 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac
 	cd $(DOWNLOADS)/ruby; autoreconf -i
 
 $(DOWNLOADS)/ruby/configure.ac:
-	$(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1;
+	$(CLONE) $(GITHUB)/Eblo/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1;
+	sed -i '' 's/ DYLD_INSERT_LIBRARIES / /g' $(DOWNLOADS)/ruby/configure.ac
 
 # ====
 init_dirs:
diff --git a/windows/Makefile b/windows/Makefile
index 11b2327c..0d2e3c8a 100755
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -84,7 +84,7 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh
 	./autogen.sh
 
 $(DOWNLOADS)/vorbis/autogen.sh:
-	$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis
+	$(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis
 
 
 # Ogg, dependency of Vorbis