svn commit: r523991 - branches/2020Q1/multimedia/obs-studio

Piotr Kubaj pkubaj at FreeBSD.org
Fri Jan 24 21:35:27 UTC 2020


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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>

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


More information about the svn-ports-branches mailing list