Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Apr 2020 01:22:22 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r530460 - in head/multimedia/obs-studio: . files
Message-ID:  <202004030122.0331MMJ0041437@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Fri Apr  3 01:22:22 2020
New Revision: 530460
URL: https://svnweb.freebsd.org/changeset/ports/530460

Log:
  multimedia/obs-studio: Add the vlc plugin that wasn't enabled on FreeBSD for some reason

Added:
  head/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt   (contents, props changed)
Modified:
  head/multimedia/obs-studio/Makefile
  head/multimedia/obs-studio/pkg-plist

Modified: head/multimedia/obs-studio/Makefile
==============================================================================
--- head/multimedia/obs-studio/Makefile	Fri Apr  3 01:07:05 2020	(r530459)
+++ head/multimedia/obs-studio/Makefile	Fri Apr  3 01:22:22 2020	(r530460)
@@ -2,7 +2,7 @@
 
 PORTNAME=	obs-studio
 DISTVERSION=	25.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT=	Open source streaming/recording software
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=		Fails to compile: invalid conversion between vector type and integer type
+BROKEN_aarch64=	Fails to compile: invalid conversion between vector type and integer type
 
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat \
 		swig3.0:devel/swig30
@@ -29,6 +29,7 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libsysinfo.so:devel/libsysinfo \
 		libudev.so:devel/libudev-devd \
 		libv4l2.so:multimedia/libv4l \
+		libvlc.so:multimedia/vlc \
 		libx264.so:multimedia/libx264 \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_amd64=	libluajit-5.1.so:lang/luajit
@@ -44,8 +45,8 @@ USE_GL=		gl
 USE_XORG=	ice sm x11 xcb xcomposite xext xfixes xinerama xrandr
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DUNIX_STRUCTURE:BOOL=ON \
-		-DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}"
+CMAKE_ON=	UNIX_STRUCTURE
+CMAKE_ARGS=	-DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}"
 CFLAGS+=	-D_WITH_GETLINE
 
 .include <bsd.port.pre.mk>

Added: head/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt	Fri Apr  3 01:22:22 2020	(r530460)
@@ -0,0 +1,10 @@
+--- plugins/CMakeLists.txt.orig	2020-04-03 00:49:42 UTC
++++ plugins/CMakeLists.txt
+@@ -46,6 +46,7 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+ 	add_subdirectory(linux-pulseaudio)
+ 	add_subdirectory(linux-v4l2)
+ 	add_subdirectory(linux-jack)
++	add_subdirectory(vlc-video)
+ endif()
+ 
+ option(BUILD_BROWSER "Build browser plugin" OFF)

Modified: head/multimedia/obs-studio/pkg-plist
==============================================================================
--- head/multimedia/obs-studio/pkg-plist	Fri Apr  3 01:07:05 2020	(r530459)
+++ head/multimedia/obs-studio/pkg-plist	Fri Apr  3 01:22:22 2020	(r530460)
@@ -112,6 +112,7 @@ lib/obs-plugins/obs-transitions.so
 lib/obs-plugins/obs-x264.so
 lib/obs-plugins/rtmp-services.so
 lib/obs-plugins/text-freetype2.so
+lib/obs-plugins/vlc-video.so
 lib/obs-scripting/_obspython.so
 %%LUAJIT%%lib/obs-scripting/obslua.so
 lib/obs-scripting/obspython.py
@@ -139,8 +140,6 @@ share/obs/libobs/opaque.effect
 share/obs/libobs/premultiplied_alpha.effect
 share/obs/libobs/repeat.effect
 share/obs/libobs/solid.effect
-share/obs/obs-plugins/obs-%%LUA_LIBDIR%%fdk/locale/bg-BG.ini
-share/obs/obs-plugins/obs-%%LUA_LIBDIR%%fdk/locale/fa-IR.ini
 share/obs/obs-plugins/decklink-ouput-ui/.keepme
 share/obs/obs-plugins/frontend-tools/locale/af-ZA.ini
 share/obs/obs-plugins/frontend-tools/locale/ar-SA.ini
@@ -178,8 +177,8 @@ share/obs/obs-plugins/frontend-tools/locale/pt-BR.ini
 share/obs/obs-plugins/frontend-tools/locale/pt-PT.ini
 share/obs/obs-plugins/frontend-tools/locale/ro-RO.ini
 share/obs/obs-plugins/frontend-tools/locale/ru-RU.ini
-share/obs/obs-plugins/frontend-tools/locale/sl-SI.ini
 share/obs/obs-plugins/frontend-tools/locale/sk-SK.ini
+share/obs/obs-plugins/frontend-tools/locale/sl-SI.ini
 share/obs/obs-plugins/frontend-tools/locale/sr-CS.ini
 share/obs/obs-plugins/frontend-tools/locale/sr-SP.ini
 share/obs/obs-plugins/frontend-tools/locale/sv-SE.ini
