<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f014af6823814551c4f5a7893199838095646084">https://github.com/macports/macports-ports/commit/f014af6823814551c4f5a7893199838095646084</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f014af6823814551c4f5a7893199838095646084
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Mon Feb 1 08:46:42 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> avidemux: update to 2.7.6, plus various
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove redundant patches
</span><span style='display:block; white-space:pre;color:#404040;'> - hack patch to get around VapourSynth failure
</span><span style='display:block; white-space:pre;color:#404040;'> - switch to Qt5 for GUI
</span><span style='display:block; white-space:pre;color:#404040;'> - add deps for new features
</span><span style='display:block; white-space:pre;color:#404040;'> - cleanup configure args
</span><span style='display:block; white-space:pre;color:#404040;'> - rework plugins build to use ALL
</span><span style='display:block; white-space:pre;color:#404040;'> - remove now-uneeded post-destroot fix
</span><span style='display:block; white-space:pre;color:#404040;'> - remove truetype/fribidi variants, always build now
</span><span style='display:block; white-space:pre;color:#404040;'> - add opus variant (default)
</span><span style='display:block; white-space:pre;color:#404040;'> - enable vorbis by default
</span><span style='display:block; white-space:pre;color:#404040;'> - fix .app specs
</span>---
multimedia/avidemux/Portfile | 112 ++++++++++++++++++++-----------------------
1 file changed, 52 insertions(+), 60 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 9d3223fe2c4..aaf89fec636 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;'>@@ -3,18 +3,18 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span>
name avidemux
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories multimedia
platforms macosx
license GPL-2
maintainers nomaintainer
homepage http://avidemux.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Avidemux is a free video editor.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description video editor designed for simple cutting, filtering and encoding tasks
</span> long_description Avidemux is a free video editor designed for simple cutting, \
filtering and encoding tasks. It supports many file types, \
including AVI, DVD compatible MPEG files, MP4 and ASF, using \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,21 +24,28 @@ 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 cc59941bcc23c5cc4ca3e993c47c13f58bf2f396 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 68f4037e10d0a10a7a1b3e2dea95e48506641908 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24372770
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cmake-ffmpeg_make.sh.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-admPlugins_VapourSynth.cmake.diff
</span>
depends_build-append port:yasm \
port:bash \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libass \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fribidi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libsdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# qt5.min_version ?? # Project does not indicate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qttools
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +aac +gettext +lame +sqlite +twolame +x264 +x265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +aac +gettext +lame +opus +sqlite +twolame +vorbis +x264 +x265 +xvid
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# no automatic configure step, everything is done inside build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span> # only build with one job (otherwise it fails in avidemux_core)
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,36 +56,42 @@ configure.args-append -DCMAKE_C_COMPILER=${configure.cc} \
</span> -DCMAKE_CXX_COMPILER=${configure.cxx} \
-DCMAKE_CXX_FLAGS="${configure.cxxflags}" \
-DFAKEROOT=${destroot} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAVIDEMUX_SOURCE_DIR=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -G \"Unix Makefiles\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVIDEMUX_SOURCE_DIR=${worksrcpath}
</span>
# some default settings
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DSDL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGTK=OFF -DQT4=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable all options, enable them in variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DFONTCONFIG=OFF -DFREETYPE2=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFRIDIBI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DGTK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DASAN=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QT5=True \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_EXTERNAL_LIBASS=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_EXTERNAL_LIBMAD=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable most options, enable them in variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DFONTCONFIG=ON -DFREETYPE2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFRIDIBI=ON \
</span> -DGETTEXT=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DALSA=OFF \
</span> -DARTS=OFF \
-DESD=OFF \
-DJACK=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSS=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPULSEAUDIOSIMPLE=OFF \
</span> -DAFTEN=OFF \
-DDCAENC=OFF -DLIBDCA=OFF \
-DFAAC=OFF -DFAAD=OFF \
-DLAME=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPUS=OFF -DOPUS_ENCODER=OFF \
</span> -DLIBVORBIS=OFF -DVORBIS=OFF \
-DOPENCORE_AMRNB=OFF -DOPENCORE_AMRWB=OFF \
-DTWOLAME=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVPXDEC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVAPOURSYNTH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVPXDEC=OFF -DVPXENC=OFF\
</span> -DX264=OFF \
-DX265=OFF \
-DXVID=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make bundled copy of ffmpeg build verbosely
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.env-append V=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append QT5_DIR=${qt_dir} QTDIR=${qt_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure {
</span> # mimic bootStrap.bash Process() behaviour
proc process {work src module build extra} {
# make build dir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,34 +113,18 @@ build {
</span>
# build avidemux core
process ${workpath} ${worksrcpath} avidemux_core build_core ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # build avidemux GTK UI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #process ${workpath} ${worksrcpath} avidemux/gtk build_gtk "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-framework,Cocoa"
</span> # build avidemux QT UI
process ${workpath} ${worksrcpath} avidemux/qt4 build_qt4 ""
# build avidemux cli UI
process ${workpath} ${worksrcpath} avidemux/cli build_cli ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # build common plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process ${workpath} ${worksrcpath} avidemux_plugins build_pluginsCommon "-DPLUGIN_UI=COMMON -DCMAKE_CXX_COMPILER=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build gtk plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #process ${workpath} ${worksrcpath} avidemux_plugins build_pluginsGtk "-DPLUGIN_UI=GTK"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build QT plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process ${workpath} ${worksrcpath} avidemux_plugins build_pluginsQt4 "-DPLUGIN_UI=QT4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build cli plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- process ${workpath} ${worksrcpath} avidemux_plugins build_pluginsCli "-DPLUGIN_UI=CLI"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process ${workpath} ${worksrcpath} avidemux_plugins build_pluginsCommon "-DPLUGIN_UI=ALL"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# destroot is handled by build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build and destroot is handled above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span> destroot {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Some libraries are built with incorrect permissions. See https://trac.macports.org/ticket/55823.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/lib/libADM6avcodec.57.dylib -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/lib/libADM6avformat.57.dylib -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/lib/libADM6avutil.55.dylib -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/lib/libADM6postproc.54.dylib -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}${prefix}/lib/libADM6swscale.4.dylib -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant aac description {Support for faac/faad audio codecs} {
depends_lib-append port:faac
depends_lib-append port:faad2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,10 +140,6 @@ variant esound description {Support for ESD audio device} {
</span> depends_lib-append port:esound
configure.args-replace -DESD=OFF -DESD=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant fribidi description {Support for FriBidi} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:fribidi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DFRIDIBI=OFF -DFRIDIBI=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> variant gettext description {Support for gettext} {
depends_lib-append port:gettext
configure.args-replace -DGETTEXT=OFF -DGETTEXT=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,15 +152,14 @@ variant lame description {Support for LAME audio codec} {
</span> depends_lib-append port:lame
configure.args-replace -DLAME=OFF -DLAME=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant opus description {Support for Opus audio codec} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libopus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DOPUS=OFF -DOPUS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DOPUS_ENCODER=OFF -DOPUS_ENCODER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> variant sqlite description {Support for SQLite3} {
depends_lib-append port:sqlite3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant truetype description {Support for FreeType2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:freetype
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:fontconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DFREETYPE2=OFF -DFREETYPE2=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DFONTCONFIG=OFF -DFONTCONFIG=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> variant twolame description {Support for TwoLAME audio codec} {
depends_lib-append port:twolame
configure.args-replace -DTWOLAME=OFF -DTWOLAME=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,10 +173,9 @@ variant vpx description {Support for VP8 video codec} {
</span> # libvpx is static only so can be considered a build dependency (#47934)
depends_build-append port:libvpx
configure.args-replace -DVPXDEC=OFF -DVPXDEC=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DVPXENC=OFF -DVPXENC=ON
</span> }
variant x264 description {Support for x264 video codec} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix Cmake error. See https://trac.macports.org/ticket/54520.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-admCheckX264.cmake.diff
</span> depends_lib-append port:x264
configure.args-replace -DX264=OFF -DX264=ON
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,9 +189,10 @@ variant xvid description {Support for XviD MPEG-4 video codec} {
</span> }
# .app stuff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.name Avidemux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable avidemux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon avidemux_icon.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name Avidemux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable Avidemux2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.use_launch_script yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon cmake/osx/avidemux.icns
</span>
livecheck.url http://www.fosshub.com/Avidemux.html
livecheck.regex "${name}_(\\d+(?:\\.\\d+)*)${extract.suffix}"
</pre><pre style='margin:0'>
</pre>