<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/fd8d3b122c81d715f08eb504cbc68feececc2ec7">https://github.com/macports/macports-ports/commit/fd8d3b122c81d715f08eb504cbc68feececc2ec7</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 fd8d3b122c8 ffmpeg-devel: don't install in separate prefix
</span>fd8d3b122c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fd8d3b122c81d715f08eb504cbc68feececc2ec7
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu Dec 19 17:35:00 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: don't install in separate prefix
</span>---
multimedia/ffmpeg-devel/Portfile | 53 ++++------------------------------------
1 file changed, 5 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b017b2956fe..e3a70421eb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,10 +15,10 @@ PortGroup xcode_workaround 1.0
</span>
name ffmpeg-devel
set my_name ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ffmpeg7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ffmpeg
</span>
version 7.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 2
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,22 +164,11 @@ configure.cflags-append \
</span> -Wno-deprecated-declarations \
${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_ver_major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_alias ${my_name}${port_ver_major}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_prefix ${prefix}/libexec/${port_alias}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_bindir ${port_prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_sharedir ${port_prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_sharedir ${prefix}/share
</span> set port_docdir ${port_sharedir}/doc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_datadir ${port_sharedir}/data
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=${prefix}
</span> configure.pre_args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --cc="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --datadir=${port_datadir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --docdir=${port_docdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --progs-suffix=${port_ver_major} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=${port_prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --cc="${configure.cc}"
</span>
configure.args-append \
--disable-audiotoolbox \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,22 +400,6 @@ post-destroot {
</span> foreach f [glob ${worksrcpath}/doc/*.txt] {
file copy $f ${destroot}${port_docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create bin symlinks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset no_symlink]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set port_bin_list \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [glob -type f -directory ${destroot}${port_bindir} *]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f ${port_bin_list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fname [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_info "Symlinking bin: ${prefix}/bin/${fname} -> ${port_bindir}/${fname}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${port_bindir}/${fname} ${destroot}${prefix}/bin/${fname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_symlink description {Disable binary suffices and symlinks} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --progs-suffix=${port_ver_major}
</span> }
variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,22 +554,6 @@ This build of ${name} includes no GPLed or nonfree code and is therefore license
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes-append ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset no_symlink]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To use the ${name} command-line programs, add\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/libexec/ffmpeg${port_ver_major}/bin to your \$PATH,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in front of the normal ${prefix}/bin; or else use full paths.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes-append "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To compile and link with ${name}, add\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--I${prefix}/libexec/ffmpeg${port_ver_major}/include and\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--L${prefix}/libexec/ffmpeg${port_ver_major}/lib to your compile command.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For builds using pkg-config, add\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${prefix}/libexec/ffmpeg${port_ver_major}/lib/pkgconfig to \$PKG_CONFIG_PATH.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${my_name}-(${port_ver_major}(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span></pre><pre style='margin:0'>
</pre>