<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/41555a289bf51bfb11b51590be163c08121d13e4">https://github.com/macports/macports-ports/commit/41555a289bf51bfb11b51590be163c08121d13e4</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 41555a289bf libvpx: update to 1.12.0; add vpxenc/vpxdec - Credit to @i0ntempest - Also update configure script, courtesy of @Gcenx See: https://github.com/macports/macports-ports/pull/15250
</span>41555a289bf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 41555a289bf51bfb11b51590be163c08121d13e4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jul 3 17:29:20 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> libvpx: update to 1.12.0; add vpxenc/vpxdec
</span><span style='display:block; white-space:pre;color:#404040;'> - Credit to @i0ntempest
</span><span style='display:block; white-space:pre;color:#404040;'> - Also update configure script, courtesy of @Gcenx
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/15250
</span>---
multimedia/libvpx/Portfile | 16 +++++---
multimedia/libvpx/files/patch-configure.sh.diff | 54 +++++++++----------------
2 files changed, 29 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/Portfile b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d961421978..aa5bd7b6cb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup muniversal 1.0
</span> name libvpx
conflicts libvpx-devel
set my_name libvpx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.11.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories multimedia
license Permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,8 @@ git.branch v${version}
</span> # upstream support for non-intel archs removed in version 1.5.0
supported_archs x86_64 i386 arm64 ppc ppc64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.sh.diff
</span>
# Uses newer assembly features on Intel.
# Also blacklist clang 8, due to issues like:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,14 +52,15 @@ compiler.blacklist-append {*gcc-[3-4].*} {clang < 900} {macports-clang-3.*}
</span> # doesn't install docs or examples correctly, so disable them.
configure.args --enable-vp8 \
--enable-vp9 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-vp9-highbitdepth \
</span> --enable-internal-stats \
--enable-pic \
--enable-postproc \
--enable-multithread \
--enable-experimental \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-examples \
</span> --disable-install-docs \
--disable-debug-libs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-examples \
</span> --enable-unit-tests
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,6 +161,11 @@ post-destroot {
</span> foreach f [glob ${destroot}${prefix}/lib/${my_name}.*.dylib] {
system "install_name_tool -id [string map [list ${destroot} ""] ${f}] ${f}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob ${destroot}${prefix}/bin/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex [split [glob ${destroot}${prefix}/lib/${my_name}.*.dylib] "/"] end] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [string map [list ${destroot} ""] [glob ${destroot}${prefix}/lib/${my_name}.*.dylib]] ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/files/patch-configure.sh.diff b/multimedia/libvpx/files/patch-configure.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b7f588ce7c2..c616ee67ae8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/files/patch-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/files/patch-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Dean M Greer <Gcenx@github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS High Sierra may have MacOSX10.14.SDK and MacOSX10.13.SDK available, so due to how this detection work MacOSX10.14.SDK will be used causing an i386 build to fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- build/make/configure.sh 2021-04-18 18:16:48.000000000 -0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/make/configure.sh 2021-04-18 22:38:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -849,90 +849,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IOS_VERSION_MIN="7.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Handle darwin variants. Newer SDKs allow targeting older
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # platforms, so use the newest one available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${toolchain} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- arm*-darwin-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "${iphoneos_sdk_dir}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_cflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_ldflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/make/configure.sh 2021-06-30 19:31:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -882,68 +882,9 @@ process_common_toolchain() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_ldflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> - *-darwin*)
- osx_sdk_dir="$(show_darwin_sdk_path macosx)"
- if [ -d "${osx_sdk_dir}" ]; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +15,9 @@
</span> - add_ldflags "-isysroot ${osx_sdk_dir}"
- fi
- ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${toolchain} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${toolchain} in
</span> - *-darwin8-*)
- add_cflags "-mmacosx-version-min=10.4"
- add_ldflags "-mmacosx-version-min=10.4"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,21 +66,10 @@
</span> - add_cflags "-mmacosx-version-min=10.15"
- add_ldflags "-mmacosx-version-min=10.15"
- ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-darwin20-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_cflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_ldflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-iphonesimulator-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "${iossim_sdk_dir}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_cflags "-isysroot ${iossim_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_ldflags "-isysroot ${iossim_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-darwin2[0-1]-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_cflags "-arch ${toolchain%%-*}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_ldflags "-arch ${toolchain%%-*}"
</span> - ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Handle Solaris variants. Solaris 10 needs -lposix4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ${toolchain} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sparc-solaris-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-iphonesimulator-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span></pre><pre style='margin:0'>
</pre>