CVS commit: pkgsrc/multimedia/libogg

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sun Sep  8 19:11:30 UTC 2019

Modified Files:
        pkgsrc/multimedia/libogg: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libogg/patches: patch-include_ogg_os__types.h

Log Message:
multimedia/libogg: use stdint.h on darwin

broken by https://gitlab.xiph.org/xiph/ogg/issues/2294
see discussion


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/libogg/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/libogg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libogg/patches/patch-include_ogg_os__types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libogg/Makefile
diff -u pkgsrc/multimedia/libogg/Makefile:1.26 pkgsrc/multimedia/libogg/Makefile:1.27
--- pkgsrc/multimedia/libogg/Makefile:1.26      Mon Sep  2 08:58:57 2019
+++ pkgsrc/multimedia/libogg/Makefile   Sun Sep  8 19:11:30 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2019/09/02 08:58:57 adam Exp $
+# $NetBSD: Makefile,v 1.27 2019/09/08 19:11:30 dbj Exp $
 
 DISTNAME=      libogg-1.3.4
+PKGREVISION=   1
 CATEGORIES=    multimedia devel
 MASTER_SITES=  http://downloads.xiph.org/releases/ogg/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/multimedia/libogg/distinfo
diff -u pkgsrc/multimedia/libogg/distinfo:1.15 pkgsrc/multimedia/libogg/distinfo:1.16
--- pkgsrc/multimedia/libogg/distinfo:1.15      Mon Sep  2 08:58:57 2019
+++ pkgsrc/multimedia/libogg/distinfo   Sun Sep  8 19:11:30 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2019/09/02 08:58:57 adam Exp $
+$NetBSD: distinfo,v 1.16 2019/09/08 19:11:30 dbj Exp $
 
 SHA1 (libogg-1.3.4.tar.xz) = f07499a35566aa62affb5ca989f62eed5b8092c3
 RMD160 (libogg-1.3.4.tar.xz) = ee76a42b00bc11d483de53d9e84a487be3900d06
 SHA512 (libogg-1.3.4.tar.xz) = 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
 Size (libogg-1.3.4.tar.xz) = 428696 bytes
 SHA1 (patch-configure) = d33ee766a1fb7f81b9fc38930a26279aa506244a
+SHA1 (patch-include_ogg_os__types.h) = b491e3c530e285bd901618245890d4a1504ad147

Added files:

Index: pkgsrc/multimedia/libogg/patches/patch-include_ogg_os__types.h
diff -u /dev/null pkgsrc/multimedia/libogg/patches/patch-include_ogg_os__types.h:1.1
--- /dev/null   Sun Sep  8 19:11:30 2019
+++ pkgsrc/multimedia/libogg/patches/patch-include_ogg_os__types.h      Sun Sep  8 19:11:30 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-include_ogg_os__types.h,v 1.1 2019/09/08 19:11:30 dbj Exp $
+
+use stdint.h on macos
+This was broken by a recent change.  See comments in:
+https://gitlab.xiph.org/xiph/ogg/issues/2294
+
+--- include/ogg/os_types.h.orig        2019-08-13 16:31:53.000000000 +0000
++++ include/ogg/os_types.h
+@@ -70,7 +70,7 @@
+ 
+ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+ 
+-#  include <sys/types.h>
++#  include <stdint.h>
+    typedef int16_t ogg_int16_t;
+    typedef uint16_t ogg_uint16_t;
+    typedef int32_t ogg_int32_t;