CVS commit: pkgsrc/multimedia/gpac

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Dec 15 13:05:53 UTC 2023

Modified Files:
        pkgsrc/multimedia/gpac: distinfo
        pkgsrc/multimedia/gpac/patches: patch-src_utils_os__config__init.c
Added Files:
        pkgsrc/multimedia/gpac/patches: patch-src_filter__core_filter__props.c

Log Message:
gpac: fix macOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/gpac/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/gpac/patches/patch-src_filter__core_filter__props.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/gpac/patches/patch-src_utils_os__config__init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gpac/distinfo
diff -u pkgsrc/multimedia/gpac/distinfo:1.21 pkgsrc/multimedia/gpac/distinfo:1.22
--- pkgsrc/multimedia/gpac/distinfo:1.21        Tue Oct 26 11:01:03 2021
+++ pkgsrc/multimedia/gpac/distinfo     Fri Dec 15 13:05:53 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 11:01:03 nia Exp $
+$NetBSD: distinfo,v 1.22 2023/12/15 13:05:53 schmonz Exp $
 
 BLAKE2s (gpac-1.0.1.tar.gz) = 3c143d469b8369ba0c8a3c648fe39fdeddb54703584f5b82cbebb36b84e73230
 SHA512 (gpac-1.0.1.tar.gz) = 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
@@ -6,7 +6,8 @@ Size (gpac-1.0.1.tar.gz) = 10352926 byte
 SHA1 (patch-Makefile) = 1478bc37c42f8e62dbf44e9dfe2fa988ef68e0b5
 SHA1 (patch-configure) = b76d24b134b7e10c613411f08d8374f0e0202599
 SHA1 (patch-include_gpac_Remotery.h) = 0a8775a6cb7b16e2c5c7b6018c940bf9a049cc31
+SHA1 (patch-src_filter__core_filter__props.c) = 1f9115c90b8ef7516d7cfbd875bb0938c64d8841
 SHA1 (patch-src_quickjs_cutils.h) = df7662578bf2c727da43dce91d94bc380f6da84d
 SHA1 (patch-src_quickjs_quickjs.c) = 276e3d2dfa51a64bf99795b294bb7e16405a9627
 SHA1 (patch-src_utils_Remotery.c) = dfd01780211bcccfc574c572690241c91d941ce0
-SHA1 (patch-src_utils_os__config__init.c) = 99e339d969e319a0a29fc8b366f6335c19ca4c50
+SHA1 (patch-src_utils_os__config__init.c) = 72d815aefdca2096df18bdb310db47a9961ec6d3

Index: pkgsrc/multimedia/gpac/patches/patch-src_utils_os__config__init.c
diff -u pkgsrc/multimedia/gpac/patches/patch-src_utils_os__config__init.c:1.1 pkgsrc/multimedia/gpac/patches/patch-src_utils_os__config__init.c:1.2
--- pkgsrc/multimedia/gpac/patches/patch-src_utils_os__config__init.c:1.1       Fri Sep 17 00:10:21 2021
+++ pkgsrc/multimedia/gpac/patches/patch-src_utils_os__config__init.c   Fri Dec 15 13:05:53 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_utils_os__config__init.c,v 1.1 2021/09/17 00:10:21 nia Exp $
+$NetBSD: patch-src_utils_os__config__init.c,v 1.2 2023/12/15 13:05:53 schmonz Exp $
 
 Support NetBSD.
 
@@ -26,19 +26,19 @@ Support NetBSD.
  
        /*on OSX, Linux & co, user home is where we store the cfg file*/
        if (path_type==GF_PATH_CFG) {
-@@ -342,6 +350,15 @@ static Bool get_default_install_path(cha
-                       return 1;
-               }
- 
+@@ -339,6 +347,15 @@ static Bool get_default_install_path(cha
+                       realpath(app_path, file_path);
+                       sep = strrchr(file_path, '/');
+                       if (sep) sep[0] = 0;
++                      return 1;
++              }
++
 +#elif defined(__NetBSD__)
 +              size = sizeof(app_path);
 +              if (sysctl(mib, 4, app_path, &size, NULL, 0) != -1) {
 +                      realpath(app_path, file_path);
 +                      sep = strrchr(file_path, '/');
 +                      if (sep) sep[0] = 0;
-+                      return 1;
-+              }
-+
- #elif defined(GPAC_CONFIG_LINUX)
-               size = readlink("/proc/self/exe", file_path, GF_MAX_PATH-1);
-               if (size>0) {
+                       return 1;
+               }
+ 

Added files:

Index: pkgsrc/multimedia/gpac/patches/patch-src_filter__core_filter__props.c
diff -u /dev/null pkgsrc/multimedia/gpac/patches/patch-src_filter__core_filter__props.c:1.1
--- /dev/null   Fri Dec 15 13:05:53 2023
+++ pkgsrc/multimedia/gpac/patches/patch-src_filter__core_filter__props.c       Fri Dec 15 13:05:53 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_filter__core_filter__props.c,v 1.1 2023/12/15 13:05:53 schmonz Exp $
+
+Work around clang 15 optimizing to memrchr (which macOS doesn't have).
+Adapted from upstream commit ce22027.
+
+--- src/filter_core/filter_props.c.orig        2023-12-15 12:55:29.610511221 +0000
++++ src/filter_core/filter_props.c
+@@ -41,7 +41,7 @@ GF_PropertyValue gf_props_parse_value(u3
+       unit_sep = NULL;
+       if (value) {
+               u32 len = (u32) strlen(value);
+-              unit_sep = len ? strrchr("kKgGmM", value[len-1]) : NULL;
++              unit_sep = len ? strchr("MmGgKk", value[len-1]) : NULL;
+               if (unit_sep) {
+                       u8 unit_char = unit_sep[0];
+                       if ((unit_char=='k') || (unit_char=='K')) unit = 1000;