CVS commit: pkgsrc/multimedia/obs-studio

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jun 24 14:34:38 UTC 2020

Modified Files:
        pkgsrc/multimedia/obs-studio: Makefile PLIST

Log Message:
obs-studio: Allow building on systems without LuaJIT support.

While here, remove VLC CMAKE_ARGS, it's now unrecognized.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/obs-studio/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/obs-studio/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/obs-studio/Makefile
diff -u pkgsrc/multimedia/obs-studio/Makefile:1.17 pkgsrc/multimedia/obs-studio/Makefile:1.18
--- pkgsrc/multimedia/obs-studio/Makefile:1.17  Tue Jun  2 08:24:27 2020
+++ pkgsrc/multimedia/obs-studio/Makefile       Wed Jun 24 14:34:37 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2020/06/02 08:24:27 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/24 14:34:37 nia Exp $
 
 DISTNAME=      obs-studio-25.0.8
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=obsproject/}
 
@@ -15,7 +15,6 @@ USE_TOOLS+=   pkg-config
 USE_LANGUAGES= c gnu++11
 
 CMAKE_ARGS+=   -DDISABLE_LIBFDK=BOOL:ON
-CMAKE_ARGS+=   -DDISABLE_VLC=BOOL:ON
 
 TOOL_DEPENDS+= swig3>=3.0:../../devel/swig3
 
@@ -38,7 +37,15 @@ PYTHON_VERSIONS_INCOMPATIBLE=        27
 .  include "../../graphics/libv4l/buildlink3.mk"
 .endif
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
+.include "../../lang/LuaJIT2/platform.mk"
+PLIST_VARS+=   lua
+#.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
+.if 0
+PLIST.lua=     yes
+.  include "../../lang/LuaJIT2/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DDISABLE_LUA=ON
+.endif
 .include "../../lang/python/pyversion.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/x264-devel/buildlink3.mk"

Index: pkgsrc/multimedia/obs-studio/PLIST
diff -u pkgsrc/multimedia/obs-studio/PLIST:1.4 pkgsrc/multimedia/obs-studio/PLIST:1.5
--- pkgsrc/multimedia/obs-studio/PLIST:1.4      Tue Apr 28 11:40:51 2020
+++ pkgsrc/multimedia/obs-studio/PLIST  Wed Jun 24 14:34:37 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/04/28 11:40:51 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/06/24 14:34:37 nia Exp $
 bin/obs
 bin/obs-ffmpeg-mux
 include/obs/audio-monitoring/pulse/pulseaudio-wrapper.h
@@ -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
+${PLIST.lua}lib/obs-scripting/obslua.so
 lib/obs-scripting/obspython.py
 lib/pkgconfig/libobs.pc
 share/applications/com.obsproject.Studio.desktop