From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1705924-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AF17115812D
for <garchives@archives.gentoo.org>; Sat, 04 Jan 2025 21:34:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8663EE07D8;
Sat, 04 Jan 2025 21:34:10 +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 695BDE07F0
for <gentoo-commits@lists.gentoo.org>; Sat, 04 Jan 2025 21:34:10 +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 472D9340BEF
for <gentoo-commits@lists.gentoo.org>; Sat, 04 Jan 2025 21:34:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 28E2310CC
for <gentoo-commits@lists.gentoo.org>; Sat, 04 Jan 2025 21:34:06 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1736026347.24a553bfcba8788ee1003476836b6085c50b7a1b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/gstreamer-meson.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 24a553bfcba8788ee1003476836b6085c50b7a1b
X-VCS-Branch: master
Date: Sat, 04 Jan 2025 21:34:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b50deebd-1198-4681-9159-2bc46fad89df
X-Archives-Hash: 8249572d54dd5b30e3f7f6ef397e5cce
commit: 24a553bfcba8788ee1003476836b6085c50b7a1b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 19:20:36 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 21:32:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a553bf
gstreamer-meson.eclass: add GLIB_VERSION per gst major version
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/gstreamer-meson.eclass | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 7d6b5d6b3249..15b0a6390a42 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -199,8 +199,14 @@ S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
LICENSE="GPL-2"
SLOT="1.0"
+if ver_test ${GST_ORG_PVP} -ge 1.24 ; then
+ GLIB_VERSION=2.64.0
+else
+ GLIB_VERSION=2.62.0
+fi
+
RDEPEND="
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-${GLIB_VERSION}:2[${MULTILIB_USEDEP}]
"
BDEPEND="
virtual/pkgconfig