<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e9ebcc4a3f4a14c1d963854a7ce6b39340546b74">https://github.com/macports/macports-ports/commit/e9ebcc4a3f4a14c1d963854a7ce6b39340546b74</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 e9ebcc4a3f4 libvpx-devel: fix PPC build
</span>e9ebcc4a3f4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e9ebcc4a3f4a14c1d963854a7ce6b39340546b74
</span>Author: Sergey Fedorov <svacchanda@macmini.private>
AuthorDate: Thu Apr 28 14:23:20 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> libvpx-devel: fix PPC build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libvpx-devel: fix ppc build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libvpx-devel: specify gmake for Tiger
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libvpx-devel: enable tests
</span>---
multimedia/libvpx-devel/Portfile | 49 ++++++++++++++++++----
multimedia/libvpx-devel/files/patch-vpx_ports.diff | 38 +++++++++++++++++
2 files changed, 78 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx-devel/Portfile b/multimedia/libvpx-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1ce3386ecd..55700358c3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name libvpx-devel
</span> conflicts libvpx
set my_name libvpx
version 1.11.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories multimedia
maintainers {mascguy @mascguy} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +37,8 @@ fetch.type git
</span> git.url https://chromium.googlesource.com/webm/${my_name}
git.branch v${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# support for non-intel archs removed in version 1.5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64 i386 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# upstream support for non-intel archs removed in version 1.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 arm64 ppc ppc64
</span>
patchfiles patch-Makefile.diff \
patch-configure.sh.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,11 +55,26 @@ configure.args --enable-vp8 \
</span> --enable-postproc \
--enable-multithread \
--enable-experimental \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared \
</span> --disable-install-docs \
--disable-debug-libs \
--disable-examples \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-unit-tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-unit-tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable a wrong kind of abi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-vpx_ports.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with shared enabled the build fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-shared
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.target
build.args verbose=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +104,15 @@ if {${universal_possible} && [variant_isset universal]} {
</span> set merger_configure_env(${my_arch}) LD=${configure.cc}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach my_arch {ppc ppc64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(${my_arch}) ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(${my_arch}) --force-target=generic-gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_env(${my_arch}) LD=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {"x86_64" in ${configure.universal_archs} || "i386" in ${configure.universal_archs}} {
depends_build-append port:yasm
depends_skip_archcheck-append yasm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,10 +131,14 @@ if {${universal_possible} && [variant_isset universal]} {
</span>
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # normal build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # force the target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --force-target=${configure.build_arch}-${os.platform}${os.major}-gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # single-arch build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force the target: generic fix for PowerPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --force-target=generic-gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --force-target=${configure.build_arch}-${os.platform}${os.major}-gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# set LD
configure.env-append LD=${configure.cc}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +164,9 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url https://chromium.googlesource.com/webm/${my_name}
livecheck.regex ">v(\\d+(?:\\.\\d+)*)<"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx-devel/files/patch-vpx_ports.diff b/multimedia/libvpx-devel/files/patch-vpx_ports.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a2c24e1ff46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx-devel/files/patch-vpx_ports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is a wrong kind of PPC, we donʼt want it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vpx_ports/vpx_ports.mk.orig 2021-10-07 01:41:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vpx_ports/vpx_ports.mk 2022-04-24 17:38:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,8 +39,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTS_SRCS-$(VPX_ARCH_ARM) += arm_cpudetect.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTS_SRCS-$(VPX_ARCH_ARM) += arm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(VPX_ARCH_PPC64LE),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTS_SRCS-$(VPX_ARCH_PPC) += ppc_cpudetect.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTS_SRCS-$(VPX_ARCH_PPC) += ppc.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTS_SRCS-$(VPX_ARCH_MIPS) += mips_cpudetect.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTS_SRCS-$(VPX_ARCH_MIPS) += mips.h
</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;'>+--- vp8/common/generic/systemdependent.c.orig 2021-10-07 01:41:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vp8/common/generic/systemdependent.c 2022-04-24 18:03:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vpx_ports/arm.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif VPX_ARCH_X86 || VPX_ARCH_X86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vpx_ports/x86.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif VPX_ARCH_PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif VPX_ARCH_PPC64LE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vpx_ports/ppc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif VPX_ARCH_MIPS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "vpx_ports/mips.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx->cpu_caps = arm_cpu_caps();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif VPX_ARCH_X86 || VPX_ARCH_X86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx->cpu_caps = x86_simd_caps();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif VPX_ARCH_PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif VPX_ARCH_PPC64LE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx->cpu_caps = ppc_simd_caps();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif VPX_ARCH_MIPS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx->cpu_caps = mips_cpu_caps();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>