<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ef10a5e18bf1e468d07d65f528e79131cfd82854">https://github.com/macports/macports-ports/commit/ef10a5e18bf1e468d07d65f528e79131cfd82854</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ef10a5e18bf1e468d07d65f528e79131cfd82854
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun Aug 11 10:51:55 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> audacious-core: update to 4.4
</span>---
multimedia/audacious-core/Portfile | 46 +++++++++++-----
.../audacious-core/files/patch-vfsseektype.diff | 62 ----------------------
2 files changed, 33 insertions(+), 75 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/audacious-core/Portfile b/multimedia/audacious-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07677a12418..fec3a7d00f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/audacious-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/audacious-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,13 +7,14 @@ name audacious-core
</span> set real_name audacious
# Please keep audacious, audacious-core and audacious-plugins synchronized.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4
</span> revision 0
license BSD
categories multimedia
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ionic @Ionic}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ionic @Ionic} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {makr @mohd-akram}
</span> homepage https://www.audacious-media-player.org/
description Audacious is an advanced audio player.
long_description ${description} It is free, lightweight, based on GTK3, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,15 +31,12 @@ long_description ${description} It is free, lightweight, based on GTK3, \
</span> master_sites https://distfiles.audacious-media-player.org
distname ${real_name}-${version}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 44780e4610cc390effed8b0052156725b9ddc652 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 85e9e26841505b51e342ee72a2d05f19bef894f567a029ebb3f3e0c1adb42042 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 630820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6e8597bcc71595cbad974147eb700a3d950e0344 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aadc5d26ea2954236a00153e424094d9e6eb55c5c324c08fd0491b7c2ae2f830 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 635856
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/audacious-media-player/audacious/pull/64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-vfsseektype.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:libiconv \
port:gettext \
path:lib/pkgconfig/dbus-1.pc:dbus \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +47,9 @@ compiler.cxx_standard 2017
</span>
configure.args -Ddbus=true \
-Dqt=false \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dqt5=false \
</span> -Dgtk=false \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk2=false \
</span> -Dvalgrind=false
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,19 @@ post-destroot {
</span> variant qt5 description {Add Qt5 support} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dqt=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dqt=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dqt5=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dqt5=true
</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;'>+variant qt6 description {Add Qt6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt6 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt6.depends_lib qtsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace -Dqt=false \
-Dqt=true
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +86,9 @@ variant gtk2 conflicts gtk3 description {Add GTK2 support} {
</span> depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-replace -Dgtk=false \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dgtk=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk2=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk2=true
</span> }
variant gtk3 conflicts gtk2 description {Add GTK3 support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,13 +96,18 @@ variant gtk3 conflicts gtk2 description {Add GTK3 support} {
</span>
configure.args-replace -Dgtk=false \
-Dgtk=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dgtk3=true
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Need either one of gtk2, gtk3 or Qt5 to have a GUI.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On 10.7+ default to qt5, which is preferred by upstream.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need either one of gtk2, gtk3, Qt5 or Qt6 to have a GUI.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Default to qt6, which is preferred by upstream.
</span> if {![variant_isset gtk2] && ![variant_isset gtk3] && ![variant_isset qt5]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fails to build on macOS - https://trac.macports.org/ticket/69214
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt6
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gtk2] && ![variant_isset gtk3] && ![variant_isset qt6]} {
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
default_variants-append +gtk3
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/audacious-core/files/patch-vfsseektype.diff b/multimedia/audacious-core/files/patch-vfsseektype.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a342ca87e35..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/audacious-core/files/patch-vfsseektype.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4967240899b6f36e3e5dfc68f1b8963824562fe9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Guido Falsi <mad@madpilot.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 28 Jun 2023 15:42:37 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add VFS_SEEK_INVALID enum value.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-New versions of the clang compiler have strict checks for enum values.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The value "-1" is returned as a last resort from to_vfs_seek_type() as a VFSSeekType.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Replace usage of `-1` with the new enum name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(jlindgren: added comment, updated formatting)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/libaudcore/vfs.h | 24 +++++++++++++-----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 13 insertions(+), 11 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/libaudcore/vfs.h b/src/libaudcore/vfs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 33c5a65c97..e2fe7efb73 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libaudcore/vfs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libaudcore/vfs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,11 @@ enum VFSSeekType
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VFS_SEEK_SET = 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VFS_SEEK_CUR = 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VFS_SEEK_END = 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VFS_SEEK_END = 2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* This value exists only to translate out-of-range values from external
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * libraries/APIs (e.g. POSIX). Avoid using it. For validity checks, use an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * else/default case rather than testing equality with VFS_SEEK_INVALID. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VFS_SEEK_INVALID = -1
</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;'>- #ifdef WANT_VFS_STDIO_COMPAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,20 +66,18 @@ enum VFSSeekType
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr int from_vfs_seek_type(VFSSeekType whence)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (whence == VFS_SEEK_SET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ? SEEK_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : (whence == VFS_SEEK_CUR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ? SEEK_CUR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : (whence == VFS_SEEK_END) ? SEEK_END : -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (whence == VFS_SEEK_SET) ? SEEK_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : (whence == VFS_SEEK_CUR) ? SEEK_CUR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : (whence == VFS_SEEK_END) ? SEEK_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : -1;
</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;'>- constexpr VFSSeekType to_vfs_seek_type(int whence)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (whence == SEEK_SET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ? VFS_SEEK_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : (whence == SEEK_CUR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ? VFS_SEEK_CUR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : (whence == SEEK_END) ? VFS_SEEK_END : (VFSSeekType)-1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (whence == SEEK_SET) ? VFS_SEEK_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : (whence == SEEK_CUR) ? VFS_SEEK_CUR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : (whence == SEEK_END) ? VFS_SEEK_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : VFS_SEEK_INVALID;
</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;'>- #endif // WANT_VFS_STDIO_COMPAT
</span></pre><pre style='margin:0'>
</pre>