[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     8207f2dffa4f2d4a081acd18ecc249b3bdcce0d8
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 00:40:28 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 00:43:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8207f2df

gstreamer-meson.eclass: check for package-name and package-origin options

Bug: https://bugs.gentoo.org/823617
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/gstreamer-meson.eclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 2e271c5cd4f..34472b76c82 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -328,12 +328,15 @@ gstreamer_multilib_src_configure() {
                fi
        fi
 
+       if grep -qF "option('package-name'" 
"${EMESON_SOURCE}"/meson_options.txt ; then
+               gst_conf+=( -Dpackage-name="Gentoo GStreamer ebuild" )
+       fi
+       if grep -qF "option('package-origin'" 
"${EMESON_SOURCE}"/meson_options.txt ; then
+               gst_conf+=( -Dpackage-origin="https://www.gentoo.org"; )
+       fi
+       gst_conf+=( "${@}" )
+
        einfo "Configuring to build ${GST_PLUGINS_ENABLED} plugin(s) ..."
-       gst_conf+=(
-               -Dpackage-name="Gentoo GStreamer ebuild"
-               -Dpackage-origin="https://www.gentoo.org";
-               "${@}"
-       )
        meson_src_configure "${gst_conf[@]}"
 }