| 1 |
commit: 639f62636b5ce8dd284fdeb3a5e95dd08bd59115 |
| 2 |
Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com> |
| 3 |
AuthorDate: Wed Sep 15 11:32:40 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 15 17:06:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639f6263 |
| 7 |
|
| 8 |
media-video/pipewire: enable support for test IUSE |
| 9 |
|
| 10 |
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com> |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
...ber-0.4.2-meson-Build-tests-conditionally.patch | 41 ++++++++++++++++++++++ |
| 14 |
.../wireplumber/wireplumber-0.4.2-r1.ebuild | 9 ++++- |
| 15 |
media-video/wireplumber/wireplumber-9999.ebuild | 5 ++- |
| 16 |
3 files changed, 53 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch b/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..dab53c71bf4 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch |
| 23 |
@@ -0,0 +1,41 @@ |
| 24 |
+From 3b24c419b497c283e64df23b3b5eecd4c3d51927 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Sam James <sam@g.o> |
| 26 |
+Date: Tue, 14 Sep 2021 05:07:41 +0100 |
| 27 |
+Subject: [PATCH 1/5] meson: Build tests conditionally |
| 28 |
+ |
| 29 |
+It's useful downstream to be able to control building |
| 30 |
+tests, as there's not much use building them if we're |
| 31 |
+not going to run them. |
| 32 |
+ |
| 33 |
+Signed-off-by: Sam James <sam@g.o> |
| 34 |
+--- |
| 35 |
+ meson.build | 5 ++++- |
| 36 |
+ meson_options.txt | 2 ++ |
| 37 |
+ 2 files changed, 6 insertions(+), 1 deletion(-) |
| 38 |
+ |
| 39 |
+diff --git a/meson.build b/meson.build |
| 40 |
+index 3712a82..5f87ade 100644 |
| 41 |
+--- a/meson.build |
| 42 |
++++ b/meson.build |
| 43 |
+@@ -109,4 +109,7 @@ subdir('lib') |
| 44 |
+ subdir('docs') |
| 45 |
+ subdir('modules') |
| 46 |
+ subdir('src') |
| 47 |
+-subdir('tests') |
| 48 |
++ |
| 49 |
++if get_option('tests') |
| 50 |
++ subdir('tests') |
| 51 |
++endif |
| 52 |
+diff --git a/meson_options.txt b/meson_options.txt |
| 53 |
+index a7a0a89..4008864 100644 |
| 54 |
+--- a/meson_options.txt |
| 55 |
++++ b/meson_options.txt |
| 56 |
+@@ -24,3 +24,5 @@ option('systemd-user-unit-dir', |
| 57 |
+ description : 'Directory for user systemd units') |
| 58 |
+ option('glib-supp', type : 'string', value : '', |
| 59 |
+ description: 'The glib.supp valgrind suppressions file to be used when running valgrind') |
| 60 |
++option('tests', type : 'boolean', value : 'true', |
| 61 |
++ description : 'Build the test suite') |
| 62 |
+-- |
| 63 |
+2.33.0 |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild |
| 67 |
index 6e5080a5e1d..ed677c4b5aa 100644 |
| 68 |
--- a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild |
| 69 |
+++ b/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild |
| 70 |
@@ -21,10 +21,12 @@ HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" |
| 71 |
|
| 72 |
LICENSE="MIT" |
| 73 |
SLOT="0/0.4" |
| 74 |
-IUSE="systemd" |
| 75 |
+IUSE="systemd test" |
| 76 |
|
| 77 |
REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 78 |
|
| 79 |
+RESTRICT="!test? ( test )" |
| 80 |
+ |
| 81 |
# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building |
| 82 |
BDEPEND=" |
| 83 |
dev-libs/glib |
| 84 |
@@ -48,6 +50,10 @@ RDEPEND="${DEPEND}" |
| 85 |
|
| 86 |
DOCS=( {NEWS,README}.rst ) |
| 87 |
|
| 88 |
+PATCHES=( |
| 89 |
+ "${FILESDIR}"/${PN}-0.4.2-meson-Build-tests-conditionally.patch |
| 90 |
+) |
| 91 |
+ |
| 92 |
src_configure() { |
| 93 |
local emesonargs=( |
| 94 |
-Dintrospection=disabled # Only used for Sphinx doc generation |
| 95 |
@@ -58,6 +64,7 @@ src_configure() { |
| 96 |
$(meson_use systemd systemd-user-service) |
| 97 |
-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) |
| 98 |
-Dsystemd-user-unit-dir=$(systemd_get_userunitdir) |
| 99 |
+ $(meson_use test tests) |
| 100 |
) |
| 101 |
|
| 102 |
meson_src_configure |
| 103 |
|
| 104 |
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild |
| 105 |
index 6e5080a5e1d..6477107a785 100644 |
| 106 |
--- a/media-video/wireplumber/wireplumber-9999.ebuild |
| 107 |
+++ b/media-video/wireplumber/wireplumber-9999.ebuild |
| 108 |
@@ -21,10 +21,12 @@ HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" |
| 109 |
|
| 110 |
LICENSE="MIT" |
| 111 |
SLOT="0/0.4" |
| 112 |
-IUSE="systemd" |
| 113 |
+IUSE="systemd test" |
| 114 |
|
| 115 |
REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 116 |
|
| 117 |
+RESTRICT="!test? ( test )" |
| 118 |
+ |
| 119 |
# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building |
| 120 |
BDEPEND=" |
| 121 |
dev-libs/glib |
| 122 |
@@ -58,6 +60,7 @@ src_configure() { |
| 123 |
$(meson_use systemd systemd-user-service) |
| 124 |
-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) |
| 125 |
-Dsystemd-user-unit-dir=$(systemd_get_userunitdir) |
| 126 |
+ $(meson_use test tests) |
| 127 |
) |
| 128 |
|
| 129 |
meson_src_configure |
Archives