upgpkg: obs-studio-ftl 27.0.1-1

upstream release

3 files changed, 29 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1209fbad224..46ce12245b54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,41 @@
 pkgbase = obs-studio-ftl
-	pkgdesc = Free, open source software for live streaming and recording (with FTL System patch)
-	pkgver = 26.1.2
+	pkgdesc = Free, open source software for live streaming and recording
+	pkgver = 27.0.1
 	pkgrel = 1
 	url = https://obsproject.com
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
 	makedepends = libfdk-aac
-	makedepends = libxcomposite
 	makedepends = x264
-	makedepends = vlc
 	makedepends = swig
 	makedepends = python
 	makedepends = luajit
+	makedepends = sndio
 	depends = ffmpeg
 	depends = jansson
 	depends = libxinerama
 	depends = libxkbcommon-x11
 	depends = mbedtls
 	depends = qt5-svg
-	depends = qt5-x11extras
 	depends = curl
 	depends = jack
 	depends = gtk-update-icon-cache
+	depends = pipewire
+	depends = libxcomposite
 	depends = ftl-sdk
 	optdepends = libfdk-aac: FDK AAC codec support
-	optdepends = libxcomposite: XComposite capture support
 	optdepends = libva-intel-driver: hardware encoding
 	optdepends = libva-mesa-driver: hardware encoding
 	optdepends = luajit: scripting support
 	optdepends = python: scripting support
-	optdepends = vlc: VLC Media Source support
+	optdepends = sndio: Sndio input client
+	optdepends = v4l2loopback-dkms: virtual camera support
 	provides = obs-studio
 	conflicts = obs-studio
-	source = obs-studio-ftl-26.1.2.tar.gz::https://github.com/jp9000/obs-studio/archive/26.1.2.tar.gz
+	source = obs-studio-27.0.1.tar.gz::https://github.com/jp9000/obs-studio/archive/27.0.1.tar.gz
 	source = fix_python_binary_loading.patch
-	source = ftl_use_system.diff
-	md5sums = 179a87c9f45e1330dcbd0d4ad48dadae
+	md5sums = 48b51f558858f512928efda0f3aee1a1
 	md5sums = 051b90f05e26bff99236b8fb1ad377d1
-	md5sums = 832c3fac1da5a54493254287fc4a0392
 
 pkgname = obs-studio-ftl
-
diff --git a/PKGBUILD b/PKGBUILD
index fcf604cbebe1..f20f60bfea72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,53 @@
 # Maintainer: Sefa Eyeoglu <contact@scrumplex.net>
-# Contributor: Jonathan Steel <jsteel at archlinux.org>
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
 # Contributor: Benjamin Klettbach <b.klettbach@gmail.com>
 
+_pkgname=obs-studio
 pkgname=obs-studio-ftl
-pkgver=26.1.2
+pkgver=27.0.1
 pkgrel=1
-pkgdesc="Free, open source software for live streaming and recording (with FTL System patch)"
+pkgdesc="Free, open source software for live streaming and recording"
 arch=('x86_64')
 url="https://obsproject.com"
 license=('GPL2')
 depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'mbedtls'
