mirror of
https://github.com/luzifer-aur/obs-studio-browser.git
synced 2024-12-30 04:51:17 +00:00
obs-studio-browser v29.1.0
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
0761b3d74c
commit
2ec7c740e4
3 changed files with 66 additions and 54 deletions
44
.SRCINFO
44
.SRCINFO
|
@ -1,44 +0,0 @@
|
||||||
pkgbase = obs-studio-browser
|
|
||||||
pkgdesc = Free and open source software for video recording and live streaming. Built with the browser plugin.
|
|
||||||
pkgver = 29.0.2
|
|
||||||
pkgrel = 1
|
|
||||||
url = https://github.com/obsproject/obs-studio
|
|
||||||
arch = i686
|
|
||||||
arch = x86_64
|
|
||||||
license = GPL2
|
|
||||||
makedepends = cef-minimal-obs
|
|
||||||
makedepends = cmake
|
|
||||||
makedepends = git
|
|
||||||
makedepends = jack
|
|
||||||
makedepends = libfdk-aac
|
|
||||||
makedepends = libxcomposite
|
|
||||||
makedepends = luajit
|
|
||||||
makedepends = python
|
|
||||||
makedepends = swig
|
|
||||||
makedepends = vlc
|
|
||||||
makedepends = x264
|
|
||||||
depends = curl
|
|
||||||
depends = ffmpeg
|
|
||||||
depends = gtk-update-icon-cache
|
|
||||||
depends = jansson
|
|
||||||
depends = libajantv2
|
|
||||||
depends = libxinerama
|
|
||||||
depends = libxkbcommon-x11
|
|
||||||
depends = mbedtls
|
|
||||||
depends = qt5-x11extras
|
|
||||||
depends = pciutils
|
|
||||||
depends = pipewire
|
|
||||||
optdepends = libfdk-aac: FDK AAC codec support
|
|
||||||
optdepends = libxcomposite: XComposite capture support
|
|
||||||
optdepends = jack: JACK Support
|
|
||||||
optdepends = vlc: VLC Media Source
|
|
||||||
optdepends = swig: Scripting
|
|
||||||
optdepends = luajit: Lua scripting
|
|
||||||
optdepends = python: Python scripting
|
|
||||||
optdepends = v4l2loopback-dkms: Virtual camera output
|
|
||||||
provides = obs-studio=29.0.2
|
|
||||||
conflicts = obs-studio
|
|
||||||
source = obs-studio-browser::git+https://github.com/obsproject/obs-studio.git#tag=29.0.2
|
|
||||||
sha256sums = SKIP
|
|
||||||
|
|
||||||
pkgname = obs-studio-browser
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
From 6acef4edf8ec353313f84103162c3064ecd2efb6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tytan652 <tytan652@tytanium.xyz>
|
||||||
|
Date: Thu, 4 May 2023 11:07:52 +0200
|
||||||
|
Subject: [PATCH] cmake: Enforce -Wmaybe-uninitialized to never turn into an
|
||||||
|
error
|
||||||
|
|
||||||
|
---
|
||||||
|
cmake/Modules/CompilerConfig.cmake | 23 ++++++++++++-----------
|
||||||
|
1 file changed, 12 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
|
||||||
|
index 41c56da8b4cee..849d19de75ccf 100644
|
||||||
|
--- a/cmake/Modules/CompilerConfig.cmake
|
||||||
|
+++ b/cmake/Modules/CompilerConfig.cmake
|
||||||
|
@@ -100,6 +100,13 @@ else()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
option(CALM_DEPRECATION "Keep deprecated-declarations as warnings" OFF)
|
||||||
|
+ #[[
|
||||||
|
+ Note about -Wmaybe-uninitialized on GCC, this warning seems to be subject of various regressions and false positives. This
|
||||||
|
+ warning is set to not turn into an error.
|
||||||
|
+
|
||||||
|
+ - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562 for 12.1.0
|
||||||
|
+ - https://github.com/obsproject/obs-studio/issues/8850 for 13.1.1
|
||||||
|
+ ]]
|
||||||
|
add_compile_options(
|
||||||
|
-Werror
|
||||||
|
-Wextra
|
||||||
|
@@ -117,19 +124,13 @@ else()
|
||||||
|
"$<$<CONFIG:DEBUG>:-DDEBUG=1;-D_DEBUG=1>"
|
||||||
|
"$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wnull-conversion;-fcolor-diagnostics;-Wno-error=shorten-64-to-32>"
|
||||||
|
"$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wnull-conversion;-fcolor-diagnostics;-Wno-error=shorten-64-to-32>"
|
||||||
|
- "$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wconversion-null>"
|
||||||
|
+ "$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wconversion-null;-Wno-error=maybe-uninitialized>"
|
||||||
|
+ "$<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-error=maybe-uninitialized>"
|
||||||
|
"$<$<BOOL:${CALM_DEPRECATION}>:-Wno-error=deprecated-declarations>")
|
||||||
|
|
||||||
|
- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
|
- # GCC on aarch64 emits type-limits warnings that do not appear on x86_64
|
||||||
|
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
||||||
|
- add_compile_options(-Wno-error=type-limits)
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562
|
||||||
|
- if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "12.1.0")
|
||||||
|
- add_compile_options(-Wno-error=maybe-uninitialized)
|
||||||
|
- endif()
|
||||||
|
+ # GCC on aarch64 emits type-limits warnings that do not appear on x86_64
|
||||||
|
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
|
||||||
|
+ add_compile_options(-Wno-error=type-limits)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(OBS_CODESIGN_LINKER)
|
23
PKGBUILD
23
PKGBUILD
|
@ -6,8 +6,8 @@
|
||||||
# Contributor: ledti <antergist at gmail dot com>
|
# Contributor: ledti <antergist at gmail dot com>
|
||||||
|
|
||||||
pkgname=obs-studio-browser
|
pkgname=obs-studio-browser
|
||||||
pkgver=29.0.2
|
pkgver=29.1.0
|
||||||
pkgrel=2
|
pkgrel=0
|
||||||
pkgdesc="Free and open source software for video recording and live streaming. Built with the browser plugin."
|
pkgdesc="Free and open source software for video recording and live streaming. Built with the browser plugin."
|
||||||
arch=("i686" "x86_64")
|
arch=("i686" "x86_64")
|
||||||
url="https://github.com/obsproject/obs-studio"
|
url="https://github.com/obsproject/obs-studio"
|
||||||
|
@ -18,14 +18,18 @@ depends=(
|
||||||
"gtk-update-icon-cache"
|
"gtk-update-icon-cache"
|
||||||
"jansson"
|
"jansson"
|
||||||
"libajantv2"
|
"libajantv2"
|
||||||
|
"libxcomposite"
|
||||||
"libxinerama"
|
"libxinerama"
|
||||||
"libxkbcommon-x11"
|
"libxkbcommon-x11"
|
||||||
"mbedtls"
|
"mbedtls"
|
||||||
"qt5-x11extras"
|
|
||||||
"pciutils"
|
"pciutils"
|
||||||
"pipewire"
|
"pipewire"
|
||||||
|
"qt5-x11extras"
|
||||||
|
"rnnoise"
|
||||||
|
"x264"
|
||||||
)
|
)
|
||||||
makedepends=(
|
makedepends=(
|
||||||
|
"asio"
|
||||||
"cef-minimal-obs"
|
"cef-minimal-obs"
|
||||||
"cmake"
|
"cmake"
|
||||||
"git"
|
"git"
|
||||||
|
@ -33,15 +37,14 @@ makedepends=(
|
||||||
"libfdk-aac"
|
"libfdk-aac"
|
||||||
"libxcomposite"
|
"libxcomposite"
|
||||||
"luajit"
|
"luajit"
|
||||||
|
"nlohmann-json"
|
||||||
"python"
|
"python"
|
||||||
|
"sndio"
|
||||||
"swig"
|
"swig"
|
||||||
"vlc"
|
"vlc"
|
||||||
"x264"
|
"websocketpp"
|
||||||
)
|
)
|
||||||
optdepends=(
|
optdepends=(
|
||||||
"libfdk-aac: FDK AAC codec support"
|
|
||||||
"libxcomposite: XComposite capture support"
|
|
||||||
"jack: JACK Support"
|
|
||||||
"vlc: VLC Media Source"
|
"vlc: VLC Media Source"
|
||||||
"swig: Scripting"
|
"swig: Scripting"
|
||||||
"luajit: Lua scripting"
|
"luajit: Lua scripting"
|
||||||
|
@ -52,15 +55,15 @@ provides=("obs-studio=$pkgver")
|
||||||
conflicts=("obs-studio")
|
conflicts=("obs-studio")
|
||||||
source=(
|
source=(
|
||||||
"$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver"
|
"$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver"
|
||||||
"https://github.com/obsproject/obs-studio/commit/2e79d4c9.patch"
|
0001-Enforce_-Wmaybe-uninitialized_never_turn_into_error.patch
|
||||||
)
|
)
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
'96ea913149377b324d132aa56964a72e5263e06a8b8d2103c1708b04752f3b9d')
|
'9227a5f3439d19c2c75e369bc6701dc83c4ac54cc371b7f74e55c9e275512f6c')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $pkgname
|
cd $pkgname
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
patch -Np1 <"$srcdir"/2e79d4c9.patch # Fix build with FFmpeg 6
|
patch -Np1 <"$srcdir/0001-Enforce_-Wmaybe-uninitialized_never_turn_into_error.patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
Loading…
Reference in a new issue