<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/2bc8ec59730e391f22bb389d2af42bbe25a47e47">https://github.com/macports/macports-ports/commit/2bc8ec59730e391f22bb389d2af42bbe25a47e47</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2bc8ec59730e391f22bb389d2af42bbe25a47e47
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Nov 16 04:35:20 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> gstreamer1: update to 1.24.9
</span>---
gnome/gstreamer1/Portfile | 8 ++++----
...acos-Fix-gst_macos_main-terminating-whole-pr.patch | 19 ++++++++++++-------
2 files changed, 16 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1/Portfile b/gnome/gstreamer1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fded46b14a0..781d16e6a78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ legacysupport.newest_darwin_requires_legacy 10
</span> name gstreamer1
set my_name gstreamer
# please only commit stable updates (even numbered releases)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.24.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.24.9
</span> revision 0
description GStreamer is a library for constructing graphs of media-handling components.
long_description The applications it supports range from simple Ogg/Vorbis playback, audio/video \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,9 @@ master_sites https://gstreamer.freedesktop.org/src/${my_name}/
</span> distname ${my_name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6ad3a456470c8c69834eb1bd7e42c6a67287f941 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b807dbf36c5d2b3ce1c604133ed0c737350f9523ce4d8d644a1177c5f9d6ded3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1861416
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1165d7db0474170c33ef1bfd769b6c6f23478d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ebf47b6beef508a00c8557d4c1f1713e5c7ef9ba70dac45deed80e182bcf260f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1863856
</span>
set py_ver 3.12
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1/files/0001-Revert-macos-Fix-gst_macos_main-terminating-whole-pr.patch b/gnome/gstreamer1/files/0001-Revert-macos-Fix-gst_macos_main-terminating-whole-pr.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b7098f8873..fa1f921b389 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1/files/0001-Revert-macos-Fix-gst_macos_main-terminating-whole-pr.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1/files/0001-Revert-macos-Fix-gst_macos_main-terminating-whole-pr.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,17 +21,19 @@ index dbdb1a70a3..b930bbb0f6 100644
</span>
typedef struct _ThreadArgs ThreadArgs;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,37 +10,11 @@ struct _ThreadArgs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,40 +10,11 @@
</span> char **argv;
gpointer user_data;
gboolean is_simple;
- GMutex nsapp_mutex;
- GCond nsapp_cond;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- gboolean nsapp_running;
</span> };
-@interface GstCocoaApplicationDelegate : NSObject <NSApplicationDelegate>
-@property (assign) GMutex *nsapp_mutex;
-@property (assign) GCond *nsapp_cond;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-@property (assign) gboolean *nsapp_running;
</span> -@end
-
-@implementation GstCocoaApplicationDelegate
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +41,7 @@ index dbdb1a70a3..b930bbb0f6 100644
</span> -- (void)applicationDidFinishLaunching:(NSNotification *)notification
-{
- g_mutex_lock (self.nsapp_mutex);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- *self.nsapp_running = TRUE;
</span> - g_cond_signal (self.nsapp_cond);
- g_mutex_unlock (self.nsapp_mutex);
-}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +54,7 @@ index dbdb1a70a3..b930bbb0f6 100644
</span> - /* Only proceed once NSApp is running, otherwise we could
- * attempt to call [NSApp: stop] before it's even started. */
- g_mutex_lock (&args->nsapp_mutex);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (![[NSRunningApplication currentApplication] isFinishedLaunching]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (!args->nsapp_running) {
</span> - g_cond_wait (&args->nsapp_cond, &args->nsapp_mutex);
- }
- g_mutex_unlock (&args->nsapp_mutex);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +62,7 @@ index dbdb1a70a3..b930bbb0f6 100644
</span> int ret;
if (args->is_simple) {
ret = ((GstMainFuncSimple) args->main_func) (args->user_data);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,20 +22,7 @@ gst_thread_func (ThreadArgs *args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,20 +22,7 @@
</span> ret = ((GstMainFunc) args->main_func) (args->argc, args->argv, args->user_data);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,17 +74,17 @@ index dbdb1a70a3..b930bbb0f6 100644
</span> - windowNumber: 0
- context: nil
- subtype: NSEventSubtypeApplicationActivated
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- data1: 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data1: 0
</span> - data2: 0];
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NSApp postEvent:event atStart:YES];
</span> - [NSApp stop:nil];
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- [NSApp postEvent:event atStart:YES];
</span> -
+ [NSApp terminate: nil];
return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,31 +30,17 @@ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,33 +30,16 @@
</span> run_main_with_nsapp (ThreadArgs args)
{
GThread *gst_thread;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,11 +93,13 @@ index dbdb1a70a3..b930bbb0f6 100644
</span> -
- g_mutex_init (&args.nsapp_mutex);
- g_cond_init (&args.nsapp_cond);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- args.nsapp_running = FALSE;
</span>
[NSApplication sharedApplication];
- delegate = [[GstCocoaApplicationDelegate alloc] init];
- delegate.nsapp_mutex = &args.nsapp_mutex;
- delegate.nsapp_cond = &args.nsapp_cond;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- delegate.nsapp_running = &args.nsapp_running;
</span> - [NSApp setDelegate:delegate];
-
- /* This lets us show an icon in the dock and correctly focus opened windows */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +115,7 @@ index dbdb1a70a3..b930bbb0f6 100644
</span> -
- g_mutex_clear (&args.nsapp_mutex);
- g_cond_clear (&args.nsapp_cond);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - return result;
+ return GPOINTER_TO_INT (g_thread_join (gst_thread));
}
</pre><pre style='margin:0'>
</pre>