diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index 16fc723cbfa5..63735a36527c 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -1,126 +1,130 @@ PORTNAME= obs-studio DISTVERSION= 28.1.2 +PORTREVISION= 1 CATEGORIES= multimedia +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= e221bf8eedfc.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7989 + MAINTAINER= yuri@FreeBSD.org COMMENT= Open source streaming/recording software WWW= https://obsproject.com/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= https://github.com/obsproject/obs-browser/issues/241 BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat \ swig:devel/swig LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libdbus-1.so:devel/dbus \ libfdk-aac.so:audio/fdk-aac \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libjansson.so:devel/jansson \ libmbedtls.so:security/mbedtls \ libpci.so:devel/libpci \ librist.so:multimedia/librist \ librnnoise.so:audio/rnnoise \ libspeexdsp.so:audio/speexdsp \ libsrt.so:www/srt \ libsysinfo.so:devel/libsysinfo \ libudev.so:devel/libudev-devd \ libv4l2.so:multimedia/libv4l \ libwayland-client.so:graphics/wayland \ libx264.so:multimedia/libx264 \ libxcb-ewmh.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-util.so:x11/xcb-util \ libxkbcommon.so:x11/libxkbcommon \ ${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:3.4+ \ qt:6 xorg USE_QT= base svg tools:build USE_GNOME= glib20 USE_GL= gl USE_XORG= ice sm x11 xcb xcomposite xext xfixes xinerama xrandr USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= obsproject GH_TUPLE= obsproject:obs-amd-encoder:d5a136c6834c39293ad749cf8f07bdaa772fe44b:obsproject_obs_amd_encoder/plugins/enc-amf \ obsproject:obs-browser:e2310b02df3e6c184fe6eb6608244a82e37f582e:obsproject_obs_browser/plugins/obs-browser \ obsproject:obs-websocket:5716577019b1ccda01a12db2cba35a023082b7ad:obsproject_obs_websocket/plugins/obs-websocket \ chriskohlhoff:asio:b73dc1d:chriskohlhoff_asio/plugins/obs-websocket/deps/asio \ nayuki:QR-Code-generator:8518684:nayuki_QR_Code_generator/plugins/obs-websocket/deps/qr \ nlohmann:json:a34e011:nlohmann_json/plugins/obs-websocket/deps/json \ zaphoyd:websocketpp:56123c8:zaphoyd_websocketpp/plugins/obs-websocket/deps/websocketpp \ obsproject:libdshowcapture:a93f1a34c14e91b5c540f264fb965f32caf77336:obsproject_libdshowcapture/plugins/win-dshow/libdshowcapture \ elgatosf:capture-device-support:bedcf28ed7a74eb7bf96a383fd18d2f5a1849b10:elgatosf_capture_device_support/plugins/win-dshow/libdshowcapture/external/capture-device-support \ palana:Syphon-Framework:01b144811f6f7080b70b2d7cc729da071f86f9d7:palana_Syphon_Framework/plugins/mac-syphon/syphon-framework \ Mixer:ftl-sdk:d0c8469f66806b5ea738d607f7d2b000af8b1129:Mixer_ftl_sdk/plugins/obs-outputs/ftl-sdk \ curl:curl:44b9b4d4f56d6f6de92c89636994c03984e9cd01:curl_curl/plugins/obs-outputs/ftl-sdk/libcurl \ akheron:jansson:bc5741fb1ac730ead24e9bd08977fc6c248e04b0:akheron_jansson/plugins/obs-outputs/ftl-sdk/libjansson CMAKE_ON= UNIX_STRUCTURE CMAKE_OFF= ENABLE_PIPEWIRE # beginning with 27.0.1 (PR#4287) the linux-capture plugin optionally requires the piperware library and in this case expects the linux/dma-buf.h header CMAKE_ARGS= -DOBS_VERSION_OVERRIDE:STRING="${PORTVERSION}" \ -DQT_VERSION=6 LDFLAGS+= -fPIC # pending https://github.com/obsproject/obs-studio/issues/3436 OPTIONS_DEFINE= BROWSER VLC VST OPTIONS_DEFAULT= VLC VST OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= JACK PULSEAUDIO SNDIO OPTIONS_DEFAULT+= ${OPTIONS_MULTI_AUDIO} OPTIONS_SUB= yes AUDIO_DESC= Audio backends BROWSER_DESC= Build OSB browser BROWSER_CMAKE_BOOL= BUILD_BROWSER BROWSER_BROKEN= Needs CEF (Chromium Embedded Framework) which isn't yet ported JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_ON= -DENABLE_JACK=TRUE JACK_CMAKE_OFF= -DDISABLE_JACK=TRUE PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DENABLE_PULSEAUDIO=TRUE PULSEAUDIO_CMAKE_OFF= -DDISABLE_PULSEAUDIO=TRUE PULSEAUDIO_BROKEN_OFF= https://github.com/obsproject/obs-studio/issues/4025 SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_ON= -DENABLE_SNDIO=TRUE SNDIO_CMAKE_OFF= -DDISABLE_SNDIO=TRUE VLC_DESC= Enable VLC plugin VLC_CMAKE_BOOL= ENABLE_VLC VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc VST_DESC= Build VST submodule VST_CMAKE_BOOL= BUILD_VST .include .if ${ARCH} != amd64 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le PLIST_SUB+= LUAJIT="@comment " .else PLIST_SUB+= LUAJIT="" .endif 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 # https://github.com/obsproject/obs-studio/issues/2647 (only for multimedia/obs-audio-spectralizer, should be removed later) ${INSTALL_DATA} ${WRKSRC}/cmake/Modules/ObsHelpers.cmake ${STAGEDIR}${PREFIX}/lib/cmake ${INSTALL_DATA} ${WRKSRC}/cmake/external/ObsPluginHelpers.cmake ${STAGEDIR}${PREFIX}/lib/cmake .include diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo index 95485d2ce766..8e74aa504c14 100644 --- a/multimedia/obs-studio/distinfo +++ b/multimedia/obs-studio/distinfo @@ -1,29 +1,31 @@ TIMESTAMP = 1672348002 SHA256 (obsproject-obs-studio-28.1.2_GH0.tar.gz) = c51c72945867cd9862ba663b01cc8313153a0249dd3df0626e63fc5d82a84b39 SIZE (obsproject-obs-studio-28.1.2_GH0.tar.gz) = 18859931 SHA256 (obsproject-obs-amd-encoder-d5a136c6834c39293ad749cf8f07bdaa772fe44b_GH0.tar.gz) = 6cfae1f4d378124d9621bde29d9ff5d49134dabcd1f17aad048f77e103ddee14 SIZE (obsproject-obs-amd-encoder-d5a136c6834c39293ad749cf8f07bdaa772fe44b_GH0.tar.gz) = 347479 SHA256 (obsproject-obs-browser-e2310b02df3e6c184fe6eb6608244a82e37f582e_GH0.tar.gz) = 6cfaa245da01f7d25f46c9823c6ff6cebe38599f699b98b46498f627ba904591 SIZE (obsproject-obs-browser-e2310b02df3e6c184fe6eb6608244a82e37f582e_GH0.tar.gz) = 109012 SHA256 (obsproject-obs-websocket-5716577019b1ccda01a12db2cba35a023082b7ad_GH0.tar.gz) = 29389e89ec5675478f8970c48cf575d1ec338389672c373f65fe57a41ea1687b SIZE (obsproject-obs-websocket-5716577019b1ccda01a12db2cba35a023082b7ad_GH0.tar.gz) = 235118 SHA256 (chriskohlhoff-asio-b73dc1d_GH0.tar.gz) = fca0dcfeb298bd4c9a3dcd304a46f5f82dea49771f5f844f0e96eecec47d092c SIZE (chriskohlhoff-asio-b73dc1d_GH0.tar.gz) = 1210884 SHA256 (nayuki-QR-Code-generator-8518684_GH0.tar.gz) = 0fa3e16822e66343d10ba0ba2787378e44d88686d9836476d2df041a59b729e9 SIZE (nayuki-QR-Code-generator-8518684_GH0.tar.gz) = 135743 SHA256 (nlohmann-json-a34e011_GH0.tar.gz) = 8580814d7748cb417eb4e89bab32ae2473ecf055d33cdf18044f09f84eab2db8 SIZE (nlohmann-json-a34e011_GH0.tar.gz) = 6860457 SHA256 (zaphoyd-websocketpp-56123c8_GH0.tar.gz) = 002ee5ec06f8408edd34034cbd9f776d0dee8f7312eceb1244e1f18c19f8e390 SIZE (zaphoyd-websocketpp-56123c8_GH0.tar.gz) = 701406 SHA256 (obsproject-libdshowcapture-a93f1a34c14e91b5c540f264fb965f32caf77336_GH0.tar.gz) = e3c159d7e292fa1a7ab1e44190e906a5b64a7f25161ef26f696cd8fe3dcd3be1 SIZE (obsproject-libdshowcapture-a93f1a34c14e91b5c540f264fb965f32caf77336_GH0.tar.gz) = 56285 SHA256 (elgatosf-capture-device-support-bedcf28ed7a74eb7bf96a383fd18d2f5a1849b10_GH0.tar.gz) = 87b5bbfb3e7598df5173bbeb3a3434974668f71100b35fe48ffe30573f3716a1 SIZE (elgatosf-capture-device-support-bedcf28ed7a74eb7bf96a383fd18d2f5a1849b10_GH0.tar.gz) = 20629 SHA256 (palana-Syphon-Framework-01b144811f6f7080b70b2d7cc729da071f86f9d7_GH0.tar.gz) = faa56c99cbcc6aeaa6eb2b3319fee89bb144afa07bd0e018562f8f10b3aeffdf SIZE (palana-Syphon-Framework-01b144811f6f7080b70b2d7cc729da071f86f9d7_GH0.tar.gz) = 302295 SHA256 (Mixer-ftl-sdk-d0c8469f66806b5ea738d607f7d2b000af8b1129_GH0.tar.gz) = 1fc9f9912c46230ed1ccfed78e2e91f161982508c94f1d91565b7eb985ae2d3c SIZE (Mixer-ftl-sdk-d0c8469f66806b5ea738d607f7d2b000af8b1129_GH0.tar.gz) = 95492 SHA256 (curl-curl-44b9b4d4f56d6f6de92c89636994c03984e9cd01_GH0.tar.gz) = e3b9aa0abb173d74a6df4a4f9485eed2bac89bfab147f78a592a4197eff06625 SIZE (curl-curl-44b9b4d4f56d6f6de92c89636994c03984e9cd01_GH0.tar.gz) = 2705576 SHA256 (akheron-jansson-bc5741fb1ac730ead24e9bd08977fc6c248e04b0_GH0.tar.gz) = a285ed51c597b23d1f25de3bc5c9c128d55c6aa17af68e0680efa028f8b0437c SIZE (akheron-jansson-bc5741fb1ac730ead24e9bd08977fc6c248e04b0_GH0.tar.gz) = 127897 +SHA256 (e221bf8eedfc.patch) = a8c1d4614f2d019e967eb04d9214548491989c78f6df42dbbab610d3123f4eb1 +SIZE (e221bf8eedfc.patch) = 5766 diff --git a/multimedia/wlrobs/Makefile b/multimedia/wlrobs/Makefile index 153bc8b53533..c46286b22b79 100644 --- a/multimedia/wlrobs/Makefile +++ b/multimedia/wlrobs/Makefile @@ -1,24 +1,22 @@ PORTNAME= wlrobs DISTVERSIONPREFIX= v -PORTVERSION= 1.0 -PORTREVISION= 3 +PORTVERSION= 1.1 CATEGORIES= multimedia wayland MASTER_SITES= https://hg.sr.ht/~scoopta/${PORTNAME}/archive/${DISTVERSIONFULL:C/.*-//}${EXTRACT_SUFX}?dummy=/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland screen capture plugin for obs-studio WWW= https://hg.sr.ht/~scoopta/wlrobs LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.md BUILD_DEPENDS= cmake:devel/cmake-core LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libobs.so:multimedia/obs-studio -USES= compiler:c11 gl meson pkgconfig -USE_GL= egl +USES= compiler:c11 meson pkgconfig DATADIR= ${PREFIX}/lib/obs-plugins PORTDATA= lib${PORTNAME}.so .include diff --git a/multimedia/wlrobs/distinfo b/multimedia/wlrobs/distinfo index 8376d9f702d7..46d8b213cfc4 100644 --- a/multimedia/wlrobs/distinfo +++ b/multimedia/wlrobs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1598923465 -SHA256 (wlrobs-v1.0.tar.gz) = 19a9894fc7a9854b7f17d675b48d16d5876b750aa91ebc001dcc32f68ee9cc56 -SIZE (wlrobs-v1.0.tar.gz) = 54980 +TIMESTAMP = 1667083149 +SHA256 (wlrobs-v1.1.tar.gz) = 5311c434316577b27803b272cb57011515f853705ef5d7e604ed73c483fa14be +SIZE (wlrobs-v1.1.tar.gz) = 26920 diff --git a/multimedia/wlrobs/files/patch-meson.build b/multimedia/wlrobs/files/patch-meson.build index c0bd3ae401b0..4559bd77b99b 100644 --- a/multimedia/wlrobs/files/patch-meson.build +++ b/multimedia/wlrobs/files/patch-meson.build @@ -1,13 +1,13 @@ https://github.com/obsproject/obs-studio/issues/7990 ---- meson.build.orig 2020-09-01 01:24:25 UTC +--- meson.build.orig 2022-10-29 22:39:09 UTC +++ meson.build -@@ -2,7 +2,7 @@ wayland = dependency('wayland-client') +@@ -4,7 +4,7 @@ wayland = dependency('wayland-client') inc = include_directories('inc') wayland = dependency('wayland-client') -obs = dependency('libobs') +obs = dependency('libobs', method: 'cmake', modules: ['OBS::libobs']) + dl = cc.find_library('dl') sources = ['src/main.c', 'proto/xdg-output-unstable-v1-protocol.c'] -