build: Update to 30.0.0

3 files changed, 54 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72c6be6e4101..6d1f6149a186 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = obs-studio-browser
 	pkgdesc = Free and open source software for video recording and live streaming. With everything except service integration
-	pkgver = 29.1.3
-	pkgrel = 6
+	pkgver = 30.0.0
+	pkgrel = 1
 	url = https://github.com/obsproject/obs-studio
 	arch = x86_64
 	arch = aarch64
@@ -12,9 +12,11 @@ pkgbase = obs-studio-browser
 	makedepends = git
 	makedepends = uthash
 	makedepends = libajantv2
+	makedepends = libdatachannel-nice>=0.19.2
 	makedepends = libfdk-aac
 	makedepends = luajit
 	makedepends = nlohmann-json
+	makedepends = onevpl
 	makedepends = python>=3.11
 	makedepends = sndio
 	makedepends = swig
@@ -43,6 +45,7 @@ pkgbase = obs-studio-browser
 	depends = libxkbcommon
 	depends = mbedtls>=3.4
 	depends = pciutils
+	depends = qrcodegencpp-cmake
 	depends = qt6-base
 	depends = qt6-svg
 	depends = qt6-wayland
@@ -68,9 +71,12 @@ pkgbase = obs-studio-browser
 	depends = nss
 	optdepends = jack: JACK support
 	optdepends = libfdk-aac: FDK AAC codec support
-	optdepends = intel-media-driver: Hardware encoding (>= Broadwell)
-	optdepends = libva-intel-driver: Hardware encoding (<= Haswell)
-	optdepends = libva-mesa-driver: Hardware encoding
+	optdepends = onevpl: QSV encoder support
+	optdepends = intel-media-sdk: QSV encoder support(<= Rocket Lake & >= Broadwell)
+	optdepends = onevpl-intel-gpu: QSV encoder support (>= Alder Lake)
+	optdepends = intel-media-driver: VAAPI encoder support (>= Broadwell)
+	optdepends = libva-intel-driver: VAAPI encoder support (<= Haswell)
+	optdepends = libva-mesa-driver: VAAPI encoder support
 	optdepends = swig: Scripting
 	optdepends = luajit: Lua scripting
 	optdepends = python>=3.11: Python scripting
@@ -78,8 +84,9 @@ pkgbase = obs-studio-browser
 	optdepends = v4l-utils: V4L2 support
 	optdepends = systemd-libs: V4L2 support
 	optdepends = v4l2loopback-dkms: V4L2 virtual camera output
+	optdepends = libdatachannel>=0.19.2: WHIP Support
 	optdepends = decklink: Blackmagic Design DeckLink support
-	provides = obs-studio=29.1.3
+	provides = obs-studio=30.0.0
 	provides = obs-vst
 	provides = obs-websocket
 	provides = obs-browser
@@ -90,19 +97,15 @@ pkgbase = obs-studio-browser
 	conflicts = obs-linuxbrowser
 	conflicts = libva-vdpau-driver
 	options = debug
-	source = obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=29.1.3
+	source = obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=30.0.0
 	source = obs-browser::git+https://github.com/obsproject/obs-browser.git
 	source = obs-websocket::git+https://github.com/obsproject/obs-websocket.git
-	source = qr::git+https://github.com/nayuki/QR-Code-generator.git
 	source = 0001-Add_finder_for_uthash.patch
 	source = 0002-Use_system_uthash.patch
-	source = 0003-Fix_blank_browser_dock_titles.patch
-	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = f4a56021a7f1c564f95b588d7c09b60a89efa2c1954c8a418cf6320b5a818542
-	sha256sums = 966250c40ab47276e1d420941b5b1e448886b0ab8643f25ba37dce08df68f34d
-	sha256sums = 8980d1e871177c3f65d5cf0c249ef36c5a9e2a6956bbc592283782ec58d825e7
+	sha256sums = 874456110d17d2efe02f8a1f47f58c877922d8bdab6435df334b9e6460b26bf8
 
 pkgname = obs-studio-browser
