Date: Thu, 2 Apr 2020 23:42:35 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530454 - in head/multimedia/obs-studio: . files Message-ID: <202004022342.032NgZLk081073@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Thu Apr 2 23:42:35 2020 New Revision: 530454 URL: https://svnweb.freebsd.org/changeset/ports/530454 Log: multimedia/obs-studio: Fix the procfs(5) link for the executable path: /proc/self/exe -> /proc/curproc/file PR: 245299 Reported by: Keith Hellman <khellman@mcprogramming.com> (the reported issue seems to be the same) Modified: head/multimedia/obs-studio/Makefile head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c Modified: head/multimedia/obs-studio/Makefile ============================================================================== --- head/multimedia/obs-studio/Makefile Thu Apr 2 22:19:00 2020 (r530453) +++ head/multimedia/obs-studio/Makefile Thu Apr 2 23:42:35 2020 (r530454) @@ -2,6 +2,7 @@ PORTNAME= obs-studio DISTVERSION= 25.0.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org Modified: head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp ============================================================================== --- head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Thu Apr 2 22:19:00 2020 (r530453) +++ head/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Thu Apr 2 23:42:35 2020 (r530454) @@ -1,6 +1,6 @@ ---- UI/window-basic-main.cpp.orig 2017-10-25 18:45:20 UTC +--- UI/window-basic-main.cpp.orig 2020-03-19 16:51:06 UTC +++ UI/window-basic-main.cpp -@@ -2461,6 +2461,10 @@ void OBSBasic::TimedCheckForUpdates() +@@ -3207,6 +3207,10 @@ void OBSBasic::TimedCheckForUpdates() void OBSBasic::CheckForUpdates(bool manualUpdate) { @@ -10,4 +10,4 @@ +#endif #ifdef UPDATE_SPARKLE trigger_sparkle_update(); - #elif ENABLE_WIN_UPDATER + #elif _WIN32 Modified: head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c ============================================================================== --- head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c Thu Apr 2 22:19:00 2020 (r530453) +++ head/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c Thu Apr 2 23:42:35 2020 (r530454) @@ -1,10 +1,22 @@ ---- libobs/util/platform-nix.c.orig 2017-10-29 09:19:47 UTC +--- libobs/util/platform-nix.c.orig 2020-03-19 16:51:06 UTC +++ libobs/util/platform-nix.c -@@ -38,6 +38,7 @@ - #include <sys/queue.h> +@@ -40,6 +40,7 @@ #include <sys/socket.h> + #include <sys/sysctl.h> #include <sys/user.h> +#include <sys/sysctl.h> #include <unistd.h> #include <libprocstat.h> #else +@@ -275,7 +276,11 @@ char *os_get_program_data_path_ptr(const char *name) + char *os_get_executable_path_ptr(const char *name) + { + char exe[PATH_MAX]; ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) ++ ssize_t count = readlink("/proc/curproc/file", exe, PATH_MAX); ++#else + ssize_t count = readlink("/proc/self/exe", exe, PATH_MAX); ++#endif + const char *path_out = NULL; + struct dstr path; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004022342.032NgZLk081073>