<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99af437d1f41eb15874f926020fdcf39356a7ab2">https://github.com/macports/macports-ports/commit/99af437d1f41eb15874f926020fdcf39356a7ab2</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 99af437d1f4 x265: Add git dep to install dylib and pc file
</span>99af437d1f4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99af437d1f41eb15874f926020fdcf39356a7ab2
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 8 02:28:54 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> x265: Add git dep to install dylib and pc file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add dependendency on git executable. Without it, libx265.dylib and
</span><span style='display:block; white-space:pre;color:#404040;'> x265.pc are not installed. This primarily affects old Mac OS X versions
</span><span style='display:block; white-space:pre;color:#404040;'> that do not come with git.
</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/71056
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove license information from long description. Portfiles have a
</span><span style='display:block; white-space:pre;color:#404040;'> separate license field to record license information.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the release download, not an automatically-generated tarball.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Set worksrcdir to a relative path, not an absolute one.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid using system for things that can be done without it, like making
</span><span style='display:block; white-space:pre;color:#404040;'> directories and renaming files.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Refresh patches.
</span>---
multimedia/x265/Portfile | 45 ++++++++++++----------
.../files/patch-cmakelists-override-processor.diff | 8 ++--
multimedia/x265/files/patch-ppc.diff | 4 +-
3 files changed, 31 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x265/Portfile b/multimedia/x265/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2e24ed753d..b084b747555 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x265/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x265/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,11 +14,10 @@ legacysupport.newest_darwin_requires_legacy 9
</span>
name x265
bitbucket.setup multicoreware x265_git 3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2295764f3de72c32454c6e54b51b8d7b4952297f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1656575
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d9e58472408a227c003b35a9aee63ec5ed7ef6bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 663531f341c5389f460d730e62e10a4fcca3428ca2ca109693867bc5fe2e2807 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1655889
</span>
categories multimedia
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,12 +26,14 @@ maintainers nomaintainer
</span> description H.265 encoder
long_description x265 is a free software library and application for \
encoding video streams into the H.265/MPEG-H HEVC \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compression format, and is released under the terms of the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GNU GPL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compression format.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://www.videolan.org/developers/x265.html
<span style='display:block; white-space:pre;background:#e0ffe0;'>+bitbucket.tarball_from \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ downloads
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.rename yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${worksrcpath}/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}_${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${worksrcdir}/source
</span>
# allow overriding system processor detection
patchfiles patch-cmakelists-override-processor.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +44,24 @@ patchfiles-append patch-ppc.diff
</span> depends_build-append \
port:gmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# x265.pc and the shared library are not installed if git is not found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bitbucket.org/multicoreware/x265_git/issues/960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.blacklist-append *llvm-gcc-4.2
# https://trac.macports.org/ticket/59246
xcode_workaround.fixed_xcode_version 11.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Sanity check.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bitbucket.org/multicoreware/x265_git/issues/960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${destroot}${prefix}/lib/pkgconfig/${name}.pc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "${name}.pc did not get installed"
</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> platform darwin 10 {
# Rosetta build has to override CMAKE_SYSTEM_PROCESSOR: https://trac.macports.org/ticket/64528
if {${build_arch} eq "ppc"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +70,6 @@ platform darwin 10 {
</span> }
if {${universal_possible} && [variant_isset universal] && ![variant_isset highdepth]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {"x86_64" in ${configure.universal_archs} || "i386" in ${configure.universal_archs}} {
depends_build-append port:nasm
set merger_configure_env(i386) NASM_EXECUTABLE=${prefix}/bin/nasm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,9 +82,7 @@ if {${universal_possible} && [variant_isset universal] && ![variant_isset highde
</span> foreach uarch {arm64 i386 ppc ppc64 x86_64} {
set merger_configure_args(${uarch}) -DOVERRIDE_SYSTEM_PROCESSOR=${uarch}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${configure.build_arch} in {i386 x86_64}} {
depends_build-append port:nasm
configure.env NASM_EXECUTABLE=${prefix}/bin/nasm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +95,6 @@ if {${universal_possible} && [variant_isset universal] && ![variant_isset highde
</span> }
variant highdepth conflicts universal description {Enable 10-bit and 12-bit encoding} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # this builds the recommended multi-library interface
# https://x265.readthedocs.io/en/master/api.html#multi-library-interface
# with the default ABI being the standard 8bit ABI as always
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,12 +102,10 @@ variant highdepth conflicts universal description {Enable 10-bit and 12-bit enco
</span> # we can perhaps explore how to use the method below with the muniversal PG
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "mkdir ${workpath}/10bit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "mkdir ${workpath}/12bit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/10bit ${workpath}/12bit
</span> }
configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set configure.dir ${workpath}/10bit
configure.args -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
portconfigure::configure_main
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,11 +117,9 @@ variant highdepth conflicts universal description {Enable 10-bit and 12-bit enco
</span> set configure.dir ${workpath}/build
configure.args -DEXTRA_LIB="x265_main10.a\;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON
portconfigure::configure_main
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set build.dir ${workpath}/10bit
portbuild::build_main
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,8 +132,7 @@ variant highdepth conflicts universal description {Enable 10-bit and 12-bit enco
</span> set build.dir ${workpath}/build
portbuild::build_main
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/build "mv libx265.a libx265_main.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/build/libx265.a ${workpath}/build/libx265_main.a
</span> system -W ${workpath}/build "libtool -static -o libx265.a libx265_main.a libx265_main10.a libx265_main12.a"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x265/files/patch-cmakelists-override-processor.diff b/multimedia/x265/files/patch-cmakelists-override-processor.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c32fe7b70f..156d4bf75c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x265/files/patch-cmakelists-override-processor.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x265/files/patch-cmakelists-override-processor.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2021-01-31 17:45:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-01-31 17:45:51.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-04-04 04:39:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-10-08 01:10:52.000000000 -0500
</span> @@ -37,6 +37,10 @@
SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,5 +9,5 @@
</span> +endif()
+
# System architecture detection
<span style='display:block; white-space:pre;background:#ffe0e0;'>- string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(X86_ALIASES x86 i386 i686 x86_64 amd64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(TOLOWER "${CMAKE_OSX_ARCHITECTURES}" SYSPROC)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x265/files/patch-ppc.diff b/multimedia/x265/files/patch-ppc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 44af448611c..08f5095ffb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x265/files/patch-ppc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x265/files/patch-ppc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2020-05-29 23:24:35.000000000 +0545
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2024-08-10 17:47:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2024-04-04 04:39:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-10-08 01:10:52.000000000 -0500
</span> @@ -53,7 +53,7 @@
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
</pre><pre style='margin:0'>
</pre>