| 1 |
commit: eaa7a6fa3c2e601462c7c19f4e81257e3a58557b |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 8 19:06:42 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 9 10:01:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa7a6fa |
| 7 |
|
| 8 |
media-video/obs-studio: fix building without Python targets |
| 9 |
|
| 10 |
Only call 'python-single-r1_pkg_setup' if USE="python" is set, since |
| 11 |
without supported Python targets, things will go bad even if |
| 12 |
USE="-python" is being used. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/667896 |
| 15 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 16 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/10109 |
| 18 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 19 |
|
| 20 |
media-video/obs-studio/obs-studio-21.1.2.ebuild | 6 +++++- |
| 21 |
media-video/obs-studio/obs-studio-22.0.3.ebuild | 6 +++++- |
| 22 |
media-video/obs-studio/obs-studio-9999.ebuild | 6 +++++- |
| 23 |
3 files changed, 15 insertions(+), 3 deletions(-) |
| 24 |
|
| 25 |
diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild |
| 26 |
index bba5ad05ece..ca9114ce291 100644 |
| 27 |
--- a/media-video/obs-studio/obs-studio-21.1.2.ebuild |
| 28 |
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild |
| 29 |
@@ -1,4 +1,4 @@ |
| 30 |
-# Copyright 1999-2018 Gentoo Foundation |
| 31 |
+# Copyright 1999-2018 Gentoo Authors |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
EAPI=6 |
| 35 |
@@ -69,6 +69,10 @@ PATCHES=( |
| 36 |
|
| 37 |
CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |
| 38 |
|
| 39 |
+pkg_setup() { |
| 40 |
+ use python && python-single-r1_pkg_setup |
| 41 |
+} |
| 42 |
+ |
| 43 |
src_configure() { |
| 44 |
local libdir=$(get_libdir) |
| 45 |
local mycmakeargs=( |
| 46 |
|
| 47 |
diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild |
| 48 |
index 987d58bb89b..7bd98fa4213 100644 |
| 49 |
--- a/media-video/obs-studio/obs-studio-22.0.3.ebuild |
| 50 |
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2018 Gentoo Foundation |
| 53 |
+# Copyright 1999-2018 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
@@ -66,6 +66,10 @@ PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" ) |
| 58 |
|
| 59 |
CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |
| 60 |
|
| 61 |
+pkg_setup() { |
| 62 |
+ use python && python-single-r1_pkg_setup |
| 63 |
+} |
| 64 |
+ |
| 65 |
src_configure() { |
| 66 |
local libdir=$(get_libdir) |
| 67 |
local mycmakeargs=( |
| 68 |
|
| 69 |
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild |
| 70 |
index d3014eda9ed..a596540a779 100644 |
| 71 |
--- a/media-video/obs-studio/obs-studio-9999.ebuild |
| 72 |
+++ b/media-video/obs-studio/obs-studio-9999.ebuild |
| 73 |
@@ -1,4 +1,4 @@ |
| 74 |
-# Copyright 1999-2018 Gentoo Foundation |
| 75 |
+# Copyright 1999-2018 Gentoo Authors |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
|
| 78 |
EAPI=6 |
| 79 |
@@ -64,6 +64,10 @@ RDEPEND="${COMMON_DEPEND}" |
| 80 |
|
| 81 |
CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |
| 82 |
|
| 83 |
+pkg_setup() { |
| 84 |
+ use python && python-single-r1_pkg_setup |
| 85 |
+} |
| 86 |
+ |
| 87 |
src_configure() { |
| 88 |
local libdir=$(get_libdir) |
| 89 |
local mycmakeargs=( |
Archives