diff --git a/multimedia/videoplayer/obs-studio/actions.py b/multimedia/videoplayer/obs-studio/actions.py index 7cea916ca2..813d3b0914 100644 --- a/multimedia/videoplayer/obs-studio/actions.py +++ b/multimedia/videoplayer/obs-studio/actions.py @@ -4,7 +4,7 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import cmaketools, mesontools, pisitools +from pisi.actionsapi import shelltools, cmaketools, mesontools, pisitools j = ''.join([ ' -DCMAKE_BUILD_TYPE=Release', @@ -13,18 +13,18 @@ j = ''.join([ ' -DCMAKE_C_COMPILER=gcc', ' -DCMAKE_CXX_COMPILER=g++', ' -DUNIX_STRUCTURE=ON', - ' -DENABLE_JACK=ON', - ' -DBUILD_VST=OFF', - ' -DBUILD_BROWSER=OFF', ' -DOpenGL_GL_PREFERENCE=GLVND', - ' -DENABLE_VLC=OFF', + ' -DBUILD_VST=ON', + ' -DENABLE_{AJA,VLC,BROWSER}=OFF', + ' -DENABLE_JACK=ON', ' -DENABLE_LIBFDK=ON', - ' -DENABLE_AJA=OFF', - ' -DENABLE_NEW_MPEGTS_OUTPUT=OFF', + ' -DENABLE_NEW_MPEGTS_OUTPUT=ON', ' -B_build -G Ninja -L ' ]) def setup(): + for b in ["browser", "websocket"]: + shelltools.touch("plugins/obs-%s/CMakeLists.txt" % b) cmaketools.configure(j) def build(): @@ -33,4 +33,4 @@ def build(): def install(): mesontools.install("-C _build") - pisitools.dodoc("CONTRIBUTING*", "COPYING*", "README*") + pisitools.dodoc("AUTHORS", "COPYING") diff --git a/multimedia/videoplayer/obs-studio/files/alpine/disable_some_plugins.patch b/multimedia/videoplayer/obs-studio/files/alpine/disable_some_plugins.patch deleted file mode 100644 index 013cfbbee5..0000000000 --- a/multimedia/videoplayer/obs-studio/files/alpine/disable_some_plugins.patch +++ /dev/null @@ -1,35 +0,0 @@ -websocket plugin needs a bunch of checkouts more - -obs browser requires building cef (chromium) as a submodule - -aja exists but isn't friendly to package (no soversion), and is just a plugin -for some fancy enterprise hardware - -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index d20bce1..92f7734 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -61,7 +61,7 @@ elseif(OS_LINUX) - add_subdirectory(sndio) - add_subdirectory(obs-vst) - -- check_obs_browser() -+ #check_obs_browser() - elseif(OS_FREEBSD) - add_subdirectory(linux-capture) - add_subdirectory(linux-pulseaudio) -@@ -85,7 +85,7 @@ endif() - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/obs-websocket/CMakeLists.txt) - add_subdirectory(obs-websocket) - else() -- obs_status(FATAL_ERROR "obs-websocket submodule not available.") -+ #obs_status(FATAL_ERROR "obs-websocket submodule not available.") - endif() - - add_subdirectory(image-source) -@@ -97,4 +97,4 @@ add_subdirectory(obs-filters) - add_subdirectory(obs-transitions) - add_subdirectory(rtmp-services) - add_subdirectory(text-freetype2) --add_subdirectory(aja) -+#add_subdirectory(aja) diff --git a/multimedia/videoplayer/obs-studio/files/obs-logo.png b/multimedia/videoplayer/obs-studio/files/obs-logo.png deleted file mode 100644 index b751062d3e..0000000000 Binary files a/multimedia/videoplayer/obs-studio/files/obs-logo.png and /dev/null differ diff --git a/multimedia/videoplayer/obs-studio/files/obs-studio.desktop b/multimedia/videoplayer/obs-studio/files/obs-studio.desktop deleted file mode 100644 index c8be0d801b..0000000000 --- a/multimedia/videoplayer/obs-studio/files/obs-studio.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=obs-studio -GenericName=obs-studio -GenericName[tr]=obs-studio -Comment=OBS-Studio is a rewrite of what was formerly known as Open Broadcaster Software -Comment[tr]=OBS-Studio is a rewrite of what was formerly known as Open Broadcaster Software -Icon=/usr/share/pixmaps/obs-logo.png -Exec=/usr/bin/obs -Terminal=false -StartupNotify=false -Categories=Multimedia;Video diff --git a/multimedia/videoplayer/obs-studio/pspec.xml b/multimedia/videoplayer/obs-studio/pspec.xml index 5479db7857..fd8f8459c9 100644 --- a/multimedia/videoplayer/obs-studio/pspec.xml +++ b/multimedia/videoplayer/obs-studio/pspec.xml @@ -5,23 +5,25 @@ obs-studio https://obsproject.com/ - Stefan Gronewold (groni) - groni@pisilinux.org + Mustafa Cinasal + muscnsl@gmail.com GPL-2 app:gui Open Broadcaster Software. Free and open source software for video recording and live streaming. - https://github.com/obsproject/obs-studio/archive/refs/tags/29.1.3.tar.gz + https://github.com/obsproject/obs-studio/archive/31.0.1/obs-studio-31.0.1.tar.gz swig cmake ninja + uthash vlc-libs srt-devel vlc-devel lua-devel pkgconfig + ffnvcodec curl-devel dbus-devel x264-devel @@ -36,6 +38,7 @@ libv4l-devel libxcb-devel libmfx-devel + onevpl-devel librist-devel qt6-svg-devel jansson-devel @@ -43,6 +46,7 @@ mbedtls-devel python3-devel wayland-devel + nlohmann-json wayland-client wayland-cursor wayland-server @@ -56,15 +60,13 @@ libXfixes-devel libfdk-aac-devel fontconfig-devel - libXcomposite-devel - + libdatachannel-devel pulseaudio-libs-devel jack-audio-connection-kit-devel - alpine/disable_some_plugins.patch @@ -85,6 +87,8 @@ libgcc libv4l libxcb + libmfx + onevpl librist qt6-svg jansson @@ -105,7 +109,7 @@ libfdk-aac libxkbcommon libXcomposite - + libdatachannel wayland-client pulseaudio-libs jack-audio-connection-kit @@ -114,21 +118,15 @@ /usr/bin /usr/lib /usr/share - /usr/share/locale - /usr/share/doc - - obs-studio.desktop - obs-logo.png - obs-studio-devel Development files for obs-studio - obs-studio libX11-devel + obs-studio /usr/include @@ -138,6 +136,13 @@ + + 2025-02-06 + 31.0.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-11-03 29.3.1