commit: 1cd282ee12238a89f43525b98b51535e0ec03737
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Dec 25 17:21:27 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 14:31:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd282ee
app-misc/openrgb: depend on httplib, drop patch
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../files/OpenRGB-0.8-drop-bundled-libs.patch | 25 ----------------------
app-misc/openrgb/openrgb-0.8.ebuild | 6 +++---
app-misc/openrgb/openrgb-9999.ebuild | 6 +++---
3 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/app-misc/openrgb/files/OpenRGB-0.8-drop-bundled-libs.patch
b/app-misc/openrgb/files/OpenRGB-0.8-drop-bundled-libs.patch
deleted file mode 100644
index ca3a96b441c7..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.8-drop-bundled-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b8d2ff44ef16fb395c283d53a1fa723bff818a9a Mon Sep 17 00:00:00 2001
-From: Marco Scardovi <mscard...@icloud.com>
-Date: Sun, 18 Dec 2022 21:19:26 +0100
-Subject: [PATCH] Drop libs
-
----
- OpenRGB.pro | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/OpenRGB.pro b/OpenRGB.pro
-index aabbd161..8e644960 100644
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -63,11 +63,9 @@ INCLUDEPATH +=
- dependencies/CRCpp/
\
- dependencies/hueplusplus-1.0.0/include
\
- dependencies/hueplusplus-1.0.0/include/hueplusplus
\
-- dependencies/httplib
\
- dependencies/json/
\
- dependencies/libe131/src/
\
- dependencies/libcmmk/include/
\
-- dependencies/mdns
\
- i2c_smbus/
\
- i2c_tools/
\
- net_port/
\
diff --git a/app-misc/openrgb/openrgb-0.8.ebuild
b/app-misc/openrgb/openrgb-0.8.ebuild
index bed6c458262f..516276f31fcd 100644
--- a/app-misc/openrgb/openrgb-0.8.ebuild
+++ b/app-misc/openrgb/openrgb-0.8.ebuild
@@ -22,6 +22,7 @@ LICENSE="GPL-2"
SLOT="0/2"
RDEPEND="
+ dev-cpp/cpp-httplib:=
dev-libs/hidapi
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -31,7 +32,6 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- dev-cpp/cpp-httplib
dev-cpp/nlohmann_json
dev-libs/mdns
"
@@ -42,7 +42,6 @@ BDEPEND="
PATCHES+=(
"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
- "${FILESDIR}"/OpenRGB-0.8-drop-bundled-libs.patch
)
src_prepare() {
@@ -62,7 +61,8 @@ src_configure() {
eqmake5 \
INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-
DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
+
DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
\
+ LIBS+=-lhttplib
}
src_install() {
diff --git a/app-misc/openrgb/openrgb-9999.ebuild
b/app-misc/openrgb/openrgb-9999.ebuild
index bed6c458262f..516276f31fcd 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -22,6 +22,7 @@ LICENSE="GPL-2"
SLOT="0/2"
RDEPEND="
+ dev-cpp/cpp-httplib:=
dev-libs/hidapi
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -31,7 +32,6 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- dev-cpp/cpp-httplib
dev-cpp/nlohmann_json
dev-libs/mdns
"
@@ -42,7 +42,6 @@ BDEPEND="
PATCHES+=(
"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
- "${FILESDIR}"/OpenRGB-0.8-drop-bundled-libs.patch
)
src_prepare() {
@@ -62,7 +61,8 @@ src_configure() {
eqmake5 \
INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
-
DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
+
DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
\
+ LIBS+=-lhttplib
}
src_install() {
