From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1645012-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 (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 89DAD15817D
for <garchives@archives.gentoo.org>; Thu, 20 Jun 2024 14:05:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5CD8FE2A21;
Thu, 20 Jun 2024 14:05:34 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 865B0E2A21
for <gentoo-commits@lists.gentoo.org>; Thu, 20 Jun 2024 14:05:33 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9835033BEED
for <gentoo-commits@lists.gentoo.org>; Thu, 20 Jun 2024 14:05:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D08271D28
for <gentoo-commits@lists.gentoo.org>; Thu, 20 Jun 2024 14:05:30 +0000 (UTC)
From: "Maciej Barć" <xgqt@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, "Maciej Barć" <xgqt@gentoo.org>
Message-ID: <1718892327.07ff1130ba2ce6f23d4c1565173beb0ab5fa70cd.xgqt@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/openrgb/openrgb-0.9.ebuild app-misc/openrgb/openrgb-9999.ebuild
X-VCS-Directories: app-misc/openrgb/
X-VCS-Committer: xgqt
X-VCS-Committer-Name: Maciej Barć
X-VCS-Revision: 07ff1130ba2ce6f23d4c1565173beb0ab5fa70cd
X-VCS-Branch: master
Date: Thu, 20 Jun 2024 14:05:30 +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: da7c0ddc-c927-4acf-96c5-f6bf3170ebda
X-Archives-Hash: 4f0ece38e083aef3b278e7a4b493402e
commit: 07ff1130ba2ce6f23d4c1565173beb0ab5fa70cd
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 13:40:13 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 14:05:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ff1130
app-misc/openrgb: workaround cpp-httplib lib name change
Closes: https://bugs.gentoo.org/934576
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-misc/openrgb/openrgb-0.9.ebuild | 13 +++++++++++--
app-misc/openrgb/openrgb-9999.ebuild | 13 +++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/app-misc/openrgb/openrgb-0.9.ebuild b/app-misc/openrgb/openrgb-0.9.ebuild
index 9c15691b3b6b..72260835c3d0 100644
--- a/app-misc/openrgb/openrgb-0.9.ebuild
+++ b/app-misc/openrgb/openrgb-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -63,10 +63,19 @@ src_configure() {
# > warning: ‘-pipe’ ignored because ‘-save-temps’ specified
filter-flags -pipe
+ # cpp-httplib >=0.16.0 changed the library name from "httplib" to "cpp-httplib".
+ # See bug: https://bugs.gentoo.org/934576
+ local -a libs=()
+ if has_version "<dev-cpp/cpp-httplib-0.16.0" ; then
+ libs+=( -lhttplib )
+ else
+ libs+=( -lcpp-httplib )
+ fi
+
eqmake5 \
INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" \
- LIBS+=-lhttplib
+ LIBS+="${libs[@]}"
}
src_install() {
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 9fdf9377f299..bc8761ad746a 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -63,10 +63,19 @@ src_configure() {
# > warning: ‘-pipe’ ignored because ‘-save-temps’ specified
filter-flags -pipe
+ # cpp-httplib >=0.16.0 changed the library name from "httplib" to "cpp-httplib".
+ # See bug: https://bugs.gentoo.org/934576
+ local -a libs=()
+ if has_version "<dev-cpp/cpp-httplib-0.16.0" ; then
+ libs+=( -lhttplib )
+ else
+ libs+=( -lcpp-httplib )
+ fi
+
eqmake5 \
INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" \
- LIBS+=-lhttplib
+ LIBS+="${libs[@]}"
}
src_install() {