t* My OpenBSD ports
URI git clone git://git.codevoid.de/mystuff.git
DIR Log
DIR Files
DIR Refs
---
DIR commit c5adfcd91c5b925c5f22490830fcead4aee6e697
DIR parent 6999d724efb2aea3df340fe30e90f2e89195bfcf
URI Author: c0dev0id <sh+github[at]codevoid[dot]de>
Date: Mon, 7 Dec 2020 09:58:37 +0100
obs-studio: v42l patches
Diffstat:
M multimedia/obs-studio/Makefile | 4 ++--
A multimedia/obs-studio/patches/patc… | 14 ++++++++++++++
A multimedia/obs-studio/patches/patc… | 15 +++++++++++++++
A multimedia/obs-studio/patches/patc… | 17 +++++++++++++++++
A multimedia/obs-studio/patches/patc… | 17 +++++++++++++++++
A multimedia/obs-studio/patches/patc… | 17 +++++++++++++++++
A multimedia/obs-studio/patches/patc… | 16 ++++++++++++++++
A multimedia/obs-studio/patches/patc… | 14 ++++++++++++++
M multimedia/obs-studio/pkg/PLIST | 140 +++++++++----------------------
9 files changed, 153 insertions(+), 101 deletions(-)
---
DIR diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
t@@ -4,7 +4,7 @@ COMMENT = open broadcasting software
GH_PROJECT = obs-studio
GH_ACCOUNT = obsproject
-GH_TAGNAME = 26.0.0
+GH_TAGNAME = 26.1.0-rc1
CATEGORIES = multimedia
HOMEPAGE = https://obsproject.com
t@@ -23,7 +23,7 @@ MODULES = devel/cmake \
WANTLIB += Xcomposite Xfixes xcb-randr xcb-shm xcb-xfixes xcb-xinerama
WANTLIB += ${COMPILER_LIBCXX} GL ICE Qt5Core Qt5Gui Qt5Widgets
-WANTLIB += Qt5Xml SM X11 X11-xcb Xext c dbus-1 fontconfig freetype
+WANTLIB += Qt5Xml sndio SM X11 X11-xcb Xext c dbus-1 fontconfig freetype
WANTLIB += m xcb xcb-xinput z ${MODPY_WANTLIB}
RUN_DEPENDS = devel/desktop-file-utils \
DIR diff --git a/multimedia/obs-studio/patches/patch-UI_obs-app_cpp b/multimedia/obs-studio/patches/patch-UI_obs-app_cpp
t@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: UI/obs-app.cpp
+--- UI/obs-app.cpp.orig
++++ UI/obs-app.cpp
+@@ -1435,6 +1435,8 @@ string OBSApp::GetVersionString() const
+ ver << "mac)";
+ #elif __FreeBSD__
+ ver << "freebsd)";
++#elif __OpenBSD__
++ ver << "openbsd)";
+ #else /* assume linux for the time being */
+ ver << "linux)";
+ #endif
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_CMakeLists_txt b/multimedia/obs-studio/patches/patch-plugins_CMakeLists_txt
t@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: plugins/CMakeLists.txt
+--- plugins/CMakeLists.txt.orig
++++ plugins/CMakeLists.txt
+@@ -54,7 +54,9 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+ add_subdirectory(sndio)
+ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
+ add_subdirectory(linux-capture)
++ add_subdirectory(linux-v4l2)
+ add_subdirectory(sndio)
++ add_subdirectory(vlc-video)
+ endif()
+
+ option(BUILD_BROWSER "Build browser plugin" OFF)
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-controls_c b/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-controls_c
t@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: plugins/linux-v4l2/v4l2-controls.c
+--- plugins/linux-v4l2/v4l2-controls.c.orig
++++ plugins/linux-v4l2/v4l2-controls.c
+@@ -17,7 +17,11 @@ along with this program. If not, see <http://www.gnu.
+
+ #include <fcntl.h>
+
++#if defined(__OpenBSD__)
++#include <sys/videoio.h>
++#else
+ #include <linux/videodev2.h>
++#endif
+ #include <libv4l2.h>
+
+ #include "v4l2-controls.h"
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-helpers_h b/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-helpers_h
t@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: plugins/linux-v4l2/v4l2-helpers.h
+--- plugins/linux-v4l2/v4l2-helpers.h.orig
++++ plugins/linux-v4l2/v4l2-helpers.h
+@@ -17,7 +17,11 @@ along with this program. If not, see <http://www.gnu.
+
+ #pragma once
+
++#if defined(__OpenBSD__)
++#include <sys/videoio.h>
++#else
+ #include <linux/videodev2.h>
++#endif
+ #include <libv4l2.h>
+
+ #include <obs-module.h>
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-input_c b/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-input_c
t@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: plugins/linux-v4l2/v4l2-input.c
+--- plugins/linux-v4l2/v4l2-input.c.orig
++++ plugins/linux-v4l2/v4l2-input.c
+@@ -26,7 +26,11 @@ along with this program. If not, see <http://www.gnu.
+ #include <sys/ioctl.h>
+ #include <sys/select.h>
+
++#if defined(__OpenBSD__)
++#include <sys/videoio.h>
++#else
+ #include <linux/videodev2.h>
++#endif
+ #include <libv4l2.h>
+
+ #include <util/threading.h>
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-output_c b/multimedia/obs-studio/patches/patch-plugins_linux-v4l2_v4l2-output_c
t@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: plugins/linux-v4l2/v4l2-output.c
+--- plugins/linux-v4l2/v4l2-output.c.orig
++++ plugins/linux-v4l2/v4l2-output.c
+@@ -1,6 +1,10 @@
+ #include <obs-module.h>
+ #include <util/platform.h>
++#if defined(__OpenBSD__)
++#include <sys/videoio.h>
++#else
+ #include <linux/videodev2.h>
++#endif
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <unistd.h>
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_obs-outputs_librtmp_rtmp_c b/multimedia/obs-studio/patches/patch-plugins_obs-outputs_librtmp_rtmp_c
t@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: plugins/obs-outputs/librtmp/rtmp.c
+--- plugins/obs-outputs/librtmp/rtmp.c.orig
++++ plugins/obs-outputs/librtmp/rtmp.c
+@@ -818,7 +818,7 @@ add_addr_info(struct sockaddr_storage *service, sockle
+ // since we're handling multiple addresses internally, fake the correct error response
+ #ifdef _WIN32
+ *socket_error = WSANO_DATA;
+-#elif __FreeBSD__
++#elif __FreeBSD__ || __OpenBSD__
+ *socket_error = ENOATTR;
+ #elif defined(ENODATA)
+ *socket_error = ENODATA;
DIR diff --git a/multimedia/obs-studio/pkg/PLIST b/multimedia/obs-studio/pkg/PLIST
t@@ -69,6 +69,7 @@ include/obs/obsconfig.h
include/obs/util/
include/obs/util/array-serializer.h
include/obs/util/base.h
+include/obs/util/bitstream.h
include/obs/util/bmem.h
include/obs/util/c99defs.h
include/obs/util/cf-lexer.h
t@@ -106,12 +107,11 @@ lib/cmake/LibObs/LibObsTarget.cmake
lib/libobs.so.0
lib/libobsglad.so.0
lib/obs-plugins/
+@so lib/obs-plugins/decklink-captions.so
@so lib/obs-plugins/decklink-ouput-ui.so
@so lib/obs-plugins/frontend-tools.so
@so lib/obs-plugins/image-source.so
@so lib/obs-plugins/linux-capture.so
-@so lib/obs-plugins/linux-jack.so
-@so lib/obs-plugins/linux-pulseaudio.so
@so lib/obs-plugins/linux-v4l2.so
@so lib/obs-plugins/obs-ffmpeg.so
@so lib/obs-plugins/obs-filters.so
t@@ -120,6 +120,7 @@ lib/obs-plugins/
@so lib/obs-plugins/obs-transitions.so
@so lib/obs-plugins/obs-x264.so
@so lib/obs-plugins/rtmp-services.so
+@so lib/obs-plugins/sndio.so
@so lib/obs-plugins/text-freetype2.so
@so lib/obs-plugins/vlc-video.so
lib/obs-scripting/
t@@ -152,6 +153,8 @@ share/obs/libobs/premultiplied_alpha.effect
share/obs/libobs/repeat.effect
share/obs/libobs/solid.effect
share/obs/obs-plugins/
+share/obs/obs-plugins/decklink-captions/
+share/obs/obs-plugins/decklink-captions/.keepme
share/obs/obs-plugins/decklink-ouput-ui/
share/obs/obs-plugins/decklink-ouput-ui/.keepme
share/obs/obs-plugins/frontend-tools/
t@@ -169,6 +172,7 @@ share/obs/obs-plugins/frontend-tools/locale/de-DE.ini
share/obs/obs-plugins/frontend-tools/locale/el-GR.ini
share/obs/obs-plugins/frontend-tools/locale/en-GB.ini
share/obs/obs-plugins/frontend-tools/locale/en-US.ini
+share/obs/obs-plugins/frontend-tools/locale/eo-UY.ini
share/obs/obs-plugins/frontend-tools/locale/es-ES.ini
share/obs/obs-plugins/frontend-tools/locale/et-EE.ini
share/obs/obs-plugins/frontend-tools/locale/eu-ES.ini
t@@ -223,6 +227,7 @@ share/obs/obs-plugins/frontend-tools/scripts/url-text.py
share/obs/obs-plugins/image-source/
share/obs/obs-plugins/image-source/locale/
share/obs/obs-plugins/image-source/locale/ar-SA.ini
+share/obs/obs-plugins/image-source/locale/az-AZ.ini
share/obs/obs-plugins/image-source/locale/ba-RU.ini
share/obs/obs-plugins/image-source/locale/bg-BG.ini
share/obs/obs-plugins/image-source/locale/bn-BD.ini
t@@ -325,106 +330,10 @@ share/obs/obs-plugins/linux-capture/locale/uk-UA.ini
share/obs/obs-plugins/linux-capture/locale/vi-VN.ini
share/obs/obs-plugins/linux-capture/locale/zh-CN.ini
share/obs/obs-plugins/linux-capture/locale/zh-TW.ini
-share/obs/obs-plugins/linux-jack/
-share/obs/obs-plugins/linux-jack/locale/
-share/obs/obs-plugins/linux-jack/locale/ar-SA.ini
-share/obs/obs-plugins/linux-jack/locale/ba-RU.ini
-share/obs/obs-plugins/linux-jack/locale/bg-BG.ini
-share/obs/obs-plugins/linux-jack/locale/bn-BD.ini
-share/obs/obs-plugins/linux-jack/locale/ca-ES.ini
-share/obs/obs-plugins/linux-jack/locale/cs-CZ.ini
-share/obs/obs-plugins/linux-jack/locale/da-DK.ini
-share/obs/obs-plugins/linux-jack/locale/de-DE.ini
-share/obs/obs-plugins/linux-jack/locale/el-GR.ini
-share/obs/obs-plugins/linux-jack/locale/en-GB.ini
-share/obs/obs-plugins/linux-jack/locale/en-US.ini
-share/obs/obs-plugins/linux-jack/locale/es-ES.ini
-share/obs/obs-plugins/linux-jack/locale/et-EE.ini
-share/obs/obs-plugins/linux-jack/locale/eu-ES.ini
-share/obs/obs-plugins/linux-jack/locale/fa-IR.ini
-share/obs/obs-plugins/linux-jack/locale/fi-FI.ini
-share/obs/obs-plugins/linux-jack/locale/fil-PH.ini
-share/obs/obs-plugins/linux-jack/locale/fr-FR.ini
-share/obs/obs-plugins/linux-jack/locale/gl-ES.ini
-share/obs/obs-plugins/linux-jack/locale/he-IL.ini
-share/obs/obs-plugins/linux-jack/locale/hr-HR.ini
-share/obs/obs-plugins/linux-jack/locale/hu-HU.ini
-share/obs/obs-plugins/linux-jack/locale/id-ID.ini
-share/obs/obs-plugins/linux-jack/locale/it-IT.ini
-share/obs/obs-plugins/linux-jack/locale/ja-JP.ini
-share/obs/obs-plugins/linux-jack/locale/ka-GE.ini
-share/obs/obs-plugins/linux-jack/locale/ko-KR.ini
-share/obs/obs-plugins/linux-jack/locale/nb-NO.ini
-share/obs/obs-plugins/linux-jack/locale/nl-NL.ini
-share/obs/obs-plugins/linux-jack/locale/pl-PL.ini
-share/obs/obs-plugins/linux-jack/locale/pt-BR.ini
-share/obs/obs-plugins/linux-jack/locale/pt-PT.ini
-share/obs/obs-plugins/linux-jack/locale/ro-RO.ini
-share/obs/obs-plugins/linux-jack/locale/ru-RU.ini
-share/obs/obs-plugins/linux-jack/locale/sk-SK.ini
-share/obs/obs-plugins/linux-jack/locale/sl-SI.ini
-share/obs/obs-plugins/linux-jack/locale/sr-CS.ini
-share/obs/obs-plugins/linux-jack/locale/sr-SP.ini
-share/obs/obs-plugins/linux-jack/locale/sv-SE.ini
-share/obs/obs-plugins/linux-jack/locale/tr-TR.ini
-share/obs/obs-plugins/linux-jack/locale/uk-UA.ini
-share/obs/obs-plugins/linux-jack/locale/ur-PK.ini
-share/obs/obs-plugins/linux-jack/locale/vi-VN.ini
-share/obs/obs-plugins/linux-jack/locale/zh-CN.ini
-share/obs/obs-plugins/linux-jack/locale/zh-TW.ini
-share/obs/obs-plugins/linux-pulseaudio/
-share/obs/obs-plugins/linux-pulseaudio/locale/
-share/obs/obs-plugins/linux-pulseaudio/locale/ar-SA.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ba-RU.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/bg-BG.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/bn-BD.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ca-ES.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/cs-CZ.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/da-DK.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/de-DE.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/el-GR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/en-GB.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/en-US.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/es-ES.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/et-EE.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/eu-ES.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/fa-IR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/fi-FI.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/fil-PH.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/fr-FR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/gd-GB.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/gl-ES.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/he-IL.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/hi-IN.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/hr-HR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/hu-HU.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/id-ID.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/it-IT.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ja-JP.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ka-GE.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ko-KR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/nb-NO.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/nl-NL.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/pl-PL.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/pt-BR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/pt-PT.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ro-RO.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ru-RU.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/sk-SK.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/sl-SI.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/sr-CS.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/sr-SP.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/sv-SE.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/ta-IN.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/th-TH.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/tr-TR.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/uk-UA.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/vi-VN.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/zh-CN.ini
-share/obs/obs-plugins/linux-pulseaudio/locale/zh-TW.ini
share/obs/obs-plugins/linux-v4l2/
share/obs/obs-plugins/linux-v4l2/locale/
share/obs/obs-plugins/linux-v4l2/locale/ar-SA.ini
+share/obs/obs-plugins/linux-v4l2/locale/az-AZ.ini
share/obs/obs-plugins/linux-v4l2/locale/ba-RU.ini
share/obs/obs-plugins/linux-v4l2/locale/bg-BG.ini
share/obs/obs-plugins/linux-v4l2/locale/bn-BD.ini
t@@ -899,6 +808,38 @@ share/obs/obs-plugins/rtmp-services/locale/zh-CN.ini
share/obs/obs-plugins/rtmp-services/locale/zh-TW.ini
share/obs/obs-plugins/rtmp-services/package.json
share/obs/obs-plugins/rtmp-services/services.json
+share/obs/obs-plugins/sndio/
+share/obs/obs-plugins/sndio/locale/
+share/obs/obs-plugins/sndio/locale/ar-SA.ini
+share/obs/obs-plugins/sndio/locale/ca-ES.ini
+share/obs/obs-plugins/sndio/locale/cs-CZ.ini
+share/obs/obs-plugins/sndio/locale/da-DK.ini
+share/obs/obs-plugins/sndio/locale/de-DE.ini
+share/obs/obs-plugins/sndio/locale/el-GR.ini
+share/obs/obs-plugins/sndio/locale/en-GB.ini
+share/obs/obs-plugins/sndio/locale/en-US.ini
+share/obs/obs-plugins/sndio/locale/es-ES.ini
+share/obs/obs-plugins/sndio/locale/et-EE.ini
+share/obs/obs-plugins/sndio/locale/fi-FI.ini
+share/obs/obs-plugins/sndio/locale/fr-FR.ini
+share/obs/obs-plugins/sndio/locale/gl-ES.ini
+share/obs/obs-plugins/sndio/locale/hu-HU.ini
+share/obs/obs-plugins/sndio/locale/id-ID.ini
+share/obs/obs-plugins/sndio/locale/it-IT.ini
+share/obs/obs-plugins/sndio/locale/ja-JP.ini
+share/obs/obs-plugins/sndio/locale/ka-GE.ini
+share/obs/obs-plugins/sndio/locale/ko-KR.ini
+share/obs/obs-plugins/sndio/locale/pl-PL.ini
+share/obs/obs-plugins/sndio/locale/pt-BR.ini
+share/obs/obs-plugins/sndio/locale/pt-PT.ini
+share/obs/obs-plugins/sndio/locale/ru-RU.ini
+share/obs/obs-plugins/sndio/locale/sk-SK.ini
+share/obs/obs-plugins/sndio/locale/sl-SI.ini
+share/obs/obs-plugins/sndio/locale/sv-SE.ini
+share/obs/obs-plugins/sndio/locale/tr-TR.ini
+share/obs/obs-plugins/sndio/locale/uk-UA.ini
+share/obs/obs-plugins/sndio/locale/zh-CN.ini
+share/obs/obs-plugins/sndio/locale/zh-TW.ini
share/obs/obs-plugins/text-freetype2/
share/obs/obs-plugins/text-freetype2/locale/
share/obs/obs-plugins/text-freetype2/locale/ar-SA.ini
t@@ -1024,6 +965,7 @@ share/obs/obs-studio/locale/de-DE.ini
share/obs/obs-studio/locale/el-GR.ini
share/obs/obs-studio/locale/en-GB.ini
share/obs/obs-studio/locale/en-US.ini
+share/obs/obs-studio/locale/eo-UY.ini
share/obs/obs-studio/locale/es-ES.ini
share/obs/obs-studio/locale/et-EE.ini
share/obs/obs-studio/locale/eu-ES.ini