diff --git a/0002-Use_system_uthash.patch b/0002-Use_system_uthash.patch
index b942ca763286..eaa7db1da6b6 100644
--- a/0002-Use_system_uthash.patch
+++ b/0002-Use_system_uthash.patch
@@ -1,4 +1,4 @@
-From 8d1b5aa01d290b2e2203623cc5f51b7c854012da Mon Sep 17 00:00:00 2001
+From e1e12d2acda6f511a5f70ed6b6e10d1b8c83708a Mon Sep 17 00:00:00 2001
 From: tytan652 <tytan652@tytanium.xyz>
 Date: Mon, 24 Jul 2023 10:52:05 +0200
 Subject: [PATCH] deps,libobs: Replace uthash with prefix/system install
@@ -19,20 +19,18 @@ Subject: [PATCH] deps,libobs: Replace uthash with prefix/system install
  delete mode 100644 deps/uthash/uthash/uthash.h
 
 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
-index 9e92bb114..6ab050f03 100644
+index d093e29df0883..8e4cb2d412320 100644
 --- a/deps/CMakeLists.txt
 +++ b/deps/CMakeLists.txt
-@@ -16,7 +16,6 @@ add_subdirectory(file-updater)
+@@ -12,5 +12,4 @@ add_subdirectory(file-updater)
  add_subdirectory(obs-scripting)
  add_subdirectory(opts-parser)
  add_subdirectory(libcaption)
 -add_subdirectory(uthash)
- 
- # Use bundled jansson version as fallback
- find_package(Jansson 2.5 QUIET)
+ add_subdirectory(happy-eyeballs)
 diff --git a/deps/uthash/.clang-format b/deps/uthash/.clang-format
 deleted file mode 100644
-index 6420a4688..000000000
+index 6420a46881e05..0000000000000
 --- a/deps/uthash/.clang-format
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -41,11 +39,11 @@ index 6420a4688..000000000
 -DisableFormat: true
 diff --git a/deps/uthash/CMakeLists.txt b/deps/uthash/CMakeLists.txt
 deleted file mode 100644
-index 19f262a36..000000000
+index aecb0d74e49a5..0000000000000
 --- a/deps/uthash/CMakeLists.txt
 +++ /dev/null
 @@ -1,8 +0,0 @@
--cmake_minimum_required(VERSION 3.16...3.25)
+-cmake_minimum_required(VERSION 3.22...3.25)
 -
 -add_library(uthash INTERFACE)
 -add_library(OBS::uthash ALIAS uthash)
@@ -55,7 +53,7 @@ index 19f262a36..000000000
 -set_target_properties(uthash PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}")
 diff --git a/deps/uthash/uthash/LICENSE b/deps/uthash/uthash/LICENSE
 deleted file mode 100644
-index e75a243af..000000000
+index e75a243af9b99..0000000000000
 --- a/deps/uthash/uthash/LICENSE
 +++ /dev/null
 @@ -1,21 +0,0 @@
@@ -82,7 +80,7 @@ index e75a243af..000000000
 -
 diff --git a/deps/uthash/uthash/uthash.h b/deps/uthash/uthash/uthash.h
 deleted file mode 100644
-index ac78fdab5..000000000
+index ac78fdab5a4f5..0000000000000
 --- a/deps/uthash/uthash/uthash.h
 +++ /dev/null
 @@ -1,1136 +0,0 @@
@@ -1223,10 +1221,10 @@ index ac78fdab5..000000000
 -
 -#endif /* UTHASH_H */
 diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
-index d2e26710d..759e98ede 100644
+index 46112abe71f9d..185a0b6560fac 100644
 --- a/libobs/CMakeLists.txt
 +++ b/libobs/CMakeLists.txt
-@@ -8,6 +8,7 @@ add_library(OBS::libobs ALIAS libobs)
+@@ -16,6 +16,7 @@ add_library(OBS::libobs ALIAS libobs)
  find_package(Threads REQUIRED)
  find_package(FFmpeg REQUIRED avformat avutil swscale swresample OPTIONAL_COMPONENTS avcodec)
  find_package(ZLIB REQUIRED)
@@ -1234,7 +1232,7 @@ index d2e26710d..759e98ede 100644
  
  if(ENABLE_UI)
    find_qt(COMPONENTS Core)
-@@ -15,7 +16,6 @@ endif()
+@@ -23,7 +24,6 @@ endif()
  
  find_package(jansson REQUIRED)
  add_subdirectory("${CMAKE_SOURCE_DIR}/deps/libcaption" "${CMAKE_BINARY_DIR}/deps/libcaption")