@@ -532,6 +531,7 @@ share/obs/obs-plugins/obs-filters/mask_alpha_filter.ef
 share/obs/obs-plugins/obs-filters/mask_color_filter.effect
 share/obs/obs-plugins/obs-filters/sharpness.effect
 share/obs/obs-plugins/obs-libfdk/locale/ar-SA.ini
+share/obs/obs-plugins/obs-libfdk/locale/bg-BG.ini
 share/obs/obs-plugins/obs-libfdk/locale/bn-BD.ini
 share/obs/obs-plugins/obs-libfdk/locale/ca-ES.ini
 share/obs/obs-plugins/obs-libfdk/locale/cs-CZ.ini
@@ -542,6 +542,7 @@ share/obs/obs-plugins/obs-libfdk/locale/en-US.ini
 share/obs/obs-plugins/obs-libfdk/locale/es-ES.ini
 share/obs/obs-plugins/obs-libfdk/locale/et-EE.ini
 share/obs/obs-plugins/obs-libfdk/locale/eu-ES.ini
+share/obs/obs-plugins/obs-libfdk/locale/fa-IR.ini
 share/obs/obs-plugins/obs-libfdk/locale/fi-FI.ini
 share/obs/obs-plugins/obs-libfdk/locale/fil-PH.ini
 share/obs/obs-plugins/obs-libfdk/locale/fr-FR.ini
@@ -847,6 +848,49 @@ share/obs/obs-plugins/text-freetype2/locale/vi-VN.ini
 share/obs/obs-plugins/text-freetype2/locale/zh-CN.ini
 share/obs/obs-plugins/text-freetype2/locale/zh-TW.ini
 share/obs/obs-plugins/text-freetype2/text_default.effect
+share/obs/obs-plugins/vlc-video/locale/ar-SA.ini
+share/obs/obs-plugins/vlc-video/locale/bg-BG.ini
+share/obs/obs-plugins/vlc-video/locale/bn-BD.ini
+share/obs/obs-plugins/vlc-video/locale/ca-ES.ini
+share/obs/obs-plugins/vlc-video/locale/cs-CZ.ini
+share/obs/obs-plugins/vlc-video/locale/da-DK.ini
+share/obs/obs-plugins/vlc-video/locale/de-DE.ini
+share/obs/obs-plugins/vlc-video/locale/el-GR.ini
+share/obs/obs-plugins/vlc-video/locale/en-US.ini
+share/obs/obs-plugins/vlc-video/locale/es-ES.ini
+share/obs/obs-plugins/vlc-video/locale/et-EE.ini
+share/obs/obs-plugins/vlc-video/locale/eu-ES.ini
+share/obs/obs-plugins/vlc-video/locale/fa-IR.ini
+share/obs/obs-plugins/vlc-video/locale/fi-FI.ini
+share/obs/obs-plugins/vlc-video/locale/fil-PH.ini
+share/obs/obs-plugins/vlc-video/locale/fr-FR.ini
+share/obs/obs-plugins/vlc-video/locale/gd-GB.ini
+share/obs/obs-plugins/vlc-video/locale/gl-ES.ini
+share/obs/obs-plugins/vlc-video/locale/he-IL.ini
+share/obs/obs-plugins/vlc-video/locale/hr-HR.ini
+share/obs/obs-plugins/vlc-video/locale/hu-HU.ini
+share/obs/obs-plugins/vlc-video/locale/it-IT.ini
+share/obs/obs-plugins/vlc-video/locale/ja-JP.ini
+share/obs/obs-plugins/vlc-video/locale/ka-GE.ini
+share/obs/obs-plugins/vlc-video/locale/ko-KR.ini
+share/obs/obs-plugins/vlc-video/locale/nb-NO.ini
+share/obs/obs-plugins/vlc-video/locale/nl-NL.ini
+share/obs/obs-plugins/vlc-video/locale/pl-PL.ini
+share/obs/obs-plugins/vlc-video/locale/pt-BR.ini
+share/obs/obs-plugins/vlc-video/locale/pt-PT.ini
+share/obs/obs-plugins/vlc-video/locale/ro-RO.ini
+share/obs/obs-plugins/vlc-video/locale/ru-RU.ini
+share/obs/obs-plugins/vlc-video/locale/sk-SK.ini
+share/obs/obs-plugins/vlc-video/locale/sl-SI.ini
+share/obs/obs-plugins/vlc-video/locale/sr-CS.ini
+share/obs/obs-plugins/vlc-video/locale/sr-SP.ini
+share/obs/obs-plugins/vlc-video/locale/sv-SE.ini
+share/obs/obs-plugins/vlc-video/locale/tl-PH.ini
+share/obs/obs-plugins/vlc-video/locale/tr-TR.ini
+share/obs/obs-plugins/vlc-video/locale/uk-UA.ini
+share/obs/obs-plugins/vlc-video/locale/vi-VN.ini
+share/obs/obs-plugins/vlc-video/locale/zh-CN.ini
+share/obs/obs-plugins/vlc-video/locale/zh-TW.ini
 share/obs/obs-studio/authors/AUTHORS
 share/obs/obs-studio/images/overflow.png
 share/obs/obs-studio/license/gplv2.txt



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