t* My OpenBSD ports
URI git clone git://git.codevoid.de/mystuff.git
DIR Log
DIR Files
DIR Refs
---
DIR commit 6999d724efb2aea3df340fe30e90f2e89195bfcf
DIR parent 436b5314e81393d53883b44689a2aea0eb8fb921
URI Author: c0dev0id <sh+github[at]codevoid[dot]de>
Date: Mon, 7 Dec 2020 00:14:47 +0100
obs-studio: upstream openbds support
Diffstat:
M multimedia/obs-studio/distinfo | 4 ++--
D multimedia/obs-studio/patches/patc… | 14 --------------
D multimedia/obs-studio/patches/patc… | 32 -------------------------------
D multimedia/obs-studio/patches/patc… | 14 --------------
D multimedia/obs-studio/patches/patc… | 18 ------------------
D multimedia/obs-studio/patches/patc… | 17 -----------------
D multimedia/obs-studio/patches/patc… | 17 -----------------
D multimedia/obs-studio/patches/patc… | 17 -----------------
D multimedia/obs-studio/patches/patc… | 14 --------------
9 files changed, 2 insertions(+), 145 deletions(-)
---
DIR diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo
t@@ -1,2 +1,2 @@
-SHA256 (obs-studio-26.0.0.tar.gz) = dJXwgbT2rfQnQmh8G7eTj8szej3iPNJ0A3jpg5KSW3Q=
-SIZE (obs-studio-26.0.0.tar.gz) = 10326769
+SHA256 (obs-studio-26.1.0-rc1.tar.gz) = imUQV3zln28Roxi5MHn0Jb9ZZl+3Zdtam1qBD65kXag=
+SIZE (obs-studio-26.1.0-rc1.tar.gz) = 18514389
DIR diff --git a/multimedia/obs-studio/patches/patch-UI_obs-app_cpp b/multimedia/obs-studio/patches/patch-UI_obs-app_cpp
t@@ -1,14 +0,0 @@
-$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-libobs_obs-nix_c b/multimedia/obs-studio/patches/patch-libobs_obs-nix_c
t@@ -1,32 +0,0 @@
-$OpenBSD$
-
-Index: libobs/obs-nix.c
---- libobs/obs-nix.c.orig
-+++ libobs/obs-nix.c
-@@ -26,7 +26,9 @@
- #if defined(__FreeBSD__)
- #include <sys/sysctl.h>
- #endif
-+#ifndef __OpenBSD__
- #include <sys/sysinfo.h>
-+#endif
- #include <sys/utsname.h>
- #include <xcb/xcb.h>
- #if USE_XINPUT
-@@ -218,6 +220,8 @@ static void log_processor_info(void)
-
- static void log_memory_info(void)
- {
-+#if defined(__OpenBSD__)
-+#else
- struct sysinfo info;
- if (sysinfo(&info) < 0)
- return;
-@@ -227,6 +231,7 @@ static void log_memory_info(void)
- (uint64_t)info.totalram * info.mem_unit / 1024 / 1024,
- ((uint64_t)info.freeram + (uint64_t)info.bufferram) *
- info.mem_unit / 1024 / 1024);
-+#endif
- }
-
- static void log_kernel_version(void)
DIR diff --git a/multimedia/obs-studio/patches/patch-libobs_util_profiler_c b/multimedia/obs-studio/patches/patch-libobs_util_profiler_c
t@@ -1,14 +0,0 @@
-$OpenBSD$
-
-Index: libobs/util/profiler.c
---- libobs/util/profiler.c.orig
-+++ libobs/util/profiler.c
-@@ -1058,7 +1058,7 @@ bool profiler_snapshot_dump_csv_gz(const profiler_snap
-
- profiler_snapshot_dump(snap, dump_csv_gzwrite, gz);
-
-- gzclose_w(gz);
-+ gzclose(gz);
- return true;
- }
-
DIR diff --git a/multimedia/obs-studio/patches/patch-plugins_CMakeLists_txt b/multimedia/obs-studio/patches/patch-plugins_CMakeLists_txt
t@@ -1,18 +0,0 @@
-$OpenBSD$
-
-Index: plugins/CMakeLists.txt
---- plugins/CMakeLists.txt.orig
-+++ plugins/CMakeLists.txt
-@@ -49,6 +49,12 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
- add_subdirectory(linux-alsa)
- add_subdirectory(vlc-video)
- add_subdirectory(oss-audio)
-+elseif("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
-+ add_subdirectory(linux-capture)
-+ add_subdirectory(linux-pulseaudio)
-+ add_subdirectory(linux-v4l2)
-+ add_subdirectory(linux-jack)
-+ 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@@ -1,17 +0,0 @@
-$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@@ -1,17 +0,0 @@
-$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@@ -1,17 +0,0 @@
-$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_obs-outputs_librtmp_rtmp_c b/multimedia/obs-studio/patches/patch-plugins_obs-outputs_librtmp_rtmp_c
t@@ -1,14 +0,0 @@
-$OpenBSD$
-
-Index: plugins/obs-outputs/librtmp/rtmp.c
---- plugins/obs-outputs/librtmp/rtmp.c.orig
-+++ plugins/obs-outputs/librtmp/rtmp.c
-@@ -812,7 +812,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;
- #else
- *socket_error = ENODATA;