add dlopen patch and wayland support

3 files changed, 52 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccde807ac3e9..2d7bc4b2fef9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = obs-studio-git
 	pkgdesc = Free and open source software for video recording and live streaming.
-	pkgver = 26.1.2.r146.g1ea818373
+	pkgver = 26.1.2.r186.g01c00cf27
 	pkgrel = 1
 	url = https://github.com/obsproject/obs-studio
 	arch = i686
@@ -11,35 +11,41 @@ pkgbase = obs-studio-git
 	makedepends = libfdk-aac
 	makedepends = libxcomposite
 	makedepends = x264
-	makedepends = jack
 	makedepends = vlc
 	makedepends = swig
 	makedepends = luajit
 	makedepends = python
 	makedepends = cef-minimal>=87.0.0
+	makedepends = wayland
+	makedepends = qt5-wayland
 	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
 	optdepends = libfdk-aac: FDK AAC codec support
 	optdepends = libxcomposite: XComposite capture support
-	optdepends = jack: JACK Support
+	optdepends = libva-intel-driver: hardware encoding
+	optdepends = libva-mesa-driver: hardware encoding
 	optdepends = vlc: VLC Media Source
-	optdepends = swig: Scripting
 	optdepends = luajit: Lua scripting
 	optdepends = python: Python scripting
 	optdepends = v4l2loopback-dkms: Virtual webcam
-	provides = obs-studio=26.1.2.r146.g1ea818373
+	provides = obs-studio=26.1.2.r186.g01c00cf27
 	conflicts = obs-studio
 	source = obs-studio-git::git+https://github.com/obsproject/obs-studio.git#branch=master
 	source = git+https://github.com/Mixer/ftl-sdk.git
 	source = git+https://github.com/obsproject/obs-browser.git
+	source = fix_python_binary_loading.patch
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = 051b90f05e26bff99236b8fb1ad377d1
 
 pkgname = obs-studio-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f031647e592..b18f3a5a3e34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,22 @@
 # Contributor: ArcticVanguard <LideEmily at gmail dot com>
 # Contributor: ledti <antergist at gmail dot com>
 pkgname=obs-studio-git
-pkgver=26.1.2.r146.g1ea818373
+pkgver=26.1.2.r186.g01c00cf27
 pkgrel=1
 pkgdesc="Free and open source software for video recording and live streaming."
 arch=("i686" "x86_64")
 url="https://github.com/obsproject/obs-studio"
 license=("GPL2")
-depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11"
-         "qt5-x11extras" "curl" "gtk-update-icon-cache")
-makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264" "jack"
-             "vlc" "swig" "luajit" "python" "cef-minimal>=87.0.0")
+depends=("ffmpeg" "jansson" "libxinerama" "libxkbcommon-x11" "mbedtls"
+         "qt5-svg" "qt5-x11extras" "curl" "jack" "gtk-update-icon-cache")
+makedepends=("cmake" "git" "libfdk-aac" "libxcomposite" "x264"
+             "vlc" "swig" "luajit" "python" "cef-minimal>=87.0.0" "wayland"
+             "qt5-wayland")
 optdepends=("libfdk-aac: FDK AAC codec support"
             "libxcomposite: XComposite capture support"
-            "jack: JACK Support"
+            "libva-intel-driver: hardware encoding"
+            "libva-mesa-driver: hardware encoding"
             "vlc: VLC Media Source"
-            "swig: Scripting"
             "luajit: Lua scripting"
             "python: Python scripting"
             "v4l2loopback-dkms: Virtual webcam")
@@ -25,8 +26,15 @@ provides=("obs-studio=$pkgver")
 conflicts=("obs-studio")
 source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#branch=master"
         "git+https://github.com/Mixer/ftl-sdk.git"
-        "git+https://github.com/obsproject/obs-browser.git")
-md5sums=("SKIP" "SKIP" "SKIP")
+        "git+https://github.com/obsproject/obs-browser.git"
+        "fix_python_binary_loading.patch")
+md5sums=("SKIP" "SKIP" "SKIP"
+         "051b90f05e26bff99236b8fb1ad377d1")
+
+prepare() {
+  cd $pkgname
+  patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
+}
 
 pkgver() {
   cd $pkgname
diff --git a/fix_python_binary_loading.patch b/fix_python_binary_loading.patch
new file mode 100644
index 000000000000..6cba55f2f1af
--- /dev/null
+++ b/fix_python_binary_loading.patch
@@ -0,0 +1,24 @@
+From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001
+From: Matt Gajownik <matt@obsproject.com>
+Date: Tue, 25 Aug 2020 19:28:26 +1000
+Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
+
+Fixes #2222
+---
+ libobs/util/platform-nix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c
+index 26800d52f7..997b62db1a 100644
+--- a/libobs/util/platform-nix.c
++++ b/libobs/util/platform-nix.c
+@@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
+ #ifdef __APPLE__
+ 	void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
+ #else
+-	void *res = dlopen(dylib_name.array, RTLD_LAZY);
++	void *res = dlopen(dylib_name.array,
++			   RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL);
+ #endif
+ 	if (!res)
+ 		blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path,