From nobody Fri Jan 14 18:06:40 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D8F3019659C1; Fri, 14 Jan 2022 18:06:40 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jb8Pr56blz4mD9; Fri, 14 Jan 2022 18:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yegY+aJ/d5MUJGdU+kpH0jyz6SmsRnS9hB1/AeFhqI=; b=UZ5wcjw5ZGV4muEunngz/WFWJu4jsvbv9zw1S2CBTZV+IYR9N2+GoYrPf/rEW/L6c78NC3 D9uKMTCfHkJurvm1rMxIp8PBVV2MWAjjA9rpmikuMkIk+Pocuz6SovQOWlLpNbSFKTDWJE XSTHL7egjS2VZOu4e6XHoIKeM153AxW0rdJzSQs2s28+0tu4GZFG5lHy7ZjX6q3QPw66iL mm/2+7k46sTS2c+byeIRpsCgYjf+qNSLOnwamNnRieiRkPxqe1qOlc+dzvHtzAFMBhqd+K qFVYeii0pW1Z7hDsg83IUJZCiEdYl/i72I9yK+RGshCecS9kmpYcBRovynw3IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 904A3186DF; Fri, 14 Jan 2022 18:06:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20EI6eUN086556; Fri, 14 Jan 2022 18:06:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EI6e36086555; Fri, 14 Jan 2022 18:06:40 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:06:40 GMT Message-Id: <202201141806.20EI6e36086555@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 5e094f7b1e5b - 2022Q1 - multimedia/obs-ndi: Fix lookup path for libndi.so and add it as dependency List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 5e094f7b1e5b71fa7c7173552e59ae73349732f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yegY+aJ/d5MUJGdU+kpH0jyz6SmsRnS9hB1/AeFhqI=; b=iNcgG5VA36JuprYjlyTgc4juj1lPVWgaYnAiIv5NeaTo5BEivyCdVCCkYiVsQnD+3C+NLM JxkMoIed+tYL4BSr54yUPkBqKKYESKnA7ZkRehuWgaUs98VfDXxAoukvALG8dYv/5laNMD cFL1u/5M00pTEQekgHfNAoIPPQ45dmUag63nAt7q4STjOMNfYskeKMDPKXKhsB8Sgh2qUl MY1zkoJCoBfoQzyzyP0HIXB7Hv/nh+m8DZbr/tDrwbeKhAVngUfUH5wmZ4b/Oe5R0PhKdW NITnaws51XCJSToc5hnqMt2wG4NESEOD7/PMCZ09RMsAlp4ZLlUMYRHLiYUh1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183600; a=rsa-sha256; cv=none; b=qjaF93tYKaX9BG8ZbKICIYiNtDX7XKW0Lt6LZ2NhP8gS+7kqrN/e9dP6AxKFW6RWHzBY7X ncEHgj8sZRM751D6fXBOst7Q0glYp0umVTYrRZN9k45bb02gX8qMJ1e3aNr3VHPN0paqFp 06TSLcDXQS2bi0sC2wtrzSuWrMj6s5j9ZXaja5UvYoWEy8a3gNKegVZ7B5uALs18LA0n5j 7byYbvSA2xWKREq+9Cm+5ZawqJRsIv29Im0b2e90t3C3DtYMHqNnF+U/I2n8ks9VXYduES R6HPYwT0jSVTvcJ3IojGlg0WfoQdPzM6ocAUReZ7vrcYk/388AwAhqo53RKY6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e094f7b1e5b71fa7c7173552e59ae73349732f9 commit 5e094f7b1e5b71fa7c7173552e59ae73349732f9 Author: Yuri Victorovich AuthorDate: 2022-01-14 18:04:27 +0000 Commit: Yuri Victorovich CommitDate: 2022-01-14 18:06:38 +0000 multimedia/obs-ndi: Fix lookup path for libndi.so and add it as dependency PR: 258694 Reported by: mario felicioni (cherry picked from commit 391fef9e9f2a873effd31feabbe50ecbf4ec4811) --- multimedia/obs-ndi/Makefile | 3 ++- multimedia/obs-ndi/files/patch-src_obs-ndi.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/multimedia/obs-ndi/Makefile b/multimedia/obs-ndi/Makefile index 97304ff52748..a456aaab3c0c 100644 --- a/multimedia/obs-ndi/Makefile +++ b/multimedia/obs-ndi/Makefile @@ -1,6 +1,6 @@ PORTNAME= obs-ndi DISTVERSION= 4.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -10,6 +10,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libobs.so:multimedia/obs-studio +RUN_DEPENDS= ${LOCALBASE}/lib/libndi.so:multimedia/libndi USES= cmake compiler:c++11-lang localbase:ldflags qt:5 USE_GITHUB= yes diff --git a/multimedia/obs-ndi/files/patch-src_obs-ndi.cpp b/multimedia/obs-ndi/files/patch-src_obs-ndi.cpp new file mode 100644 index 000000000000..f8eb273db537 --- /dev/null +++ b/multimedia/obs-ndi/files/patch-src_obs-ndi.cpp @@ -0,0 +1,11 @@ +--- src/obs-ndi.cpp.orig 2022-01-14 17:54:22 UTC ++++ src/obs-ndi.cpp +@@ -198,7 +198,7 @@ const NDIlib_v4* load_ndilib() + { + QStringList locations; + locations << QString(qgetenv(NDILIB_REDIST_FOLDER)); +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) + locations << "/usr/lib"; + locations << "/usr/local/lib"; + #endif