<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0e6b5de75b9b5c40957c7c9fa8794a8f7208f98a">https://github.com/macports/macports-ports/commit/0e6b5de75b9b5c40957c7c9fa8794a8f7208f98a</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 0e6b5de75b9 libass: update to 0.17.3; libass-devel: update to 2024.09.13
</span>0e6b5de75b9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0e6b5de75b9b5c40957c7c9fa8794a8f7208f98a
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Sep 14 04:43:06 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> libass: update to 0.17.3; libass-devel: update to 2024.09.13
</span>---
multimedia/libass/Portfile | 25 +++++++++------
.../0760c5302d12dbb358cabd81c330c3ce20b5151c.patch | 26 ++++++++++++++++
.../abc7fbdbb0313536d2f9684dd527c736814e45d8.patch | 36 ++++++++++++++++++++++
3 files changed, 78 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libass/Portfile b/multimedia/libass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ab7bb9ac6e..5312ca6865d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,13 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libass libass 0.17.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libass libass 0.17.3
</span> revision 0
conflicts libass-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e208192a35c6d9857837240856c2b0d0bf7dce05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 38475e53a493d2e3268641b5baf85909dd77e62867e3a18dcc648b58f3b28fcd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 326496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 867ba1b341044d0f78d8c65470aa8133d415cc62 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59ed574ca9c36eb6f1381482d7cdfcc602c4bc6a92b2aacf4b90e084e1717e62 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 329596
</span>
categories multimedia
license ISC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,22 @@ long_description \
</span> format. It is mostly compatible with VSFilter.
subport libass-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libass libass a0aefba3cf357f74bf67410d71a1e0cf37d6c3da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2024.06.02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libass libass 1d826b9946b9cf91fed46137ffec5e906e47c1fd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2024.09.13
</span> conflicts libass
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d1c173b3db66006135fe1b303a280d278fa21670 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fc8b8413513af63c00b02fad15c1355da5a7cab25f19f2a2d6ebb194f915c84f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 326716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 365135476ce0562fd57d7c933705fac8ef89258d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 99dbe0429a91b4d10847601c6d1300964e44d97df858b2e2ef994968bcc82c7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 334431
</span> github.tarball_from archive
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Backport of https://github.com/libass/libass/commit/abc7fbdbb0313536d2f9684dd527c736814e45d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abc7fbdbb0313536d2f9684dd527c736814e45d8.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0760c5302d12dbb358cabd81c330c3ce20b5151c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:m4 \
port:nasm \
path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libass/files/0760c5302d12dbb358cabd81c330c3ce20b5151c.patch b/multimedia/libass/files/0760c5302d12dbb358cabd81c330c3ce20b5151c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b187eaa95f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libass/files/0760c5302d12dbb358cabd81c330c3ce20b5151c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0760c5302d12dbb358cabd81c330c3ce20b5151c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Oleg Oshmyan <chortos@inbox.lv>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 13 Sep 2024 20:02:41 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Move __has_builtin fallback to ass_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This ensures that it's present and usable everywhere.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libass/ass_compat.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libass/ass_utils.h | 4 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libass/ass_compat.h b/libass/ass_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52ac282a0..cdb58ce84 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libass/ass_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libass/ass_compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef LIBASS_COMPAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LIBASS_COMPAT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __has_builtin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __has_builtin(x) 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _CRT_NONSTDC_NO_DEPRECATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _CRT_SECURE_NO_WARNINGS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libass/files/abc7fbdbb0313536d2f9684dd527c736814e45d8.patch b/multimedia/libass/files/abc7fbdbb0313536d2f9684dd527c736814e45d8.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..604879d48b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libass/files/abc7fbdbb0313536d2f9684dd527c736814e45d8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From abc7fbdbb0313536d2f9684dd527c736814e45d8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Oleg Oshmyan <chortos@inbox.lv>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 13 Sep 2024 19:54:05 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] coretext: drop obsolete, bugged copy of #define __has_builtin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+__has_builtin is a function-style macro, but this polyfill
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+definition is missing the argument, so __has_builtin(something)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gets expanded to 0(something), which fails to parse.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Commit c3ee4044d5cdf935752251f04da74736a9cc7633 added a correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implementation to ass_utils.h, so the one in ass_coretext.c is neither
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+useful nor used any more, as ass_utils.h is transitively included.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For clarity, add an explicit include, and drop the bugged definition.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This makes ass_coretext actually compilable using old GCC (e.g. relevant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for PowerPC macOS as in https://github.com/libass/libass/issues/826).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libass/ass_coretext.c | 5 +----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libass/ass_coretext.c b/libass/ass_coretext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ba40ccab6..46cbfcf12 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libass/ass_coretext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libass/ass_coretext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,10 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ass_coretext.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef __has_builtin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define __has_builtin 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "ass_utils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __has_builtin(__builtin_available)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CHECK_AVAILABLE(sym, ...) __builtin_available(__VA_ARGS__)
</span></pre><pre style='margin:0'>
</pre>