Date: Thursday, December 1, 2022 @ 09:08:54
Author: jsteel
Revision: 1355585
archrelease: copy trunk to community-x86_64
Added:
obs-studio/repos/community-x86_64/PKGBUILD
(from rev 1355584, obs-studio/trunk/PKGBUILD)
obs-studio/repos/community-x86_64/fix_python_binary_loading.patch
(from rev 1355584, obs-studio/trunk/fix_python_binary_loading.patch)
obs-studio/repos/community-x86_64/ignore_unused_submodules.patch
(from rev 1355584, obs-studio/trunk/ignore_unused_submodules.patch)
Deleted:
obs-studio/repos/community-x86_64/PKGBUILD
obs-studio/repos/community-x86_64/fix_python_binary_loading.patch
obs-studio/repos/community-x86_64/ignore_unused_submodules.patch
---------------------------------+
PKGBUILD | 111 +++++++++++++++++++-------------------
fix_python_binary_loading.patch | 48 ++++++++--------
ignore_unused_submodules.patch | 38 ++++++-------
3 files changed, 99 insertions(+), 98 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-01 09:08:43 UTC (rev 1355584)
+++ PKGBUILD 2022-12-01 09:08:54 UTC (rev 1355585)
@@ -1,55 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Benjamin Klettbach <[email protected]>
-
-pkgname=obs-studio
-pkgver=28.1.2
-pkgrel=1
-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'
'rnnoise' 'pciutils'
- 'qt6-svg' 'curl' 'jack' 'gtk-update-icon-cache' 'pipewire'
'libxcomposite')
-makedepends=('cmake' 'libfdk-aac' 'x264' 'swig' 'python' 'luajit' 'sndio')
-optdepends=('libfdk-aac: FDK AAC codec support'
- 'libva-intel-driver: hardware encoding'
- 'libva-mesa-driver: hardware encoding'
- 'luajit: scripting support'
- 'python: scripting support'
- 'sndio: Sndio input client'
- 'v4l2loopback-dkms: virtual camera support')
-source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
- fix_python_binary_loading.patch
- ignore_unused_submodules.patch)
-sha256sums=('c51c72945867cd9862ba663b01cc8313153a0249dd3df0626e63fc5d82a84b39'
- 'bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd'
- '60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
- patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- mkdir -p build; cd build
-
- cmake -DCMAKE_INSTALL_PREFIX="/usr" \
- -DENABLE_BROWSER=OFF \
- -DENABLE_VST=ON \
- -DENABLE_VLC=OFF \
- -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
- -DENABLE_AJA=OFF \
- -DENABLE_JACK=ON \
- -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" ..
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver/build
-
- make install DESTDIR="$pkgdir"
-}
Copied: obs-studio/repos/community-x86_64/PKGBUILD (from rev 1355584,
obs-studio/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-01 09:08:54 UTC (rev 1355585)
@@ -0,0 +1,56 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Benjamin Klettbach <[email protected]>
+
+pkgname=obs-studio
+pkgver=28.1.2
+pkgrel=2
+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'
'rnnoise' 'pciutils'
+ 'qt6-svg' 'curl' 'jack' 'gtk-update-icon-cache' 'pipewire'
'libxcomposite')
+makedepends=('cmake' 'libfdk-aac' 'x264' 'swig' 'python' 'luajit' 'sndio')
+optdepends=('libfdk-aac: FDK AAC codec support'
+ 'libva-intel-driver: hardware encoding'
+ 'libva-mesa-driver: hardware encoding'
+ 'luajit: scripting support'
+ 'python: scripting support'
+ 'sndio: Sndio input client'
+ 'v4l2loopback-dkms: virtual camera support')
+source=($pkgname-$pkgver.tar.gz::https://github.com/jp9000/obs-studio/archive/$pkgver.tar.gz
+ fix_python_binary_loading.patch
+ ignore_unused_submodules.patch)
+sha256sums=('c51c72945867cd9862ba663b01cc8313153a0249dd3df0626e63fc5d82a84b39'
+ 'bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd'
+ '60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 < "$srcdir"/fix_python_binary_loading.patch
+ patch -Np1 < "$srcdir"/ignore_unused_submodules.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ mkdir -p build; cd build
+
+ cmake -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DENABLE_BROWSER=OFF \
+ -DENABLE_VST=ON \
+ -DENABLE_VLC=OFF \
+ -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
+ -DENABLE_AJA=OFF \
+ -DENABLE_JACK=ON \
+ -DENABLE_LIBFDK=ON \
+ -DOBS_VERSION_OVERRIDE="$pkgver-$pkgrel" ..
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/build
+
+ make install DESTDIR="$pkgdir"
+}
Deleted: fix_python_binary_loading.patch
===================================================================
--- fix_python_binary_loading.patch 2022-12-01 09:08:43 UTC (rev 1355584)
+++ fix_python_binary_loading.patch 2022-12-01 09:08:54 UTC (rev 1355585)
@@ -1,24 +0,0 @@
-From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001
-From: Matt Gajownik <[email protected]>
-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,
Copied: obs-studio/repos/community-x86_64/fix_python_binary_loading.patch (from
rev 1355584, obs-studio/trunk/fix_python_binary_loading.patch)
===================================================================
--- fix_python_binary_loading.patch (rev 0)
+++ fix_python_binary_loading.patch 2022-12-01 09:08:54 UTC (rev 1355585)
@@ -0,0 +1,24 @@
+From c482159ce93deafc7f1fc5755ba15135709ae726 Mon Sep 17 00:00:00 2001
+From: Matt Gajownik <[email protected]>
+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,
Deleted: ignore_unused_submodules.patch
===================================================================
--- ignore_unused_submodules.patch 2022-12-01 09:08:43 UTC (rev 1355584)
+++ ignore_unused_submodules.patch 2022-12-01 09:08:54 UTC (rev 1355585)
@@ -1,19 +0,0 @@
---- a/plugins/CMakeLists.txt.orig 2022-09-24 09:05:46.308250388 +0100
-+++ b/plugins/CMakeLists.txt 2022-09-24 09:06:04.978206849 +0100
-@@ -61,7 +61,6 @@
- add_subdirectory(sndio)
- add_subdirectory(obs-vst)
-
-- check_obs_browser()
- elseif(OS_FREEBSD)
- add_subdirectory(linux-capture)
- add_subdirectory(linux-pulseaudio)
-@@ -84,8 +83,6 @@
-
- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/obs-websocket/CMakeLists.txt)
- add_subdirectory(obs-websocket)
--else()
-- obs_status(FATAL_ERROR "obs-websocket submodule not available.")
- endif()
-
- add_subdirectory(image-source)
Copied: obs-studio/repos/community-x86_64/ignore_unused_submodules.patch (from
rev 1355584, obs-studio/trunk/ignore_unused_submodules.patch)
===================================================================
--- ignore_unused_submodules.patch (rev 0)
+++ ignore_unused_submodules.patch 2022-12-01 09:08:54 UTC (rev 1355585)
@@ -0,0 +1,19 @@
+--- a/plugins/CMakeLists.txt.orig 2022-09-24 09:05:46.308250388 +0100
++++ b/plugins/CMakeLists.txt 2022-09-24 09:06:04.978206849 +0100
+@@ -61,7 +61,6 @@
+ add_subdirectory(sndio)
+ add_subdirectory(obs-vst)
+
+- check_obs_browser()
+ elseif(OS_FREEBSD)
+ add_subdirectory(linux-capture)
+ add_subdirectory(linux-pulseaudio)
+@@ -84,8 +83,6 @@
+
+ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/obs-websocket/CMakeLists.txt)
+ add_subdirectory(obs-websocket)
+-else()
+- obs_status(FATAL_ERROR "obs-websocket submodule not available.")
+ endif()
+
+ add_subdirectory(image-source)
