[vlc-devel] [PATCH] contrib: ogg: fix typedefs for MacOS

Marvin Scholz (ePirat) epirat07 at gmail.com
Sun Sep 8 19:47:41 CEST 2019


Why is this needed? Including the right header macOS should have these types, no?

Von meinem iPhone gesendet

> Am 08.09.2019 um 18:17 schrieb David Fuhrmann <david.fuhrmann at gmail.com>:
> 
> Hi Tristan,
> 
> Thanks for fixing the issue, compiles fine for me, so I pushed it.
> 
> BR. David
> 
>> Am 07.09.2019 um 06:44 schrieb Tristan Matthews <tmatth at videolan.org>:
>> 
>> This was breaking the flac contrib build.
>> ---
>> contrib/src/ogg/libogg-uint-macos.patch | 17 +++++++++++++++++
>> contrib/src/ogg/rules.mak               |  1 +
>> 2 files changed, 18 insertions(+)
>> create mode 100644 contrib/src/ogg/libogg-uint-macos.patch
>> 
>> 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)
>> 
>> -- 
>> 2.22.0
>> 
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


More information about the vlc-devel mailing list