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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC01515806E for ; Thu, 1 Jun 2023 03:07:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03BDDE0880; Thu, 1 Jun 2023 03:07:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4366E0880 for ; Thu, 1 Jun 2023 03:07:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2558340E18 for ; Thu, 1 Jun 2023 03:07:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1604AA78 for ; Thu, 1 Jun 2023 03:07:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685588794.a493c0a777f1ef77d37840980477e2e1a347d0aa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild X-VCS-Directories: media-plugins/gst-plugins-opencv/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a493c0a777f1ef77d37840980477e2e1a347d0aa X-VCS-Branch: master Date: Thu, 1 Jun 2023 03:07:27 +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: d787ec39-b06a-4ca0-ac41-b4bf041f13e9 X-Archives-Hash: a399c7a5bf46935af44b81165354ab63 commit: a493c0a777f1ef77d37840980477e2e1a347d0aa Author: Sam James gentoo org> AuthorDate: Thu Jun 1 03:06:34 2023 +0000 Commit: Sam James gentoo 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 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 }