From owner-dev-commits-ports-main@freebsd.org Mon Jun 28 10:28:01 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 6B75C653C3A; Mon, 28 Jun 2021 10:28:01 +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 4GD3hx2MJcz4k0q; Mon, 28 Jun 2021 10:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3961623AB0; Mon, 28 Jun 2021 10:28:01 +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 15SAS1sk088362; Mon, 28 Jun 2021 10:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15SAS18X088361; Mon, 28 Jun 2021 10:28:01 GMT (envelope-from git) Date: Mon, 28 Jun 2021 10:28:01 GMT Message-Id: <202106281028.15SAS18X088361@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 73049949e7ba - main - multimedia/obs-studio: Re-enable the linux-capture plugin 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/main X-Git-Reftype: branch X-Git-Commit: 73049949e7ba763aac3b85bdf2204fc94c39c896 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2021 10:28:01 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=73049949e7ba763aac3b85bdf2204fc94c39c896 commit 73049949e7ba763aac3b85bdf2204fc94c39c896 Author: Yuri Victorovich AuthorDate: 2021-06-28 10:22:45 +0000 Commit: Yuri Victorovich CommitDate: 2021-06-28 10:27:59 +0000 multimedia/obs-studio: Re-enable the linux-capture plugin It got broken in 27.0.1 by the new linux-specific include which, as it turned out, can be disabled with ENABLE_PIPEWIRE=OFF. PR: 256862 Reported by: Patricio Villar --- multimedia/obs-studio/Makefile | 3 +- .../obs-studio/files/patch-plugins_CMakeLists.txt | 7 +-- multimedia/obs-studio/pkg-plist | 53 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 7 deletions(-) diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index 562b1dcc8976..d3847073e48e 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -1,6 +1,6 @@ PORTNAME= obs-studio DISTVERSION= 27.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -54,6 +54,7 @@ GH_TUPLE= obsproject:obs-browser:f1a61c5:obs_browser/plugins/obs-browser \ obsproject:obs-vst:aaa7b7f:obs_vst/plugins/obs-vst CMAKE_ON= UNIX_STRUCTURE +CMAKE_OFF= ENABLE_PIPEWIRE # beginning with 27.0.1 (PR#4287) the linux-capture plugin optionally requires the piperware library and in this case expects the linux/dma-buf.h header CMAKE_ARGS= -DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" CFLAGS+= -D_WITH_GETLINE diff --git a/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt b/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt index 8fd2ea7d23c2..fa969c2e0925 100644 --- a/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt +++ b/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt @@ -1,11 +1,6 @@ --- plugins/CMakeLists.txt.orig 2021-06-11 14:20:50 UTC +++ plugins/CMakeLists.txt -@@ -47,11 +47,11 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - add_subdirectory(vlc-video) - add_subdirectory(sndio) - elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") -- add_subdirectory(linux-capture) -+ #add_subdirectory(linux-capture) +@@ -51,7 +51,7 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") add_subdirectory(linux-pulseaudio) add_subdirectory(linux-v4l2) add_subdirectory(linux-jack) diff --git a/multimedia/obs-studio/pkg-plist b/multimedia/obs-studio/pkg-plist index ae874e187263..304ba188eef0 100644 --- a/multimedia/obs-studio/pkg-plist +++ b/multimedia/obs-studio/pkg-plist @@ -123,6 +123,7 @@ lib/obs-plugins/decklink-captions.so lib/obs-plugins/decklink-ouput-ui.so lib/obs-plugins/frontend-tools.so lib/obs-plugins/image-source.so +lib/obs-plugins/linux-capture.so %%JACK%%lib/obs-plugins/linux-jack.so %%PULSEAUDIO%%lib/obs-plugins/linux-pulseaudio.so lib/obs-plugins/linux-v4l2.so @@ -293,6 +294,58 @@ share/obs/obs-plugins/image-source/locale/ur-PK.ini share/obs/obs-plugins/image-source/locale/vi-VN.ini share/obs/obs-plugins/image-source/locale/zh-CN.ini share/obs/obs-plugins/image-source/locale/zh-TW.ini +share/obs/obs-plugins/linux-capture/locale/ar-SA.ini +share/obs/obs-plugins/linux-capture/locale/az-AZ.ini +share/obs/obs-plugins/linux-capture/locale/ba-RU.ini +share/obs/obs-plugins/linux-capture/locale/bg-BG.ini +share/obs/obs-plugins/linux-capture/locale/bn-BD.ini +share/obs/obs-plugins/linux-capture/locale/ca-ES.ini +share/obs/obs-plugins/linux-capture/locale/cs-CZ.ini +share/obs/obs-plugins/linux-capture/locale/da-DK.ini +share/obs/obs-plugins/linux-capture/locale/de-DE.ini +share/obs/obs-plugins/linux-capture/locale/el-GR.ini +share/obs/obs-plugins/linux-capture/locale/en-PT.ini +share/obs/obs-plugins/linux-capture/locale/en-US.ini +share/obs/obs-plugins/linux-capture/locale/es-ES.ini +share/obs/obs-plugins/linux-capture/locale/et-EE.ini +share/obs/obs-plugins/linux-capture/locale/eu-ES.ini +share/obs/obs-plugins/linux-capture/locale/fa-IR.ini +share/obs/obs-plugins/linux-capture/locale/fi-FI.ini +share/obs/obs-plugins/linux-capture/locale/fil-PH.ini +share/obs/obs-plugins/linux-capture/locale/fr-FR.ini +share/obs/obs-plugins/linux-capture/locale/gd-GB.ini +share/obs/obs-plugins/linux-capture/locale/gl-ES.ini +share/obs/obs-plugins/linux-capture/locale/he-IL.ini +share/obs/obs-plugins/linux-capture/locale/hi-IN.ini +share/obs/obs-plugins/linux-capture/locale/hr-HR.ini +share/obs/obs-plugins/linux-capture/locale/hu-HU.ini +share/obs/obs-plugins/linux-capture/locale/id-ID.ini +share/obs/obs-plugins/linux-capture/locale/it-IT.ini +share/obs/obs-plugins/linux-capture/locale/ja-JP.ini +share/obs/obs-plugins/linux-capture/locale/ka-GE.ini +share/obs/obs-plugins/linux-capture/locale/kab-KAB.ini +share/obs/obs-plugins/linux-capture/locale/ko-KR.ini +share/obs/obs-plugins/linux-capture/locale/lo-LA.ini +share/obs/obs-plugins/linux-capture/locale/ms-MY.ini +share/obs/obs-plugins/linux-capture/locale/nb-NO.ini +share/obs/obs-plugins/linux-capture/locale/nl-NL.ini +share/obs/obs-plugins/linux-capture/locale/pl-PL.ini +share/obs/obs-plugins/linux-capture/locale/pt-BR.ini +share/obs/obs-plugins/linux-capture/locale/pt-PT.ini +share/obs/obs-plugins/linux-capture/locale/ro-RO.ini +share/obs/obs-plugins/linux-capture/locale/ru-RU.ini +share/obs/obs-plugins/linux-capture/locale/sk-SK.ini +share/obs/obs-plugins/linux-capture/locale/sl-SI.ini +share/obs/obs-plugins/linux-capture/locale/sr-CS.ini +share/obs/obs-plugins/linux-capture/locale/sr-SP.ini +share/obs/obs-plugins/linux-capture/locale/sv-SE.ini +share/obs/obs-plugins/linux-capture/locale/ta-IN.ini +share/obs/obs-plugins/linux-capture/locale/tl-PH.ini +share/obs/obs-plugins/linux-capture/locale/tr-TR.ini +share/obs/obs-plugins/linux-capture/locale/uk-UA.ini +share/obs/obs-plugins/linux-capture/locale/vi-VN.ini +share/obs/obs-plugins/linux-capture/locale/zh-CN.ini +share/obs/obs-plugins/linux-capture/locale/zh-TW.ini %%JACK%%share/obs/obs-plugins/linux-jack/locale/ar-SA.ini %%JACK%%share/obs/obs-plugins/linux-jack/locale/az-AZ.ini %%JACK%%share/obs/obs-plugins/linux-jack/locale/ba-RU.ini