Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Jan 2020 21:34:34 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523990 - head/multimedia/obs-studio
Message-ID:  <202001242134.00OLYY7O016278@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Fri Jan 24 21:34:34 2020
New Revision: 523990
URL: https://svnweb.freebsd.org/changeset/ports/523990

Log:
  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)
  MFH:		2020Q1 (fix build blanket)

Modified:
  head/multimedia/obs-studio/Makefile
  head/multimedia/obs-studio/pkg-plist

Modified: head/multimedia/obs-studio/Makefile
==============================================================================
--- head/multimedia/obs-studio/Makefile	Fri Jan 24 21:16:34 2020	(r523989)
+++ head/multimedia/obs-studio/Makefile	Fri Jan 24 21:34:34 2020	(r523990)
@@ -50,8 +50,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: head/multimedia/obs-studio/pkg-plist
==============================================================================
--- head/multimedia/obs-studio/pkg-plist	Fri Jan 24 21:16:34 2020	(r523989)
+++ head/multimedia/obs-studio/pkg-plist	Fri Jan 24 21:34:34 2020	(r523990)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001242134.00OLYY7O016278>