From f0fc75a76563525ca2ec9dcb82e38efdf202e88f Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Wed, 18 Oct 2023 15:05:51 +0000
Subject: [PATCH] Bug 1859227 - Remove obsolete ogg solaris-types.patch to fix
 Solaris build. r=media-playback-reviewers,padenot

Compiling ogg on Solaris no longer requires solaris-types.patch because
the ogg typedefs defined using std int types in os_types.h are adequate.

Differential Revision: https://phabricator.services.mozilla.com/D191265
---
 media/libogg/include/ogg/os_types.h | 10 ----------
 media/libogg/moz.yaml               |  1 -
 media/libogg/solaris-types.patch    | 22 ----------------------
 3 files changed, 33 deletions(-)
 delete mode 100644 media/libogg/solaris-types.patch

diff --git a/media/libogg/include/ogg/os_types.h b/media/libogg/include/ogg/os_types.h
index a8d4600fb061..72f781d185cc 100644
--- a/media/libogg/include/ogg/os_types.h
+++ b/media/libogg/include/ogg/os_types.h
@@ -99,16 +99,6 @@ extern ogg_free_function_type *ogg_free_func;
    typedef int64_t ogg_int64_t;
    typedef u_int64_t ogg_uint64_t;
 
-#elif defined(__sun__)
-
-   /* Solaris and derivatives */
-#  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;
-
 #elif defined(__HAIKU__)
 
   /* Haiku */
diff --git a/media/libogg/moz.yaml b/media/libogg/moz.yaml
index 65f362f46f3c..6873951af8e7 100644
--- a/media/libogg/moz.yaml
+++ b/media/libogg/moz.yaml
@@ -96,7 +96,6 @@ vendoring:
       to: '{vendor_dir}/include/ogg/config_types.h'
 
   patches:
-    - solaris-types.patch
     - memory-reporting.patch
 
 updatebot:
diff --git a/media/libogg/solaris-types.patch b/media/libogg/solaris-types.patch
deleted file mode 100644
index e05b7a8d39ce..000000000000
--- a/media/libogg/solaris-types.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: include/ogg/os_types.h
-===================================================================
---- a/include/ogg/os_types.h      (revision 18100)
-+++ b/include/ogg/os_types.h      (working copy)
-@@ -75,6 +75,16 @@
-    typedef uint32_t ogg_uint32_t;
-    typedef int64_t ogg_int64_t;
- 
-+#elif defined(__sun__)
-+
-+   /* Solaris and derivatives */
-+#  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;
-+
- #elif defined(__HAIKU__)
- 
-   /* Haiku */
-