From owner-svn-ports-all@freebsd.org Fri Apr 3 09:35:44 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7056C27B02C; Fri, 3 Apr 2020 09:35:44 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48tvtl2RQjz4WR1; Fri, 3 Apr 2020 09:35:43 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B439C1EAC; Fri, 3 Apr 2020 09:26:09 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0339Q9kW034439; Fri, 3 Apr 2020 09:26:09 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0339Q9Zj034437; Fri, 3 Apr 2020 09:26:09 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202004030926.0339Q9Zj034437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 3 Apr 2020 09:26:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r530477 - in branches/2020Q2/multimedia/obs-studio: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in branches/2020Q2/multimedia/obs-studio: . files X-SVN-Commit-Revision: 530477 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 09:35:45 -0000 Author: yuri Date: Fri Apr 3 09:26:08 2020 New Revision: 530477 URL: https://svnweb.freebsd.org/changeset/ports/530477 Log: MFH: r530454 multimedia/obs-studio: Fix the procfs(5) link for the executable path: /proc/self/exe -> /proc/curproc/file PR: 245299 Reported by: Keith Hellman (the reported issue seems to be the same) Approved by: ports-secteam@FreeBSD.org Modified: branches/2020Q2/multimedia/obs-studio/Makefile branches/2020Q2/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp branches/2020Q2/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/obs-studio/Makefile ============================================================================== --- branches/2020Q2/multimedia/obs-studio/Makefile Fri Apr 3 09:25:46 2020 (r530476) +++ branches/2020Q2/multimedia/obs-studio/Makefile Fri Apr 3 09:26:08 2020 (r530477) @@ -2,6 +2,7 @@ PORTNAME= obs-studio DISTVERSION= 25.0.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org Modified: branches/2020Q2/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp ============================================================================== --- branches/2020Q2/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Fri Apr 3 09:25:46 2020 (r530476) +++ branches/2020Q2/multimedia/obs-studio/files/patch-UI_window-basic-main.cpp Fri Apr 3 09:26:08 2020 (r530477) @@ -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: branches/2020Q2/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c ============================================================================== --- branches/2020Q2/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c Fri Apr 3 09:25:46 2020 (r530476) +++ branches/2020Q2/multimedia/obs-studio/files/patch-libobs_util_platform-nix.c Fri Apr 3 09:26:08 2020 (r530477) @@ -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 +@@ -40,6 +40,7 @@ #include + #include #include +#include #include #include #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; +