git: 8f4e2e277e3c - main - multimedia/obs-studio: Fix conflict caused by luajit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Jul 2023 16:53:00 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8f4e2e277e3c807fa9099e3a586bf284f4eb642c
commit 8f4e2e277e3c807fa9099e3a586bf284f4eb642c
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2023-07-16 16:51:33 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-16 16:51:33 +0000
multimedia/obs-studio: Fix conflict caused by luajit
USES=luajit resolves it.
PR: 271085
---
multimedia/obs-studio/Makefile | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index 47881baddaa9..c3258943a5e1 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -37,17 +37,10 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libxcb-util.so:x11/xcb-util \
libxkbcommon.so:x11/libxkbcommon \
libuuid.so:misc/e2fsprogs-libuuid \
- libva.so:multimedia/libva \
- ${LIB_DEPENDS_${ARCH}}
-LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit
-LIB_DEPENDS_armv7= libluajit-5.1.so:lang/luajit
-LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit
-LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit
-LIB_DEPENDS_powerpc64= libluajit-5.1.so:lang/luajit-openresty
-LIB_DEPENDS_powerpc64le= libluajit-5.1.so:lang/luajit-openresty
-
-USES= cmake compiler:c++17-lang desktop-file-utils gl gnome lua pkgconfig python \
- qt:6 xorg
+ libva.so:multimedia/libva
+
+USES= cmake compiler:c++17-lang desktop-file-utils gl gnome lua luajit \
+ pkgconfig python qt:6 xorg
USE_QT= base svg tools:build
USE_GNOME= glib20
USE_GL= gl