diff --git a/.SRCINFO b/.SRCINFO deleted file mode 100644 index c1a3a7d..0000000 --- a/.SRCINFO +++ /dev/null @@ -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 diff --git a/0001-Enforce_-Wmaybe-uninitialized_never_turn_into_error.patch b/0001-Enforce_-Wmaybe-uninitialized_never_turn_into_error.patch new file mode 100644 index 0000000..dbb9d4c --- /dev/null +++ b/0001-Enforce_-Wmaybe-uninitialized_never_turn_into_error.patch @@ -0,0 +1,53 @@ +From 6acef4edf8ec353313f84103162c3064ecd2efb6 Mon Sep 17 00:00:00 2001 +From: tytan652 +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() + "$<$:-DDEBUG=1;-D_DEBUG=1>" + "$<$:-Wnull-conversion;-fcolor-diagnostics;-Wno-error=shorten-64-to-32>" + "$<$:-Wnull-conversion;-fcolor-diagnostics;-Wno-error=shorten-64-to-32>" +- "$<$:-Wconversion-null>" ++ "$<$:-Wconversion-null;-Wno-error=maybe-uninitialized>" ++ "$<$:-Wno-error=maybe-uninitialized>" + "$<$:-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) diff --git a/PKGBUILD b/PKGBUILD index 7910951..f5fca23 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: ledti pkgname=obs-studio-browser -pkgver=29.0.2 -pkgrel=2 +pkgver=29.1.0 +pkgrel=0 pkgdesc="Free and open source software for video recording and live streaming. Built with the browser plugin." arch=("i686" "x86_64") url="https://github.com/obsproject/obs-studio" @@ -18,14 +18,18 @@ depends=( "gtk-update-icon-cache" "jansson" "libajantv2" + "libxcomposite" "libxinerama" "libxkbcommon-x11" "mbedtls" - "qt5-x11extras" "pciutils" "pipewire" + "qt5-x11extras" + "rnnoise" + "x264" ) makedepends=( + "asio" "cef-minimal-obs" "cmake" "git" @@ -33,15 +37,14 @@ makedepends=( "libfdk-aac" "libxcomposite" "luajit" + "nlohmann-json" "python" + "sndio" "swig" "vlc" - "x264" + "websocketpp" ) optdepends=( - "libfdk-aac: FDK AAC codec support" - "libxcomposite: XComposite capture support" - "jack: JACK Support" "vlc: VLC Media Source" "swig: Scripting" "luajit: Lua scripting" @@ -52,15 +55,15 @@ provides=("obs-studio=$pkgver") conflicts=("obs-studio") source=( "$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' - '96ea913149377b324d132aa56964a72e5263e06a8b8d2103c1708b04752f3b9d') + '9227a5f3439d19c2c75e369bc6701dc83c4ac54cc371b7f74e55c9e275512f6c') prepare() { cd $pkgname 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() {