public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/
Date: Thu,  1 Jun 2023 03:07:27 +0000 (UTC)	[thread overview]
Message-ID: <1685588794.a493c0a777f1ef77d37840980477e2e1a347d0aa.sam@gentoo> (raw)

commit:     a493c0a777f1ef77d37840980477e2e1a347d0aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  1 03:06:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  1 03:06:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a493c0a7

media-plugins/gst-plugins-opencv: don't unintentionally install nls/translation files

We need to disable NLS explicitly here to avoid colliding w/ gst-plugins-bad
on translations, because we currently do a "full" install in multilib_src_install
in this package.

Closes: https://bugs.gentoo.org/907480
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...v-1.22.3-r1.ebuild => gst-plugins-opencv-1.22.3-r2.ebuild} | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
similarity index 70%
rename from media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
rename to media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
index dd4e9c41a067..979c21297c73 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
@@ -25,6 +25,17 @@ src_prepare() {
 	gstreamer_system_package video_dep:gstreamer-video
 }
 
+multilib_src_configure() {
+	local emesonargs=(
+		# We need to disable here to avoid colliding w/ gst-plugins-bad
+		# on translations, because we currently do a "full" install in
+		# multilib_src_install in this package. See bug #907480.
+		-Dnls=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
 }


             reply	other threads:[~2023-06-01  3:07 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-01  3:07 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-15 11:40 [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/ Mart Raudsepp
2023-05-30 18:21 Sam James
2022-09-15 17:20 Andreas Sturmlechner
2021-12-28  7:30 Sam James
2021-11-24  0:40 Sam James
2021-07-10 17:28 Sam James
2021-05-30  0:40 Sam James
2021-02-19 23:16 Mart Raudsepp
2021-02-13 19:49 Mart Raudsepp
2020-05-04 20:25 Mart Raudsepp
2020-05-04 17:56 Mart Raudsepp
2019-08-27 21:05 Mart Raudsepp
2019-02-05 22:57 Mart Raudsepp
2019-01-15 23:11 Mart Raudsepp
2018-09-21  5:23 Mart Raudsepp
2018-07-31  8:02 Mart Raudsepp
2018-06-21 10:40 Mart Raudsepp
2018-06-16 18:27 Mart Raudsepp
2018-02-14 22:06 Mart Raudsepp
2018-01-03  0:05 Mart Raudsepp
2017-12-12 16:55 Mart Raudsepp
2017-09-18 21:42 Mart Raudsepp
2017-09-18 21:42 Mart Raudsepp
2017-09-16 19:46 Mart Raudsepp
2017-08-11 13:21 Michał Górny
2017-06-18  8:31 Mart Raudsepp
2017-02-25 20:46 Mart Raudsepp
2017-02-11 14:52 Mart Raudsepp
2016-09-18 22:44 Gilles Dartiguelongue

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1685588794.a493c0a777f1ef77d37840980477e2e1a347d0aa.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox