gstreamer1: update to 1.24.7

barracuda156 · Aug 25, 2024 · b49d81c · b49d81c
1 parent 8bc6bf3
commit b49d81c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/gnome/gstreamer1/Portfile b/gnome/gstreamer1/Portfile
@@ -15,7 +15,7 @@ legacysupport.newest_darwin_requires_legacy 10
 name                gstreamer1
 set my_name         gstreamer
 # please only commit stable updates (even numbered releases)
-version             1.24.5
+version             1.24.7
 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 \
@@ -28,9 +28,9 @@ master_sites        https://gstreamer.freedesktop.org/src/${my_name}/
 distname            ${my_name}-${version}
 use_xz              yes
 
-checksums           rmd160  dec14105ac7db56583c23926e45f17182ff0eb26 \
-                    sha256  2bdef209252bf146351843134b797db6b6e7adb4c00d82e83bd5abe608253a7b \
-                    size    1856180
+checksums           rmd160  dd5c10ec1d7aa8286df91eb48c69e7a3c5198d78 \
+                    sha256  c0e75b124c52bb7a0c3dcdb734b2ad260ea7286a8745cf2ea629d4c849e6a958 \
+                    size    1859604
 
 set py_ver          3.12
 set py_ver_nodot    [string map {. {}} ${py_ver}]

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
@@ -5,6 +5,7 @@ Subject: [PATCH] Revert "macos: Fix gst_macos_main() terminating whole process
  before returning a value"
 
 This reverts commit ffdec6bc2b4af5ddc6c52c7a6bff51949426b984.
+Also makes 1815061e26db11c5e8cef35e7b5e3e3fb9eb7017 conditional to fix 10.5.
 ---
  subprojects/gstreamer/gst/gstmacos.m | 61 ++--------------------------
  1 file changed, 3 insertions(+), 58 deletions(-)
@@ -13,7 +14,14 @@ diff --git subprojects/gstreamer/gst/gstmacos.m subprojects/gstreamer/gst/gstmac
 index dbdb1a70a3..b930bbb0f6 100644
 --- gst/gstmacos.m
 +++ gst/gstmacos.m
-@@ -9,37 +9,11 @@ struct _ThreadArgs {
+@@ -1,5 +1,6 @@
+ #include "gstmacos.h"
+ #include <Cocoa/Cocoa.h>
++#include <AvailabilityMacros.h>
+
+ typedef struct _ThreadArgs ThreadArgs;
+
+@@ -9,37 +10,11 @@ struct _ThreadArgs {
    char **argv;
    gpointer user_data;
    gboolean is_simple;
@@ -51,7 +59,7 @@ index dbdb1a70a3..b930bbb0f6 100644
    int ret;
    if (args->is_simple) {
      ret = ((GstMainFuncSimple) args->main_func) (args->user_data);
-@@ -47,20 +21,7 @@ gst_thread_func (ThreadArgs *args)
+@@ -47,20 +22,7 @@ gst_thread_func (ThreadArgs *args)
      ret = ((GstMainFunc) args->main_func) (args->argc, args->argv, args->user_data);
    }
 
@@ -73,7 +81,7 @@ index dbdb1a70a3..b930bbb0f6 100644
    return ret;
  }
 
-@@ -68,31 +29,15 @@ int
+@@ -68,31 +30,17 @@ int
  run_main_with_nsapp (ThreadArgs args)
  {
    GThread *gst_thread;
@@ -83,18 +91,19 @@ index dbdb1a70a3..b930bbb0f6 100644
 -  g_mutex_init (&args.nsapp_mutex);
 -  g_cond_init (&args.nsapp_cond);
 
--  [NSApplication sharedApplication];
+   [NSApplication sharedApplication];
 -  delegate = [[GstCocoaApplicationDelegate alloc] init];
 -  delegate.nsapp_mutex = &args.nsapp_mutex;
 -  delegate.nsapp_cond = &args.nsapp_cond;
 -  [NSApp setDelegate:delegate];
 -
 -  /* This lets us show an icon in the dock and correctly focus opened windows */
-+  [NSApplication sharedApplication]; 
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
    if ([NSApp activationPolicy] == NSApplicationActivationPolicyProhibited) {
      [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
    }
 -
++#endif
    gst_thread = g_thread_new ("macos-gst-thread", (GThreadFunc) gst_thread_func, &args);
    [NSApp run];
 -  result = GPOINTER_TO_INT (g_thread_join (gst_thread));