From d6ec1c123b3a957966ac479b89892aa77e7b8eef Mon Sep 17 00:00:00 2001
From: Joseph Cloutier <jkcloutier@gmail.com>
Date: Sun, 8 May 2022 23:20:50 -0400
Subject: [PATCH] Use the official Ogg repo as a submodule.

Continuing to use version 1.3.2 for now.

`-DNATIVE_TOOLKIT_OGG` seems unused, and has been excluded.
---
 .gitmodules                                   |  2 +-
 project/lib/ogg                               |  2 +-
 project/lib/ogg-files.xml                     |  2 +-
 .../overrides/ogg/include/ogg/config_types.h  | 26 +++++++++++++++++++
 project/lib/vorbis-files.xml                  | 12 ++++-----
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 project/lib/overrides/ogg/include/ogg/config_types.h

diff --git a/.gitmodules b/.gitmodules
index 707353a8e..0f4d1dd34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/curl/curl
 [submodule "project/lib/ogg"]
 	path = project/lib/ogg
-	url = https://github.com/openfl/libogg
+	url = https://github.com/xiph/ogg
 [submodule "project/lib/zlib"]
 	path = project/lib/zlib
 	url = https://github.com/openfl/libzlib
diff --git a/project/lib/ogg b/project/lib/ogg
index 9ebcb88b6..36606a06c 160000
--- a/project/lib/ogg
+++ b/project/lib/ogg
@@ -1 +1 @@
-Subproject commit 9ebcb88b698162d70e7cb152f0a94b9a984b4bd9
+Subproject commit 36606a06c60fabb1d87ec204ae4f14dfe1224362
diff --git a/project/lib/ogg-files.xml b/project/lib/ogg-files.xml
index 810d6453b..3c0f1483f 100644
--- a/project/lib/ogg-files.xml
+++ b/project/lib/ogg-files.xml
@@ -1,7 +1,7 @@
 <xml>
 
    <files id="native-toolkit-ogg-depends">
-      <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/config_types.h"/>
+      <depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h"/>
       <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/>
       <depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/>
    </files>
diff --git a/project/lib/overrides/ogg/include/ogg/config_types.h b/project/lib/overrides/ogg/include/ogg/config_types.h
new file mode 100644
index 000000000..456a13c8f
--- /dev/null
+++ b/project/lib/overrides/ogg/include/ogg/config_types.h
@@ -0,0 +1,26 @@
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+
+
+#ifdef BLACKBERRY
+
+    /* QNX */
+#  include <inttypes.h>
+   typedef int16_t ogg_int16_t;
+   typedef uint16_t ogg_uint16_t;
+   typedef int32_t ogg_int32_t;
+   typedef uint32_t ogg_uint32_t;
+   typedef int64_t ogg_int64_t;
+
+#else
+#  include <inttypes.h>
+
+/* these are filled in by configure */
+typedef int16_t ogg_int16_t;
+typedef unsigned short ogg_uint16_t;
+typedef int32_t ogg_int32_t;
+typedef unsigned int ogg_uint32_t;
+typedef int64_t ogg_int64_t;
+
+#endif
+#endif
diff --git a/project/lib/vorbis-files.xml b/project/lib/vorbis-files.xml
index 9b92ca046..5ef13fde7 100644
--- a/project/lib/vorbis-files.xml
+++ b/project/lib/vorbis-files.xml
@@ -5,15 +5,15 @@
 		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/vorbisenc.h"/>
 		<depend name="${NATIVE_TOOLKIT_PATH}/vorbis/include/vorbis/vorbisfile.h"/>
 	</files>
-	
+
 	<files id="native-toolkit-vorbis" tags="" >
-		
+
 		<cache value="1" />
 		<tag value="${NATIVE_TOOLKIT_OPTIM_TAG}" if="NATIVE_TOOLKIT_OPTIM_TAG" />
 
 		<depend files="native-toolkit-vorbis-depends"/>
 
-		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/config_types.h"/>
+		<depend name="${NATIVE_TOOLKIT_PATH}/overrides/ogg/include/ogg/config_types.h"/>
 		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/ogg.h"/>
 		<depend name="${NATIVE_TOOLKIT_PATH}/ogg/include/ogg/os_types.h"/>
 
@@ -40,7 +40,7 @@
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/vorbis/include/"/>
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/ogg/include/"/>
-		
+
 		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/mdct.c"/>
 		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/smallft.c"/>
 		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/block.c"/>
@@ -63,7 +63,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/bitrate.c"/>
 		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/vorbisfile.c"/>
 		<file name="${NATIVE_TOOLKIT_PATH}/vorbis/lib/vorbisenc.c"/>
-		
+
 	</files>
-	
+
 </xml>