-         'qt5-svg' 'qt5-x11extras' 'curl' 'jack' 'gtk-update-icon-cache' 'ftl-sdk')
-makedepends=('cmake' 'libfdk-aac' 'libxcomposite' 'x264' 'vlc' 'swig' 'python' 'luajit')
+         'qt5-svg' 'curl' 'jack' 'gtk-update-icon-cache' 'pipewire' 'libxcomposite' 'ftl-sdk')
+makedepends=('cmake' 'libfdk-aac' 'x264' 'swig' 'python' 'luajit' 'sndio')
 optdepends=('libfdk-aac: FDK AAC codec support'
-            'libxcomposite: XComposite capture support'
             'libva-intel-driver: hardware encoding'
             'libva-mesa-driver: hardware encoding'
             'luajit: scripting support'
             'python: scripting support'
-            'vlc: VLC Media Source support')
-provides=("obs-studio")
-conflicts=("obs-studio")
-source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
-	fix_python_binary_loading.patch
-	ftl_use_system.diff)
-md5sums=('179a87c9f45e1330dcbd0d4ad48dadae'
-         '051b90f05e26bff99236b8fb1ad377d1'
-         '832c3fac1da5a54493254287fc4a0392')
+            'sndio: Sndio input client'
+            'v4l2loopback-dkms: virtual camera support')
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=($_pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
+	fix_python_binary_loading.patch)
+md5sums=('48b51f558858f512928efda0f3aee1a1'
+         '051b90f05e26bff99236b8fb1ad377d1')
 
 prepare() {
-  cd obs-studio-$pkgver
+  cd $_pkgname-$pkgver
   patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
-  patch -Np1 < "$srcdir"/ftl_use_system.diff
 }
 
 build() {
-  cd obs-studio-$pkgver
+  cd $_pkgname-$pkgver
 
   mkdir -p build; cd build
 
   cmake -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DBUILD_CAPTIONS=ON \
+    -DBUILD_BROWSER=OFF \
+    -DBUILD_VST=OFF \
+    -DDISABLE_VLC=ON \
     -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" ..
 
   make
 }
 
 package() {
-  cd obs-studio-$pkgver/build
+  cd $_pkgname-$pkgver/build
 
   make install DESTDIR="$pkgdir"
 }
diff --git a/ftl_use_system.diff b/ftl_use_system.diff
deleted file mode 100644
index fb10ddeb16d3..000000000000
--- a/ftl_use_system.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt
-index 404e34f01..fad7a7d2a 100644
---- a/plugins/obs-outputs/CMakeLists.txt
-+++ b/plugins/obs-outputs/CMakeLists.txt
-@@ -3,6 +3,8 @@ project(obs-outputs)
- set(WITH_RTMPS AUTO CACHE STRING "Enable RTMPS support with mbedTLS")
- set_property(CACHE WITH_RTMPS PROPERTY STRINGS AUTO ON OFF)
- 
-+find_package(PkgConfig)
-+
- option(STATIC_MBEDTLS "Statically link mbedTLS into binary" OFF)
- 
- if (WITH_RTMPS STREQUAL "AUTO")
-@@ -23,7 +25,22 @@ else()
- 	add_definitions(-DNO_CRYPTO)
- endif()
- 
--if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt")
-+set(COMPILE_FTL FALSE)
-+
-+if (PKG_CONFIG_FOUND)
-+	pkg_check_modules(FTL libftl)
-+endif()
-+
-+if (FTL_FOUND)
-+	find_package(Libcurl REQUIRED)
-+	message(STATUS "Found ftl-sdk (system): ftl outputs enabled")
-+
-+	set(ftl_SOURCES ftl-stream.c)
-+
-+	include_directories(${LIBCURL_INCLUDE_DIRS} ${FTL_INCLUDE_DIRS})
-+	set(COMPILE_FTL TRUE)
-+endif()
-+if (NOT FTL_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt")
- 	find_package(Libcurl REQUIRED)
- 	message(STATUS "Found ftl-sdk: ftl outputs enabled")
- 
-@@ -74,8 +91,6 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt")
- 	include_directories(ftl-sdk/libftl)
- 
- 	set(COMPILE_FTL TRUE)
--else()
--	set(COMPILE_FTL FALSE)
- endif()
- 
- configure_file(
-@@ -169,6 +184,12 @@ add_library(obs-outputs MODULE
- 	${obs-outputs_HEADERS}
- 	${obs-outputs_librtmp_SOURCES}
- 	${obs-outputs_librtmp_HEADERS})
-+
-+if(FTL_FOUND)
-+	target_link_libraries(obs-outputs ${FTL_LIBRARIES})
-+	target_include_directories(obs-outputs PUBLIC ${FTL_INCLUDE_DIRS})
-+endif()
-+
- target_link_libraries(obs-outputs
- 	libobs
- 	${MBEDTLS_LIBRARIES}