@@ -1242,14 +1240,15 @@ index d2e26710d..759e98ede 100644
  
  target_sources(
    libobs
-@@ -225,13 +225,13 @@ target_compile_definitions(
+@@ -232,7 +232,6 @@ target_compile_definitions(
  target_link_libraries(
    libobs
    PRIVATE OBS::caption
 -          OBS::uthash
+           OBS::libobs-version
            FFmpeg::avcodec
            FFmpeg::avformat
-           FFmpeg::avutil
+@@ -240,6 +239,7 @@ target_link_libraries(
            FFmpeg::swscale
            FFmpeg::swresample
            jansson::jansson
@@ -1258,28 +1257,29 @@ index d2e26710d..759e98ede 100644
    PUBLIC Threads::Threads)
  
 diff --git a/libobs/cmake/legacy.cmake b/libobs/cmake/legacy.cmake
-index fcbacd7b9..f870ceb0f 100644
+index 5f13c4c0f04ab..81d82e747bfd9 100644
 --- a/libobs/cmake/legacy.cmake
 +++ b/libobs/cmake/legacy.cmake
-@@ -10,6 +10,7 @@ find_package(
+@@ -20,6 +20,7 @@ find_package(
    COMPONENTS avformat avutil swscale swresample
    OPTIONAL_COMPONENTS avcodec)
  find_package(ZLIB REQUIRED)
 +find_package(Uthash REQUIRED)
  
- if(ENABLE_UI)
-   find_qt(COMPONENTS Core)
-@@ -248,7 +249,7 @@ target_link_libraries(
+ add_library(libobs SHARED)
+ add_library(OBS::libobs ALIAS libobs)
+@@ -252,8 +253,8 @@ target_link_libraries(
            FFmpeg::swresample
            Jansson::Jansson
            OBS::caption
 -          OBS::uthash
+           OBS::libobs-version
 +          Uthash::Uthash
            ZLIB::ZLIB
    PUBLIC Threads::Threads)
  
 diff --git a/libobs/util/uthash.h b/libobs/util/uthash.h
-index 5698466ea..fb6a240da 100644
+index 5698466ea96fb..fb6a240dafff1 100644
 --- a/libobs/util/uthash.h
 +++ b/libobs/util/uthash.h
 @@ -21,7 +21,7 @@
@@ -1291,6 +1291,3 @@ index 5698466ea..fb6a240da 100644
  
  /* Use OBS allocator */
  #undef uthash_malloc
--- 
-2.42.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 83529391fe6c..f66d2d58e0b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,14 @@
 # Contributor: ledti <antergist at gmail dot com>
 
 pkgname=obs-studio-browser
-pkgver=29.1.3
-pkgrel=6
+pkgver=30.0.0
+pkgrel=1
 pkgdesc="Free and open source software for video recording and live streaming. With everything except service integration"
 arch=("x86_64" "aarch64")
 url="https://github.com/obsproject/obs-studio"
 license=("GPL3")
 # To manage dependency rebuild easily, this will prevent you to rebuild OBS on non-updated system
+_libdatachannelver=0.19.2
 _mbedtlsver=3.4
 _pythonver=3.11
 depends=(
@@ -22,21 +23,22 @@ depends=(
   "fontconfig" # Deps of Freetype2 plugin
   "freetype2" # Deps of Freetype2 plugin
   "ftl-sdk" # Deps of Outputs plugin
-  "gcc-libs" # Deps of any C related binary
+  "gcc-libs" # Deps of any C++ related binary
   "glib2" # Deps of libobs, PipeWire plugin and CEF
-  "glibc" # Deps of any C++ related binary
+  "glibc" # Deps of any C related binary
   "jansson" # Deps of libobs and rtmp-services plugin
   "libgl" # Deps of libobs-opengl and OBS Studio
   "libpipewire" # Deps of the PipeWire plugin
   "libpulse" # Deps of PulseAudio monitoring (in libobs) and PulseAudio plugin
   "librist" # Deps of FFmpeg plugin
-  "libva" # Deps of FFmpeg plugin
+  "libva" # Deps of FFmpeg plugin and QSV plugin
   "libx11" # Deps of libobs, libobs-opengl, X11 Capture plugin, frontend tools plugin, obs-browser and CEF
   "libxcb" # Deps of libobs-opengl, X11 Capture plugin and CEF
   "libxcomposite" # Deps of the X11 capture plugin
   "libxkbcommon" # Deps of libobs, OBS Studio and CEF
   "mbedtls>=$_mbedtlsver" # Deps of OBS Studio and Outputs plugin
   "pciutils" # Deps of FFmpeg plugin
+  "qrcodegencpp-cmake" # Deps of Websocket plugin
   "qt6-base" # Deps of OBS Studio and any frontend plugin
   "qt6-svg" # Deps of OBS Studio
   "qt6-wayland" # Needed to use Qt on Wayland platform
@@ -68,9 +70,11 @@ makedepends=(
   "git"
   "uthash" # Deps of libobs
   "libajantv2" # Deps of AJA plugin (static lib)
+  "libdatachannel-nice>=$_libdatachannelver" # Deps of WebRTC plugin (NICE variant like the Flatpak)
   "libfdk-aac" # Deps of FDK AAC plugin
   "luajit" # Deps of Scripting plugin
   "nlohmann-json" # Deps of Websocket plugin (headers-only lib)
+  "onevpl" # Deps of QSV plugin
   "python>=$_pythonver" # Deps of Scripting plugin
   "sndio" # Deps of sndio plugin
   "swig" # Deps of Scripting plugin
@@ -84,9 +88,12 @@ makedepends=(
 optdepends=(
   "jack: JACK support"
   "libfdk-aac: FDK AAC codec support"
-  "intel-media-driver: Hardware encoding (>= Broadwell)"
-  "libva-intel-driver: Hardware encoding (<= Haswell)"
-  "libva-mesa-driver: Hardware encoding"
+  "onevpl: QSV encoder support"
+  "intel-media-sdk: QSV encoder support(<= Rocket Lake & >= Broadwell)"
+  "onevpl-intel-gpu: QSV encoder support (>= Alder Lake)"
+  "intel-media-driver: VAAPI encoder support (>= Broadwell)"
+  "libva-intel-driver: VAAPI encoder support (<= Haswell)"
+  "libva-mesa-driver: VAAPI encoder support"
   "swig: Scripting"
   "luajit: Lua scripting"
   "python>=$_pythonver: Python scripting"
@@ -94,6 +101,7 @@ optdepends=(
   "v4l-utils: V4L2 support"
   "systemd-libs: V4L2 support"
   "v4l2loopback-dkms: V4L2 virtual camera output"
+  "libdatachannel>=$_libdatachannelver: WHIP Support"
 )
 provides=("obs-studio=$pkgver" "obs-vst" "obs-websocket" "obs-browser")
 conflicts=(
@@ -106,19 +114,15 @@ source=(
   "obs-studio::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver"
   "obs-browser::git+https://github.com/obsproject/obs-browser.git"
   "obs-websocket::git+https://github.com/obsproject/obs-websocket.git"
-  "qr::git+https://github.com/nayuki/QR-Code-generator.git"
   "0001-Add_finder_for_uthash.patch"
   "0002-Use_system_uthash.patch"
-  "0003-Fix_blank_browser_dock_titles.patch"
 )
 sha256sums=(
   "SKIP"
   "SKIP"
   "SKIP"
-  "SKIP"
   "f4a56021a7f1c564f95b588d7c09b60a89efa2c1954c8a418cf6320b5a818542"
-  "966250c40ab47276e1d420941b5b1e448886b0ab8643f25ba37dce08df68f34d"
-  "8980d1e871177c3f65d5cf0c249ef36c5a9e2a6956bbc592283782ec58d825e7"
+  "874456110d17d2efe02f8a1f47f58c877922d8bdab6435df334b9e6460b26bf8"
 )
 
 if [[ $CARCH == 'x86_64' ]]; then
@@ -133,23 +137,14 @@ prepare() {
 
   patch -Np1 -i "$srcdir/0001-Add_finder_for_uthash.patch"
   patch -Np1 -i "$srcdir/0002-Use_system_uthash.patch"
-  # https://github.com/obsproject/obs-studio/pull/9373
-  patch -Np1 -i "$srcdir/0003-Fix_blank_browser_dock_titles.patch"
-
-  cd plugins/obs-websocket
-  git config submodule.deps/qr.url $srcdir/qr
-  git -c protocol.file.allow=always submodule update deps/qr
 }
 
 build() {
-  export CXXFLAGS="$CXXFLAGS -Wno-error=dangling-reference"
-
   cmake -B build -S obs-studio \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DENABLE_RTMPS=ON \
-    -DQT_VERSION=6 \
     -DENABLE_LIBFDK=ON \
     -DENABLE_JACK=ON \
     -DENABLE_SNDIO=ON \