<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/e7f84228a118cd7850d458399224fb78ed452374">https://github.com/macports/macports-ports/commit/e7f84228a118cd7850d458399224fb78ed452374</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 e7f84228a11 ffmpeg/ffmpeg-devel: update to 4.4.4; add lib dep harfbuzz, for libass - Drop sdl2 patch; merged by upstream - Pin livecheck to v4.x
</span>e7f84228a11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7f84228a118cd7850d458399224fb78ed452374
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat May 27 09:41:43 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg/ffmpeg-devel: update to 4.4.4; add lib dep harfbuzz, for libass
</span><span style='display:block; white-space:pre;color:#404040;'> - Drop sdl2 patch; merged by upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - Pin livecheck to v4.x
</span>---
multimedia/ffmpeg-devel/Portfile | 18 +++++++---------
.../ffmpeg-devel/files/patch-libsdl2-version.diff | 24 ----------------------
multimedia/ffmpeg/Portfile | 18 +++++++---------
multimedia/ffmpeg/files/patch-libsdl2-version.diff | 24 ----------------------
4 files changed, 14 insertions(+), 70 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 15d6490f218..956f4f72b24 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;'>@@ -18,8 +18,8 @@ set my_name ffmpeg
</span> conflicts ffmpeg
# Please increase the revision of mpv whenever ffmpeg's version is updated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 2
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +63,9 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22a690edfad74f25de0d24557f8edf4b2366b1a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9562968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ac9916e0915cfe3952993644d0a26d9e7c70e1b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9565584
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +91,7 @@ depends_lib-append \
</span> port:fontconfig \
port:freetype \
port:fribidi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span> path:lib/libspeex.dylib:speex \
port:soxr \
port:dav1d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,11 +112,6 @@ patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
</span> # Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for libsdl2; support newer versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/65703
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: e5163b1d34381a3319214a902ef1df923dd2eeba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libsdl2-version.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Patch for upstream issue:
# libavcodec/libsvtav1.c:124:53: error: no member named 'compressed_ten_bit_format' in 'struct EbSvtAv1EncConfiguration'
# (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,4 +451,4 @@ and is therefore licensed under LGPL v2.1 or later.
</span>
livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(4(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff b/multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21c0a992a32..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-libsdl2-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source: https://github.com/FFmpeg/FFmpeg/commit/e5163b1d34381a3319214a902ef1df923dd2eeba.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#---------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Christopher Degawa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Wed, 11 May 2022 15:11:04 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sdl2 recently changed their versioning, moving the patch level to minor level
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and have said that they will instead ship sdl3.pc for 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixes ticket 9768
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6742,7 +6742,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if enabled sdl2; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL2_CONFIG="${cross_prefix}sdl2-config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9925fa24d29..07681aeeffd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +18,8 @@ set my_name ffmpeg
</span> conflicts ffmpeg-devel
# Please increase the revision of mpv whenever ffmpeg's version is updated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 1
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +63,9 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 22a690edfad74f25de0d24557f8edf4b2366b1a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9562968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ac9916e0915cfe3952993644d0a26d9e7c70e1b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9565584
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +91,7 @@ depends_lib-append \
</span> port:fontconfig \
port:freetype \
port:fribidi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span> path:lib/libspeex.dylib:speex \
port:soxr \
port:dav1d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,11 +112,6 @@ patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
</span> # Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for libsdl2; support newer versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/65703
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: e5163b1d34381a3319214a902ef1df923dd2eeba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libsdl2-version.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Patch for upstream issue:
# libavcodec/libsvtav1.c:124:53: error: no member named 'compressed_ten_bit_format' in 'struct EbSvtAv1EncConfiguration'
# (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,4 +451,4 @@ and is therefore licensed under LGPL v2.1 or later.
</span>
livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(4(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-libsdl2-version.diff b/multimedia/ffmpeg/files/patch-libsdl2-version.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 21c0a992a32..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-libsdl2-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source: https://github.com/FFmpeg/FFmpeg/commit/e5163b1d34381a3319214a902ef1df923dd2eeba.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#---------------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Christopher Degawa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Wed, 11 May 2022 15:11:04 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sdl2 recently changed their versioning, moving the patch level to minor level
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and have said that they will instead ship sdl3.pc for 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixes ticket 9768
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6742,7 +6742,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if enabled sdl2; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL2_CONFIG="${cross_prefix}sdl2-config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
</span></pre><pre style='margin:0'>
</pre>