<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5346b7be135ddb2ff43e3c6d2ed0deb9c243f2ed">https://github.com/macports/macports-ports/commit/5346b7be135ddb2ff43e3c6d2ed0deb9c243f2ed</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 5346b7be135 wine-devel,wine-staging: Update to 9.18
</span>5346b7be135 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5346b7be135ddb2ff43e3c6d2ed0deb9c243f2ed
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Tue Sep 24 21:46:40 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> wine-devel,wine-staging: Update to 9.18
</span>---
emulators/wine-devel/Portfile | 35 ++++++++++++++++------
emulators/wine-devel/files/1001-devel-msync.diff | 4 +--
emulators/wine-devel/files/1001-staging-msync.diff | 4 +--
3 files changed, 30 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/Portfile b/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c22fbe5760e..7630190a641 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup muniversal 1.1
</span>
# Keep the wine-stable, wine-devel and wine-crossover portfiles as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wine-mirror wine 9.17 wine-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wine-mirror wine 9.18 wine-
</span> github.tarball_from archive
name wine-devel
conflicts wine-stable wine-staging wine-crossover
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,9 @@ long_description \
</span>
checksums \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2293c1c6b36d74e18a6b460d3a9c0ce4ad032c95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a5933231567c07f4afafaab410e90d4a69717e080e2ce539a1364192297dd024 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 49839986
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 84e3ed1dabc823922d7a721529af3c5511cb1f9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9b4635be4ec27ec241bd42fb87958aca21ac08cece940315891d0a1dac3af02b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49959962
</span>
depends_build \
port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,6 +86,7 @@ configure.args \
</span> --with-coreaudio \
--with-cups \
--without-dbus \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-ffmpeg \
</span> --without-fontconfig \
--with-freetype \
--with-gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +99,6 @@ configure.args \
</span> --without-krb5 \
--with-mingw \
--without-netapi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-odbc \
</span> --with-opencl \
--with-opengl \
--without-oss \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +144,9 @@ subport wine-staging {
</span>
checksums-append \
${wine_staging_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 872d7c3be456d1abe7ed948a7c67f4a597b7673b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b75c8fe4802eb00084b7b7c274a9941f06b28ed6496efa612476b9760852392 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9383269
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c92bf1982e87ad4ea36fcbe49686badd66605440 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 afe8c6f3fe2824f5175f76ab1604de671a6adcae11768f118d7e5045c65b5666 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9439240
</span>
depends_patch-append port:autoconf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +170,23 @@ variant gphoto description "Build ${subport} with support for digital cameras" {
</span> configure.args-replace --without-gphoto --with-gphoto
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ffmpeg description "Build ${subport} with FFmpeg-based implementation for the MF byte stream handlers" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the same version of ffmpeg as gstreamer1-gst-libav
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ffmpeg_ver 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ffmpeg${ffmpeg_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-ffmpeg --with-ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${prefix}/libexec/ffmpeg${ffmpeg_ver}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The new implementation can be enabled by setting the DWORD value:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DisableGstByteStreamHandler = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in the HKCU\Software\Wine\MediaFoundation registry key.
</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> variant gstreamer description "Build ${subport} with GStreamer, for multimedia support" {
depends_lib-append port:gstreamer1 port:gstreamer1-gst-plugins-base port:gstreamer1-gst-plugins-good \
port:gstreamer1-gst-plugins-bad port:gstreamer1-gst-plugins-ugly port:gstreamer1-gst-libav
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,7 +198,7 @@ variant kerberos description "Build ${subport} with Kerberos, for network authen
</span> configure.args-replace --without-krb5 --with-krb5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +gstreamer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +ffmpeg +gstreamer
</span>
triplet.add_build cross
triplet.add_host none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/files/1001-devel-msync.diff b/emulators/wine-devel/files/1001-devel-msync.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 66a74efcdf5..2d08d378c10 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-devel/files/1001-devel-msync.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/files/1001-devel-msync.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2162,8 +2162,8 @@ index 74bf0f0c839..fd84ee0d1a9 100644
</span>
/* ### protocol_version begin ### */
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define SERVER_PROTOCOL_VERSION 840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SERVER_PROTOCOL_VERSION 844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define SERVER_PROTOCOL_VERSION 841
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SERVER_PROTOCOL_VERSION 845
</span>
/* ### protocol_version end ### */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/files/1001-staging-msync.diff b/emulators/wine-devel/files/1001-staging-msync.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c2e2f151753..3125818db9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-devel/files/1001-staging-msync.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/files/1001-staging-msync.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2224,8 +2224,8 @@ index 44f18710766..e6610d3cab5 100644
</span>
/* ### protocol_version begin ### */
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define SERVER_PROTOCOL_VERSION 841
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SERVER_PROTOCOL_VERSION 845
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define SERVER_PROTOCOL_VERSION 842
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SERVER_PROTOCOL_VERSION 846
</span>
/* ### protocol_version end ### */
</pre><pre style='margin:0'>
</pre>