diff options
| author | nia <nia@pkgsrc.org> | 2020-06-24 14:34:37 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-06-24 14:34:37 +0000 |
| commit | 39d7a1f81b3384d0b013ff864296b9b0621e6c52 (patch) | |
| tree | bcb8976ef10d7892ea259dd32b00fbeae29047ed /multimedia | |
| parent | c17c804d8514268edca893c2bc63246e887b732b (diff) | |
| download | pkgsrc-39d7a1f81b3384d0b013ff864296b9b0621e6c52.tar.gz | |
obs-studio: Allow building on systems without LuaJIT support.
While here, remove VLC CMAKE_ARGS, it's now unrecognized.
Bump PKGREVISION
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/obs-studio/Makefile | 15 | ||||
| -rw-r--r-- | multimedia/obs-studio/PLIST | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index ba980982931..e665078c54b 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -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" diff --git a/multimedia/obs-studio/PLIST b/multimedia/obs-studio/PLIST index 7ee8ea602df..c509177c538 100644 --- a/multimedia/obs-studio/PLIST +++ b/multimedia/obs-studio/PLIST @@ -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 |