<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5c67da0ba5b60505002a7fba04ffb1d695a6e020">https://github.com/macports/macports-ports/commit/5c67da0ba5b60505002a7fba04ffb1d695a6e020</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 5c67da0 avidemux: Update to version 2.6.20. Add x265 variant.
</span>5c67da0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c67da0ba5b60505002a7fba04ffb1d695a6e020
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Sun Jul 23 12:36:36 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> avidemux: Update to version 2.6.20. Add x265 variant.
</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/54520
</span>---
multimedia/avidemux/Portfile | 16 +++++++++++-----
multimedia/avidemux/files/patch-admCheckX264.cmake.diff | 15 +++++++++++++++
2 files changed, 26 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/avidemux/Portfile b/multimedia/avidemux/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 47e29e4..4a09a1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/avidemux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/avidemux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,7 @@ PortGroup app 1.0
</span> PortGroup qt4 1.0
name avidemux
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.20
</span> categories multimedia
platforms macosx
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,14 +23,14 @@ long_description Avidemux is a free video editor designed for simple
</span> master_sites sourceforge:project/avidemux/avidemux/${version}
distname ${name}_${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5a4318dce19efffe85f7e8de8ac33fc2795a4399 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 176c2482a0656f81e307f1505e6dfcdab086ee73e7de363617b884c5d7205aed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cc59941bcc23c5cc4ca3e993c47c13f58bf2f396 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f
</span>
patchfiles patch-cmake-ffmpeg_make.sh.cmake.diff
depends_build-append port:yasm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +aac +gettext +lame +sqlite +twolame +x264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +aac +gettext +lame +sqlite +twolame +x264 +x265
</span>
# do VPATH (out of source tree) build
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +71,7 @@ configure.args-append -DFONTCONFIG=OFF -DFREETYPE2=OFF \
</span> -DTWOLAME=OFF \
-DVPXDEC=OFF \
-DX264=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DX265=OFF \
</span> -DXVID=OFF
build {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,9 +175,15 @@ variant vpx description {Support for VP8 video codec} {
</span> configure.args-strsed s/-DVPXDEC=OFF/-DVPXDEC=ON/
}
variant x264 description {Support for x264 video codec} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix Cmake error. See https://trac.macports.org/ticket/54520.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-admCheckX264.cmake.diff
</span> depends_lib-append port:x264
configure.args-strsed s/-DX264=OFF/-DX264=ON/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x265 description {Support for x265 video codec} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:x265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-strsed s/-DX265=OFF/-DX265=ON/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> variant xvid description {Support for XviD MPEG-4 video codec} {
depends_lib-append port:XviD
configure.args-strsed s/-DXVID=OFF/-DXVID=ON/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/avidemux/files/patch-admCheckX264.cmake.diff b/multimedia/avidemux/files/patch-admCheckX264.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b0a558e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/avidemux/files/patch-admCheckX264.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/admCheckX264.cmake.orig 2017-07-23 11:54:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/admCheckX264.cmake 2017-07-23 11:57:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,11 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE("WARNING: x264 core version is too old. At least version 67 is required.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(X264_FOUND 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE (x264_version LESS 67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF (x264_version GREATER 73)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF (x264_version GREATER 73)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE (x264_version LESS 67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF (x264_version LESS 67)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(X264_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(USE_X264 True CACHE BOOL "")
</span></pre><pre style='margin:0'>
</pre>