From owner-svn-ports-all@freebsd.org Fri Apr 3 16:44:47 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 75EC5260A83; Fri, 3 Apr 2020 16:44:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48v5Pm4CkBz4JRq; Fri, 3 Apr 2020 16:44:44 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 930787E9E; Fri, 3 Apr 2020 16:44:37 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 033GibNe003139; Fri, 3 Apr 2020 16:44:37 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 033GiaNI003135; Fri, 3 Apr 2020 16:44:36 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202004031644.033GiaNI003135@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 3 Apr 2020 16:44:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r530504 - in branches/2020Q2/multimedia/obs-studio: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in branches/2020Q2/multimedia/obs-studio: . files X-SVN-Commit-Revision: 530504 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 16:44:47 -0000 Author: yuri Date: Fri Apr 3 16:44:36 2020 New Revision: 530504 URL: https://svnweb.freebsd.org/changeset/ports/530504 Log: MFH: r530460 r530464 r530501 multimedia/obs-studio: Add the vlc plugin that wasn't enabled on FreeBSD for some reason multimedia/obs-studio: Add missing header for depending projects to access the OBS Studio API multimedia/obs-studio: Update 25.0.1 -> 25.0.3 (25.0.3 contains bugfixes) Bug fixed: https://github.com/obsproject/obs-studio/issues/2627#issuecomment-608509154 25.0.1 crashed on microphone change. Approved by: ports-secteam (joneum) Added: branches/2020Q2/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt - copied unchanged from r530460, head/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt Modified: branches/2020Q2/multimedia/obs-studio/Makefile branches/2020Q2/multimedia/obs-studio/distinfo branches/2020Q2/multimedia/obs-studio/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/multimedia/obs-studio/Makefile ============================================================================== --- branches/2020Q2/multimedia/obs-studio/Makefile Fri Apr 3 16:06:10 2020 (r530503) +++ branches/2020Q2/multimedia/obs-studio/Makefile Fri Apr 3 16:44:36 2020 (r530504) @@ -1,17 +1,19 @@ # $FreeBSD$ PORTNAME= obs-studio -DISTVERSION= 25.0.1 -PORTREVISION= 1 +DISTVERSION= 25.0.3 CATEGORIES= multimedia +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= e1de4e8a50b5e50f69214d3a4fd39b4b9b03e050.patch:-p1 + MAINTAINER= yuri@FreeBSD.org 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 +31,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 +47,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 @@ -59,5 +62,8 @@ PLIST_SUB+= LUAJIT="" post-patch: @${REINPLACE_CMD} -e 's| 3.4)| ${PYTHON_VER})|' \ ${WRKSRC}/cmake/Modules/FindPythonDeps.cmake + +post-install: # https://github.com/obsproject/obs-studio/issues/2625 + ${INSTALL_DATA} ${WRKSRC}/UI/obs-frontend-api/obs-frontend-api.h ${STAGEDIR}${PREFIX}/include/obs .include Modified: branches/2020Q2/multimedia/obs-studio/distinfo ============================================================================== --- branches/2020Q2/multimedia/obs-studio/distinfo Fri Apr 3 16:06:10 2020 (r530503) +++ branches/2020Q2/multimedia/obs-studio/distinfo Fri Apr 3 16:44:36 2020 (r530504) @@ -1,3 +1,5 @@ -TIMESTAMP = 1584824266 -SHA256 (obsproject-obs-studio-25.0.1_GH0.tar.gz) = 2f95648424c0b4ebec585db9da4b4f8dd7af6f7d2d41b2e7593e2efeb5f360ca -SIZE (obsproject-obs-studio-25.0.1_GH0.tar.gz) = 8364968 +TIMESTAMP = 1585928600 +SHA256 (obsproject-obs-studio-25.0.3_GH0.tar.gz) = 16b163b8e00a55fcc3836482d28dda00b8917a87c5f17318e2dc00f1ee199e61 +SIZE (obsproject-obs-studio-25.0.3_GH0.tar.gz) = 8367286 +SHA256 (e1de4e8a50b5e50f69214d3a4fd39b4b9b03e050.patch) = 3efc78daa680c40130a0dfccac0d3ef522619afb46558cd52db9e67ec41e696b +SIZE (e1de4e8a50b5e50f69214d3a4fd39b4b9b03e050.patch) = 1239 Copied: branches/2020Q2/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt (from r530460, head/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt Fri Apr 3 16:44:36 2020 (r530504, copy of r530460, head/multimedia/obs-studio/files/patch-plugins_CMakeLists.txt) @@ -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: branches/2020Q2/multimedia/obs-studio/pkg-plist ============================================================================== --- branches/2020Q2/multimedia/obs-studio/pkg-plist Fri Apr 3 16:06:10 2020 (r530503) +++ branches/2020Q2/multimedia/obs-studio/pkg-plist Fri Apr 3 16:44:36 2020 (r530504) @@ -43,6 +43,7 @@ include/obs/obs-data.h include/obs/obs-defs.h include/obs/obs-encoder.h include/obs/obs-ffmpeg-compat.h +include/obs/obs-frontend-api.h include/obs/obs-hotkey.h include/obs/obs-hotkeys.h include/obs/obs-interaction.h @@ -112,6 +113,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 +141,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 +178,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 +532,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 +543,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 +849,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