<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e63376b0845acdc06efbfb5fbbb8bdd6359e75b4">https://github.com/macports/macports-ports/commit/e63376b0845acdc06efbfb5fbbb8bdd6359e75b4</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 e63376b0845 libvorbis: -force_cpusubtype_ALL only for PowerPC
</span>e63376b0845 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e63376b0845acdc06efbfb5fbbb8bdd6359e75b4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Sep 25 20:00:44 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> libvorbis: -force_cpusubtype_ALL only for PowerPC
</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/68240
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://gitlab.xiph.org/xiph/vorbis/-/issues/2348
</span>---
audio/libvorbis/Portfile | 8 ++++++-
audio/libvorbis/files/configure.patch | 22 +++++++++++++++++++
.../files/{patch-docdir.diff => docdir.patch} | 25 +++++++++++-----------
3 files changed, 42 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libvorbis/Portfile b/audio/libvorbis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59c653da3cb..b52ed64666f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libvorbis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libvorbis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,17 @@ checksums rmd160 dc894b201bcf253c54b3e8468c656987ea9f97c8 \
</span> sha256 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab \
size 1658963
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-docdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docdir.patch
</span>
configure.args --disable-oggtest \
--disable-silent-rules
<span style='display:block; white-space:pre;background:#e0ffe0;'>+array set merger_configure_cflags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc -force_cpusubtype_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 -force_cpusubtype_ALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
set docdir ${prefix}/share/doc/${name}
xinstall -m 0644 -W ${worksrcpath} AUTHORS CHANGES COPYING \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libvorbis/files/configure.patch b/audio/libvorbis/files/configure.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5d637af0d01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libvorbis/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove -force_cpusubtype_ALL. It is only useful when building for PowerPC and as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+of Xcode 15 the linker no longer accepts this flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.xiph.org/xiph/vorbis/-/issues/2348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We still want to use it in MacPorts when building for PowerPC, so we re-add it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conditionally in the Portfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-07-04 01:20:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-09-25 19:53:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12840,9 +12840,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS="-DDARWIN -fno-common -Wall -g -O3 -ffast-math -fsigned-char"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PROFILE="-DDARWIN -fno-common -Wall -g -pg -O3 -ffast-math -fsigned-char";;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-os2*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use -W instead of -Wextra because gcc on OS/2 is an old version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libvorbis/files/patch-docdir.diff b/audio/libvorbis/files/docdir.patch
</span>similarity index 60%
rename from audio/libvorbis/files/patch-docdir.diff
rename to audio/libvorbis/files/docdir.patch
<span style='display:block; white-space:pre;color:#808080;'>index e2629688371..05e64a01c12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libvorbis/files/patch-docdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libvorbis/files/docdir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/Makefile.in.orig 2014-01-22 03:39:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/Makefile.in 2014-03-03 10:50:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -319,7 +319,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use unversioned docdir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/Makefile.in.orig 2020-07-04 01:20:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/Makefile.in 2023-09-25 19:52:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,7 +320,7 @@
</span> builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +10,9 @@
</span> dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/libvorbis/Makefile.in.orig 2014-01-22 03:39:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/libvorbis/Makefile.in 2014-03-03 10:50:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,7 +259,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/libvorbis/Makefile.in.orig 2020-07-04 01:20:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/libvorbis/Makefile.in 2023-09-25 19:52:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span> builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +21,9 @@
</span> dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/vorbisenc/Makefile.in.orig 2014-01-22 03:39:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/vorbisenc/Makefile.in 2014-03-03 10:50:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,7 +259,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/vorbisenc/Makefile.in.orig 2020-07-04 01:20:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/vorbisenc/Makefile.in 2023-09-25 19:52:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span> builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +32,9 @@
</span> dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/vorbisfile/Makefile.in.orig 2014-01-22 03:39:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/vorbisfile/Makefile.in 2014-03-03 10:50:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,7 +259,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/vorbisfile/Makefile.in.orig 2020-07-04 01:20:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/vorbisfile/Makefile.in 2023-09-25 19:52:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span> builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
</pre><pre style='margin:0'>
</pre>