From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3FB0B1382C5 for ; Fri, 7 May 2021 21:23:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E68CE081A; Fri, 7 May 2021 21:23:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41E72E0802 for ; Fri, 7 May 2021 21:23:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45A95340E56 for ; Fri, 7 May 2021 21:23:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DF925C4 for ; Fri, 7 May 2021 21:23:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1620421088.d15e2b644efa1addd6de1e1c25452e325cbd84ea.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/, media-video/obs-studio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch media-video/obs-studio/obs-studio-26.1.2-r1.ebuild media-video/obs-studio/obs-studio-9999.ebuild X-VCS-Directories: media-video/obs-studio/files/ media-video/obs-studio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d15e2b644efa1addd6de1e1c25452e325cbd84ea X-VCS-Branch: master Date: Fri, 7 May 2021 21:23:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 820e07f8-1505-4af0-ba29-16187012b9f0 X-Archives-Hash: 4ac097a053ab383c891b9518e0cf3e78 commit: d15e2b644efa1addd6de1e1c25452e325cbd84ea Author: Jimi Huotari gentoo org> AuthorDate: Wed Apr 28 07:06:02 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 7 20:58:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d15e2b64 media-video/obs-studio: raise python support to 3.8 and 3.9 With a patch. Closes: https://bugs.gentoo.org/754006 Closes: https://bugs.gentoo.org/784989 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/20574 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/obs-studio-26.1.2-python-3.8.patch | 24 ++++++++++++++++++++++ ...dio-9999.ebuild => obs-studio-26.1.2-r1.ebuild} | 20 +++++++++++++++--- media-video/obs-studio/obs-studio-9999.ebuild | 17 ++++++++++++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch new file mode 100644 index 00000000000..c4709c65468 --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch @@ -0,0 +1,24 @@ +From 413fbe27ee68881f60265f0f2dd670ce42ca220e Mon Sep 17 00:00:00 2001 +From: Matt Gajownik +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 26800d52f7c..997b62db1a3 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, diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild similarity index 86% copy from media-video/obs-studio/obs-studio-9999.ebuild copy to media-video/obs-studio/obs-studio-26.1.2-r1.ebuild index e9173352238..3e12ab881f7 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) LUA_COMPAT=( luajit ) -# Does not work with 3.8+ https://bugs.gentoo.org/754006 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) inherit cmake lua-single python-single-r1 xdg-utils @@ -78,6 +77,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch" + "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335 +) + pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup @@ -148,6 +152,16 @@ pkg_postinst() { fi } +pkg_postinst() { + if use python; then + ewarn "This ebuild applies a patch that is not yet accepted upstream," + ewarn "and while it fixes Python support at least to some extent, it" + ewarn "may cause other issues." + ewarn "" + ewarn "Please report any such issues to the Gentoo maintainer." + fi +} + pkg_postrm() { xdg_icon_cache_update } diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index e9173352238..c6e7b77ff6b 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) LUA_COMPAT=( luajit ) -# Does not work with 3.8+ https://bugs.gentoo.org/754006 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_{7..9} ) inherit cmake lua-single python-single-r1 xdg-utils @@ -78,6 +77,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) # https://github.com/obsproject/obs-studio/pull/3335 + pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup @@ -148,6 +149,16 @@ pkg_postinst() { fi } +pkg_postinst() { + if use python; then + ewarn "This ebuild applies a patch that is not yet accepted upstream," + ewarn "and while it fixes Python support at least to some extent, it" + ewarn "may cause other issues." + ewarn "" + ewarn "Please report any such issues to the Gentoo maintainer." + fi +} + pkg_postrm() { xdg_icon_cache_update }