<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/3ebc6535b99041f5918d9c3e682f156a9556a082">https://github.com/macports/macports-ports/commit/3ebc6535b99041f5918d9c3e682f156a9556a082</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 3ebc6535b99 libtheora: Regenerate configure with newer libtool
</span>3ebc6535b99 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3ebc6535b99041f5918d9c3e682f156a9556a082
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Aug 31 16:07:47 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libtheora: Regenerate configure with newer libtool
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This pulls in fixes from the libtool port so that newer macOS versions
</span><span style='display:block; white-space:pre;color:#404040;'> are identified correctly. This fixes build failures on macOS 11 and
</span><span style='display:block; white-space:pre;color:#404040;'> later and incorrect builds on OS X 10.10-10.15.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The revision is increased because with this fix libtheora now uses the
</span><span style='display:block; white-space:pre;color:#404040;'> two-level namespace instead of the flat namespace on OS X 10.10-10.15.
</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/61096
</span>---
multimedia/libtheora/Portfile | 32 ++++++++++-----
multimedia/libtheora/files/autogen.sh.patch | 45 ++++++++++++++++++++++
.../{patch-configure.diff => no-fforce-addr.patch} | 9 +++--
multimedia/libtheora/files/patch-docdir.diff | 22 -----------
.../libtheora/files/unversioned-docdir.patch | 23 +++++++++++
5 files changed, 95 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libtheora/Portfile b/multimedia/libtheora/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8e325ebeaf..8f1a9c1c3cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libtheora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libtheora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,11 @@ PortGroup xcodeversion 1.0
</span> name libtheora
epoch 1
version 1.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1d07234bd7e2296c61d6e30fe9816415aa7fd8e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1903175
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories multimedia
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,15 +29,16 @@ homepage https://www.theora.org/
</span> master_sites https://downloads.xiph.org/releases/theora/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 292ab65cedd5021d6b7ddd117e07cd8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8dcaa8e61cd86eb1244467c0b64b9ddac04ae262 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1d07234bd7e2296c61d6e30fe9816415aa7fd8e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span> depends_lib port:libvorbis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-docdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles autogen.sh.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-fforce-addr.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unversioned-docdir.patch
</span>
configure.env SDL_CONFIG=/usr/bin/false \
HAVE_PDFLATEX=no \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,10 +46,17 @@ configure.env SDL_CONFIG=/usr/bin/false \
</span> HAVE_BIBTEX=no \
HAVE_TRANSFIG=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-oggtest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-vorbistest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-asm \
</span> --disable-examples \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-asm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-oggtest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-vorbistest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure and Makefile.in files were generated with ancient autotools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# versions (autoconf 2.63, automake 1.6.3, libtool 2.2.6). We need fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# from newer libtool, including the fix for the "Yosemite libtool bug"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that misidentifies OS X 10.10 and later as Mac OS X 10.1, and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "Big Sur libtool bug" that does not identify macOS 11 or later at all.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh
</span>
minimum_xcodeversions {8 2.5}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libtheora/files/autogen.sh.patch b/multimedia/libtheora/files/autogen.sh.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8219c9d4c26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libtheora/files/autogen.sh.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix non-POSIX use of echo -n and don't enable maintainer mode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig 2009-09-28 13:02:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh 2020-08-31 15:50:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_NEEDED=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z $AM_NEEDED; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo -n "checking for automake... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "checking for automake... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ACLOCAL=aclocal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTOMAKE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo -n "checking for automake $AM_NEEDED or later... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "checking for automake %s or later... " "$AM_NEEDED"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minneeded=`echo $AM_NEEDED | $VERSIONMKMIN`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for am in automake-$AM_NEEDED automake$AM_NEEDED \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test -z $AUTOMAKE && echo "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo -n "checking for aclocal $AM_NEEDED or later... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "checking for aclocal %s or later... " "$AM_NEEDED"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 aclocal-1.10; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ($ac --version < /dev/null > /dev/null 2>&1) || continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo -n "checking for libtool... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++printf "checking for libtool... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for LIBTOOLIZE in libtoolize glibtoolize nope; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,4 +126,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoconf || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $olddir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$srcdir/configure --enable-maintainer-mode "$@" && echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$srcdir/configure "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libtheora/files/patch-configure.diff b/multimedia/libtheora/files/no-fforce-addr.patch
</span>similarity index 67%
rename from multimedia/libtheora/files/patch-configure.diff
rename to multimedia/libtheora/files/no-fforce-addr.patch
<span style='display:block; white-space:pre;color:#808080;'>index dc9a2075997..92fbebf8c3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libtheora/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libtheora/files/no-fforce-addr.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2014-03-19 11:59:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2014-03-19 12:00:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11863,7 +11863,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $host in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use -fforce-addr; it's not compatible with clang.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2009-10-01 13:00:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2020-08-31 15:47:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $host in
</span> *)
DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libtheora/files/patch-docdir.diff b/multimedia/libtheora/files/patch-docdir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0cf0682defd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libtheora/files/patch-docdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/Makefile.in.orig 2009-10-01 13:04:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/Makefile.in 2011-10-21 05:52:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SUBDIRS = spec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+docdir = $(datadir)/doc/$(PACKAGE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static_docs = vp3-format.txt color.html \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- draft-ietf-avt-rtp-theora-00.xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/spec/Makefile.in.orig 2009-10-01 13:04:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/spec/Makefile.in 2011-10-21 05:57:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys_symbol_underscore = @sys_symbol_underscore@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+docdir = $(datadir)/doc/$(PACKAGE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- built_docs = Theora.pdf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libtheora/files/unversioned-docdir.patch b/multimedia/libtheora/files/unversioned-docdir.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fab596ce54e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libtheora/files/unversioned-docdir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use an unversioned docdir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/Makefile.am.orig 2009-07-13 18:55:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/Makefile.am 2020-08-31 15:56:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS = spec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++docdir = $(datadir)/doc/$(PACKAGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static_docs = vp3-format.txt color.html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ draft-ietf-avt-rtp-theora-00.xml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/spec/Makefile.am.orig 2009-07-13 18:55:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/spec/Makefile.am 2020-08-31 15:56:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # makefile to generate the spec document from sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # requires transfig and pdflatex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++docdir = $(datadir)/doc/$(PACKAGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ built_docs = Theora.pdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>