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() {
