<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1acabfd8c3133b5bb10d3f4299937b8a9485842">https://github.com/macports/macports-ports/commit/f1acabfd8c3133b5bb10d3f4299937b8a9485842</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f1acabf libogg: revert upstream patch
</span>f1acabf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1acabfd8c3133b5bb10d3f4299937b8a9485842
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Thu Sep 5 00:21:55 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> libogg: revert upstream patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the change in header broke the build on older systems
</span><span style='display:block; white-space:pre;color:#404040;'> and broke builds on newer systems as well
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/58933
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/58929
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/58924
</span>---
multimedia/libogg/Portfile | 8 +++---
.../libogg/files/patch-libogg-add-stdint-h.diff | 13 ---------
.../libogg/files/patch-libogg-revert-ostypes.diff | 33 ++++++++++++++++++++++
3 files changed, 37 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libogg/Portfile b/multimedia/libogg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d71f6b4..a94926e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libogg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libogg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name libogg
version 1.3.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories multimedia
license BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +23,9 @@ checksums rmd160 ee76a42b00bc11d483de53d9e84a487be3900d06 \
</span> sha256 c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe \
size 428696
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# systems prior to 10.9 need to have <stdint.h> included explicitly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-libogg-add-stdint-h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# revert upstream change to os_types.h header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://git.xiph.org/?p=ogg.git;a=commitdiff;h=6449883ccacfee276ed9d99fa047342cdc51ab88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-libogg-revert-ostypes.diff
</span>
post-destroot {
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libogg/files/patch-libogg-add-stdint-h.diff b/multimedia/libogg/files/patch-libogg-add-stdint-h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fcbfa21..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libogg/files/patch-libogg-add-stdint-h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/ogg/os_types.h.orig 2019-09-03 18:33:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/ogg/os_types.h 2019-09-03 18:33:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1090
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int16_t ogg_int16_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef uint16_t ogg_uint16_t;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libogg/files/patch-libogg-revert-ostypes.diff b/multimedia/libogg/files/patch-libogg-revert-ostypes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1bef0d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libogg/files/patch-libogg-revert-ostypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+REVERT this upstream patch which has broken builds on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and also on current systems that include this header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://git.xiph.org/?p=ogg.git;a=commitdiff;h=6449883ccacfee276ed9d99fa047342cdc51ab88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Brion Vibber <brion@pobox.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 29 Jan 2018 21:52:20 +0000 (-0800)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix iOS/macOS build with current SDKs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Tag: v1.3.4~21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Url: https://git.xiph.org/?p=ogg.git;a=commitdiff_plain;h=6449883ccacfee276ed9d99fa047342cdc51ab88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix iOS/macOS build with current SDKs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use <sys/types.h> not <inttypes.h> when building for Apple platforms,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as it works with modular dynamic-framework builds.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Ralph Giles <giles@thaumas.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/ogg/os_types.h include/ogg/os_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4165bce..eb8a322 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ogg/os_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ogg/os_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef int16_t ogg_int16_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef uint16_t ogg_uint16_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef int32_t ogg_int32_t;
</span></pre><pre style='margin:0'>
</pre>