From owner-svn-ports-branches@freebsd.org Fri Jan 24 21:35:27 2020 Return-Path: Delivered-To: svn-ports-branches@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 4A9351FC9A6; Fri, 24 Jan 2020 21:35:27 +0000 (UTC) (envelope-from pkubaj@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 484C9W1C7Cz4b05; Fri, 24 Jan 2020 21:35:27 +0000 (UTC) (envelope-from pkubaj@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 245DA2D953; Fri, 24 Jan 2020 21:35:27 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00OLZQZ7016508; Fri, 24 Jan 2020 21:35:26 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00OLZQ5r016506; Fri, 24 Jan 2020 21:35:26 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001242135.00OLZQ5r016506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 24 Jan 2020 21:35:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r523991 - branches/2020Q1/multimedia/obs-studio X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: branches/2020Q1/multimedia/obs-studio X-SVN-Commit-Revision: 523991 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jan 2020 21:35:27 -0000 Author: pkubaj Date: Fri Jan 24 21:35:26 2020 New Revision: 523991 URL: https://svnweb.freebsd.org/changeset/ports/523991 Log: MFH: r523990 multimedia/obs-studio: fix packaging on architectures without luajit The previous patch missed packaging fix. obslua.so is not installed without luajit. PR: 243562 Approved by: yuri (maintainer) Approved by: portmgr (fix build blanket) Modified: branches/2020Q1/multimedia/obs-studio/Makefile branches/2020Q1/multimedia/obs-studio/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/multimedia/obs-studio/Makefile ============================================================================== --- branches/2020Q1/multimedia/obs-studio/Makefile Fri Jan 24 21:34:34 2020 (r523990) +++ branches/2020Q1/multimedia/obs-studio/Makefile Fri Jan 24 21:35:26 2020 (r523991) @@ -51,8 +51,16 @@ CMAKE_ARGS= -DUNIX_STRUCTURE:BOOL=ON \ -DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" CFLAGS+= -D_WITH_GETLINE +.include + +.if ${ARCH} != amd64 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc +PLIST_SUB+= LUAJIT="@comment " +.else +PLIST_SUB+= LUAJIT="" +.endif + post-patch: @${REINPLACE_CMD} -e 's| 3.4)| ${PYTHON_VER})|' \ ${WRKSRC}/cmake/Modules/FindPythonDeps.cmake -.include +.include Modified: branches/2020Q1/multimedia/obs-studio/pkg-plist ============================================================================== --- branches/2020Q1/multimedia/obs-studio/pkg-plist Fri Jan 24 21:34:34 2020 (r523990) +++ branches/2020Q1/multimedia/obs-studio/pkg-plist Fri Jan 24 21:35:26 2020 (r523991) @@ -113,7 +113,7 @@ lib/obs-plugins/obs-x264.so lib/obs-plugins/rtmp-services.so lib/obs-plugins/text-freetype2.so lib/obs-scripting/_obspython.so -lib/obs-scripting/obslua.so +%%LUAJIT%%lib/obs-scripting/obslua.so lib/obs-scripting/obspython.py libdata/pkgconfig/libobs.pc share/applications/com.obsproject.Studio.desktop