[vlc-commits] contrib: ogg: fix typedefs for MacOS

[Tristan Matthews]

vlc | branch: master | Tristan Matthews <tmatth at videolan.org> | Sat Sep  7 00:44:14 2019 -0400| [03b3f47bda6f462533c2d8eab74ea44799053b2c] | committer: David Fuhrmann

contrib: ogg: fix typedefs for MacOS

This was breaking the flac contrib build.

Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03b3f47bda6f462533c2d8eab74ea44799053b2c
---

 contrib/src/ogg/libogg-uint-macos.patch | 17 +++++++++++++++++
 contrib/src/ogg/rules.mak               |  1 +
 2 files changed, 18 insertions(+)

diff --git a/contrib/src/ogg/libogg-uint-macos.patch b/contrib/src/ogg/libogg-uint-macos.patch
new file mode 100644
index 0000000000..fd5769487f
--- /dev/null
+++ b/contrib/src/ogg/libogg-uint-macos.patch
@@ -0,0 +1,17 @@
+--- libogg/include/ogg/os_types.h	2019-08-13 12:31:53.000000000 -0400
++++ libogg-new/include/ogg/os_types.h	2019-09-07 00:40:07.000000000 -0400
+@@ -72,11 +72,11 @@
+ 
+ #  include <sys/types.h>
+    typedef int16_t ogg_int16_t;
+-   typedef uint16_t ogg_uint16_t;
++   typedef u_int16_t ogg_uint16_t;
+    typedef int32_t ogg_int32_t;
+-   typedef uint32_t ogg_uint32_t;
++   typedef u_int32_t ogg_uint32_t;
+    typedef int64_t ogg_int64_t;
+-   typedef uint64_t ogg_uint64_t;
++   typedef u_int64_t ogg_uint64_t;
+ 
+ #elif defined(__HAIKU__)
+ 
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 91cb6b80de..ef03a645b9 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -19,6 +19,7 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 	$(UNPACK)
 	$(APPLY) $(SRC)/ogg/libogg-configure.patch
 	$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
+	$(APPLY) $(SRC)/ogg/libogg-uint-macos.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)