public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/files/, app-misc/OpenRGB/
@ 2021-06-08 23:13 Patrick McLean
  0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2021-06-08 23:13 UTC (permalink / raw
  To: gentoo-commits

commit:     e21bdc23df6be5ac3d1f907b815d2d837886172a
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Jun  6 22:01:37 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 23:13:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21bdc23

app-misc/OpenRGB: version 0.6

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-misc/OpenRGB/Manifest                        |  1 +
 app-misc/OpenRGB/OpenRGB-0.6.ebuild              | 57 ++++++++++++++++++++++++
 app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch | 11 +++++
 3 files changed, 69 insertions(+)

diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index c2ca31416fa..a27eaef18df 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1,2 +1,3 @@
 DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd
 DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb
+DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32

diff --git a/app-misc/OpenRGB/OpenRGB-0.6.ebuild b/app-misc/OpenRGB/OpenRGB-0.6.ebuild
new file mode 100644
index 00000000000..c356d7aff6f
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-0.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
+	)
+fi
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/hidapi:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+)
+
+src_prepare() {
+	default
+	rm -r dependencies/{hidapi,libusb,json}* || die
+}
+
+src_configure() {
+	eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+}

diff --git a/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch b/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch
new file mode 100644
index 00000000000..380b1091d22
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch
@@ -0,0 +1,11 @@
+--- a/OpenRGB.pro	2021-06-06 22:51:12.022561718 +0100
++++ b/OpenRGB.pro	2021-06-06 22:51:24.466105358 +0100
+@@ -837,7 +837,7 @@ unix:!macx {
+         # hidapi-hidraw >= 0.10.1 supports USAGE/USAGE_PAGE                                     #
+         # Define USE_HID_USAGE if hidapi-hidraw supports it                                     #
+         #---------------------------------------------------------------------------------------#
+-        HIDAPI_HIDRAW_VERSION = $$system(pkgconf --modversion hidapi-hidraw)
++        HIDAPI_HIDRAW_VERSION = $$system(pkg-config --modversion hidapi-hidraw)
+         if(versionAtLeast(HIDAPI_HIDRAW_VERSION, "0.10.1")) {
+             DEFINES += USE_HID_USAGE
+         }


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/files/, app-misc/OpenRGB/
@ 2021-06-08 23:13 Patrick McLean
  0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2021-06-08 23:13 UTC (permalink / raw
  To: gentoo-commits

commit:     90cb6442d37818758cf71ad7460c3bd6a57da475
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Jun  6 22:02:16 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 23:13:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90cb6442

app-misc/OpenRGB: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-misc/OpenRGB/Manifest                          |  1 -
 app-misc/OpenRGB/OpenRGB-0.4.ebuild                | 55 ----------------------
 .../OpenRGB/files/OpenRGB-0.2-build-system.patch   | 14 ------
 3 files changed, 70 deletions(-)

diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index a27eaef18df..dc65a0e68b1 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1,3 +1,2 @@
-DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd
 DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb
 DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32

diff --git a/app-misc/OpenRGB/OpenRGB-0.4.ebuild b/app-misc/OpenRGB/OpenRGB-0.4.ebuild
deleted file mode 100644
index f8119c80c91..00000000000
--- a/app-misc/OpenRGB/OpenRGB-0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils udev
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="udev"
-
-DEPEND="
-	dev-libs/hidapi:=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	virtual/libusb:1
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	rm -rf dependencies/{hidapi,libusb}* || die
-	if [[ ${PV} != *9999* ]]; then
-		eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
-	fi
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-
-	if use udev; then
-		udev_dorules 60-openrgb.rules
-	fi
-}

diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
deleted file mode 100644
index b2cd6cbd1d5..00000000000
--- a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/OpenRGB.pro b/OpenRGB.pro
-index 91e0079..7f279dd 100644
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -8,9 +8,6 @@ TEMPLATE = app
- VERSION         = 0.2
- win32:BUILDDATE = $$system(date /t)
- unix:BUILDDATE  = $$system(date -R)
--GIT_COMMIT_ID   = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
--GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
--GIT_BRANCH      = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
- 
- DEFINES +=                                                              \
-     VERSION_STRING=\\"\"\"$$VERSION\\"\"\"                              \


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2021-06-22 23:00 Patrick McLean
  0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2021-06-22 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     65aef5dafc07f7cadbf8d2a9817b9aa4425c294b
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Tue Jun 22 21:14:47 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 23:00:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65aef5da

app-misc/openrgb: allow installing plugins

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-misc/openrgb/files/OpenRGB-0.6-plugins.patch   | 24 +++++++++++++++++++
 .../{openrgb-9999.ebuild => openrgb-0.6-r1.ebuild} | 27 ++++++++++++++++++----
 app-misc/openrgb/openrgb-9999.ebuild               | 24 ++++++++++++++++---
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
new file mode 100644
index 00000000000..ccc83de27eb
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
@@ -0,0 +1,24 @@
+Allow installation of plugins not only in ~/.config
+
+Used by app-misc/openrgb-plugin-* packages
+
+diff --git a/PluginManager.cpp b/PluginManager.cpp
+index b424b8b..991fb75 100644
+--- a/PluginManager.cpp
++++ b/PluginManager.cpp
+@@ -15,7 +15,8 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
+     \*--------------------------------------------------------------------------------------*/
+     OpenRGBPluginInterface *OpenRGBPlugin = nullptr;
+ 
+-    const QDir pluginsDir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
++    for (const QDir pluginsDir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
++                                  QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
+ 
+     std::vector<std::string> FileList;
+ 
+@@ -54,4 +56,5 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
+             std::cout << loader.errorString().toStdString() << std::endl;
+         }
+     }
++    }
+ }

diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-0.6-r1.ebuild
similarity index 55%
copy from app-misc/openrgb/openrgb-9999.ebuild
copy to app-misc/openrgb/openrgb-0.6-r1.ebuild
index c1f1eb4bbcb..9384eedb4eb 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils
+inherit flag-o-matic qmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -20,14 +20,13 @@ fi
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
 HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/1"
 
 RDEPEND="
 	dev-libs/hidapi:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	net-libs/mbedtls:=
 	virtual/libusb:1
 "
 DEPEND="
@@ -40,19 +39,37 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
 )
 
 src_prepare() {
 	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
+	rm -r dependencies/{hidapi,libusb,json}* || die
 }
 
 src_configure() {
-	eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+	# Some plugins require symbols defined in the main binary.
+	# The official build system bundles OpenRGB as a submodule instead, and
+	# compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
 }
 
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	doins *.h
+	insinto /usr/include/OpenRGB/RGBController
+	doins RGBController/*.h
+	insinto /usr/include/OpenRGB/i2c_smbus
+	doins i2c_smbus/*.h
+	insinto /usr/include/OpenRGB/net_port
+	doins net_port/*.h
 }

diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index c1f1eb4bbcb..853ad8e0414 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils
+inherit flag-o-matic qmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -20,7 +20,7 @@ fi
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
 HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/1"
 
 RDEPEND="
 	dev-libs/hidapi:=
@@ -40,6 +40,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
 )
 
 src_prepare() {
@@ -48,11 +49,28 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+	# Some plugins require symbols defined in the main binary.
+	# The official build system bundles OpenRGB as a submodule instead, and
+	# compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
 }
 
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	doins *.h
+	insinto /usr/include/OpenRGB/RGBController
+	doins RGBController/*.h
+	insinto /usr/include/OpenRGB/i2c_smbus
+	doins i2c_smbus/*.h
+	insinto /usr/include/OpenRGB/net_port
+	doins net_port/*.h
 }


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2021-09-22  0:05 Patrick McLean
  0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2021-09-22  0:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8236ce5cc2b9a7f00d1342da5d3e2504fa1b5101
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue Sep 14 20:14:03 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 00:05:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8236ce5c

app-misc/openrgb: update live

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-misc/openrgb/files/OpenRGB-0.7-plugins.patch | 24 ++++++++++++++++++++++++
 app-misc/openrgb/openrgb-9999.ebuild             |  3 +--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
new file mode 100644
index 00000000000..b9a6fb2cd16
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
@@ -0,0 +1,24 @@
+Allow installation of plugins not only in ~/.config
+
+Used by app-misc/openrgb-plugin-* packages
+
+--- a/PluginManager.cpp
++++ b/PluginManager.cpp
+@@ -35,7 +35,8 @@ void PluginManager::ScanAndLoadPlugins()
+     | The plugins directory is a directory named "plugins" in   |
+     | the configuration directory                               |
+     \*---------------------------------------------------------*/
+-    const QDir plugins_dir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
++    for (const QDir plugins_dir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
++                                   QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
+ 
+     /*---------------------------------------------------------*\
+     | Get a list of all files in the plugins directory          |
+@@ -56,6 +57,7 @@ void PluginManager::ScanAndLoadPlugins()
+ 
+         AddPlugin(plugin_path);
+     }
++    }
+ }
+ 
+ void PluginManager::AddPlugin(std::string path)

diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 9ea0dfa538f..a3d6ddefcc4 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -39,8 +39,7 @@ BDEPEND="
 "
 
 PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
-	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2022-01-11 22:15 Patrick McLean
  0 siblings, 0 replies; 10+ messages in thread
From: Patrick McLean @ 2022-01-11 22:15 UTC (permalink / raw
  To: gentoo-commits

commit:     5be759e46625ccc5f76dfce36ef84de2de9c3ebf
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue Jan 11 21:43:29 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 22:15:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be759e4

app-misc/openrgb: version 0.7

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-misc/openrgb/Manifest                     |  1 +
 app-misc/openrgb/files/OpenRGB-0.7-udev.patch | 16 ++++++
 app-misc/openrgb/openrgb-0.7.ebuild           | 71 +++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 319d0a7ed289..7b8c113774cc 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1 +1,2 @@
 DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
+DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186

diff --git a/app-misc/openrgb/files/OpenRGB-0.7-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
new file mode 100644
index 000000000000..a2feaf1c9378
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
@@ -0,0 +1,16 @@
+Install udev rules to correct dir
+
+Revert https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/ccbe83919a70be346eea948fb2c4122ef9f34214
+
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -1246,7 +1246,7 @@ unix:!macx {
+     icon.files+=qt/OpenRGB.png
+     metainfo.path=$$PREFIX/share/metainfo/
+     metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
++    rules.path=/lib/udev/rules.d/
+-    rules.path=$$PREFIX/lib/udev/rules.d/
+     rules.files+=60-openrgb.rules
+     INSTALLS += target desktop icon metainfo rules
+ }
+GitLab

diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
new file mode 100644
index 000000000000..f9e079015112
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
+	)
+fi
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
+
+RDEPEND="
+	dev-libs/hidapi
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/mbedtls:=
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-udev.patch
+)
+
+src_prepare() {
+	default
+	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
+}
+
+src_configure() {
+	# Some plugins require symbols defined in the main binary.
+	# The official build system bundles OpenRGB as a submodule instead, and
+	# compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2022-11-27 21:09 Andrew Ammerlaan
  0 siblings, 0 replies; 10+ messages in thread
From: Andrew Ammerlaan @ 2022-11-27 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     cea9a32d1acd79e89520b6aa6f6a550f3372af11
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 16:16:48 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:09:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea9a32d

app-misc/openrgb: update patch in 9999 ebuild

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28439
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 app-misc/openrgb/files/OpenRGB-0.8-plugins.patch | 26 ++++++++++++++++++++++++
 app-misc/openrgb/openrgb-9999.ebuild             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch
new file mode 100644
index 000000000000..a2d02cde3c7f
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch
@@ -0,0 +1,26 @@
+Allow installation of plugins not only in ~/.config
+
+Used by app-misc/openrgb-plugin-* packages
+
+diff --git a/PluginManager.cpp b/PluginManager.cpp
+index 6ccad72c..7b12f32e 100644
+--- a/PluginManager.cpp
++++ b/PluginManager.cpp
+@@ -41,7 +41,8 @@ void PluginManager::ScanAndLoadPlugins()
+     | The plugins directory is a directory named "plugins" in   |
+     | the configuration directory                               |
+     \*---------------------------------------------------------*/
+-    const QDir plugins_dir = QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path);
++    for (const QDir plugins_dir : {QString(ResourceManager::get()->GetConfigurationDirectory().c_str()).append(plugins_path),
++                                QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
+     LOG_INFO("[PluginManager] Scanning plugin directory: %s", plugins_dir.absolutePath().toStdString().c_str());
+ 
+     /*---------------------------------------------------------*\
+@@ -64,6 +65,7 @@ void PluginManager::ScanAndLoadPlugins()
+ 
+         AddPlugin(plugin_path);
+     }
++    }
+ }
+ 
+ void PluginManager::AddPlugin(std::string path)

diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 44c450e3c857..74083c048810 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 "
 
 PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.8-plugins.patch
 	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
 )
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2023-01-05 14:31 Maciej Barć
  0 siblings, 0 replies; 10+ messages in thread
From: Maciej Barć @ 2023-01-05 14:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c9408605ea2f070524181fddbc72f712d37fd944
Author:     Marco Scardovi <mscardovi <AT> icloud <DOT> com>
AuthorDate: Sat Dec 17 23:48:38 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=c9408605

app-misc/openrgb: add 0.8, update live-ebuild

Closes: https://bugs.gentoo.org/886486

Signed-off-by: Marco Scardovi <mscardovi <AT> icloud.com>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-misc/openrgb/Manifest                          |  1 +
 .../files/OpenRGB-0.8-drop-bundled-libs.patch      | 25 ++++++++++++++++++++++
 app-misc/openrgb/metadata.xml                      | 10 +++++++++
 .../{openrgb-9999.ebuild => openrgb-0.8.ebuild}    | 22 +++++++++++++------
 app-misc/openrgb/openrgb-9999.ebuild               | 22 +++++++++++++------
 5 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 2e2723147628..4b00e7ad8635 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1 +1,2 @@
 DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
+DIST OpenRGB-release_0.8.tar.bz2 28631365 BLAKE2B 3b328e38f1c52646da02b0b2b2c22b1285f3b31b0a2bc684e99d491d04bd14a91b49bc196b3b81b537320cd872e5568aaa8aec34744f4f15392d9424a81ac6f0 SHA512 d69686da7cab33099b13cfb5ab876fc2db047f79aa01bf8150507ec41321b4c6c092f81623823b89916c70a1a24c4a102f77b1001c5caa721ff4c0c52e0630d2

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
new file mode 100644
index 000000000000..ca3a96b441c7
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.8-drop-bundled-libs.patch
@@ -0,0 +1,25 @@
+From b8d2ff44ef16fb395c283d53a1fa723bff818a9a Mon Sep 17 00:00:00 2001
+From: Marco Scardovi <mscardovi@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/metadata.xml b/app-misc/openrgb/metadata.xml
index 05db5934398f..f2fe2a6805da 100644
--- a/app-misc/openrgb/metadata.xml
+++ b/app-misc/openrgb/metadata.xml
@@ -9,6 +9,16 @@
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
+	<longdescription lang="en">
+		One of the biggest complaints about RGB is the software ecosystem surrounding it.
+		Every manufacturer has their own app, their own brand, their own style.
+		If you want to mix and match devices, you end up with a ton of conflicting,
+		functionally identical apps competing for your background resources.
+		On top of that, these apps are proprietary and Windows-only.
+		Some even require online accounts. What if there was a way to control all of your
+		RGB devices from a single app, on both Windows and Linux, without any nonsense?
+		That is what OpenRGB sets out to achieve. One app to rule them all.
+	</longdescription>
 	<upstream>
 		<remote-id type="gitlab">CalcProgrammer1/OpenRGB</remote-id>
 	</upstream>

diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-0.8.ebuild
similarity index 75%
copy from app-misc/openrgb/openrgb-9999.ebuild
copy to app-misc/openrgb/openrgb-0.8.ebuild
index 343c012dd241..bed6c458262f 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qmake-utils udev
+inherit flag-o-matic qmake-utils udev xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -12,12 +12,10 @@ else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
 	KEYWORDS="~amd64 ~x86"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
+	PATCHES=( "${FILESDIR}"/OpenRGB-0.5-build-system.patch )
 fi
 
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+DESCRIPTION="Open source RGB lighting control"
 HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
 # subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
@@ -33,19 +31,24 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-cpp/cpp-httplib
 	dev-cpp/nlohmann_json
+	dev-libs/mdns
 "
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.8-drop-bundled-libs.patch
 )
 
 src_prepare() {
 	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
+	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+		|| die "Failed to remove unneded deps"
 }
 
 src_configure() {
@@ -54,6 +57,9 @@ src_configure() {
 	# compiles the .cpp file again.
 	append-ldflags -Wl,--export-dynamic
 
+	# > warning: ‘-pipe’ ignored because ‘-save-temps’ specified
+	filter-flags -pipe
+
 	eqmake5 \
 		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
 		DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
@@ -63,7 +69,9 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+
 	udev_dorules 60-openrgb.rules
+	rm -r "${ED}"/usr/lib/udev/ || die
 
 	# This is for plugins. Upstream doesn't install any headers at all.
 	insinto /usr/include/OpenRGB
@@ -71,9 +79,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	udev_reload
 }
 
 pkg_postrm() {
+	xdg_icon_cache_update
 	udev_reload
 }

diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 343c012dd241..bed6c458262f 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qmake-utils udev
+inherit flag-o-matic qmake-utils udev xdg-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -12,12 +12,10 @@ else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
 	KEYWORDS="~amd64 ~x86"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
+	PATCHES=( "${FILESDIR}"/OpenRGB-0.5-build-system.patch )
 fi
 
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+DESCRIPTION="Open source RGB lighting control"
 HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
 # subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
@@ -33,19 +31,24 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-cpp/cpp-httplib
 	dev-cpp/nlohmann_json
+	dev-libs/mdns
 "
 BDEPEND="
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.8-drop-bundled-libs.patch
 )
 
 src_prepare() {
 	default
-	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
+	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+		|| die "Failed to remove unneded deps"
 }
 
 src_configure() {
@@ -54,6 +57,9 @@ src_configure() {
 	# compiles the .cpp file again.
 	append-ldflags -Wl,--export-dynamic
 
+	# > warning: ‘-pipe’ ignored because ‘-save-temps’ specified
+	filter-flags -pipe
+
 	eqmake5 \
 		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
 		DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
@@ -63,7 +69,9 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+
 	udev_dorules 60-openrgb.rules
+	rm -r "${ED}"/usr/lib/udev/ || die
 
 	# This is for plugins. Upstream doesn't install any headers at all.
 	insinto /usr/include/OpenRGB
@@ -71,9 +79,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
 	udev_reload
 }
 
 pkg_postrm() {
+	xdg_icon_cache_update
 	udev_reload
 }


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2023-02-16 21:36 Maciej Barć
  0 siblings, 0 replies; 10+ messages in thread
From: Maciej Barć @ 2023-02-16 21:36 UTC (permalink / raw
  To: gentoo-commits

commit:     81132cfdb4283d8978f37e6c5057f979bfeb490b
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Thu Feb 16 20:40:59 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 21:36:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81132cfd

app-misc/openrgb: fix build on musl

Closes: https://bugs.gentoo.org/894558
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/29622
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-misc/openrgb/files/OpenRGB-0.8-includes.patch | 24 +++++++++++++++++++++++
 app-misc/openrgb/openrgb-0.8-r1.ebuild            |  1 +
 2 files changed, 25 insertions(+)

diff --git a/app-misc/openrgb/files/OpenRGB-0.8-includes.patch b/app-misc/openrgb/files/OpenRGB-0.8-includes.patch
new file mode 100644
index 000000000000..8ed341b06029
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.8-includes.patch
@@ -0,0 +1,24 @@
+From 8c893fba4fcec17e6221f2d754def4aa71b020b8 Mon Sep 17 00:00:00 2001
+From: Sirn Thanabulpong <sirn@ogsite.net>
+Date: Wed, 28 Dec 2022 00:49:47 +0900
+Subject: [PATCH] Fix build on musl in Nanoleaf settings
+
+---
+ qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
+index 1e3c926b3..55ed5fcaa 100644
+--- a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
++++ b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
+@@ -8,6 +8,7 @@
+ #else
+ #include <netdb.h>
+ #include <ifaddrs.h>
++#include <sys/select.h>
+ #endif
+ 
+ #include "mdns.h"
+-- 
+GitLab
+

diff --git a/app-misc/openrgb/openrgb-0.8-r1.ebuild b/app-misc/openrgb/openrgb-0.8-r1.ebuild
index 10549d214ac7..672546f43e85 100644
--- a/app-misc/openrgb/openrgb-0.8-r1.ebuild
+++ b/app-misc/openrgb/openrgb-0.8-r1.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.8-includes.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2023-03-28 23:07 Maciej Barć
  0 siblings, 0 replies; 10+ messages in thread
From: Maciej Barć @ 2023-03-28 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1435fff38b1905f33b72a2f2a300e96cb2ea26d0
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 22:53:44 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 23:07:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1435fff3

app-misc/openrgb: patch for GCC 13

Bug: https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/1743
Closes: https://bugs.gentoo.org/895428
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-misc/openrgb/files/openrgb-0.8-gcc-13.patch | 36 +++++++++++++++++++++++++
 app-misc/openrgb/openrgb-0.8-r1.ebuild          |  4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app-misc/openrgb/files/openrgb-0.8-gcc-13.patch b/app-misc/openrgb/files/openrgb-0.8-gcc-13.patch
new file mode 100644
index 000000000000..2a78d8f4ab5c
--- /dev/null
+++ b/app-misc/openrgb/files/openrgb-0.8-gcc-13.patch
@@ -0,0 +1,36 @@
+diff --git a/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp b/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp
+index 2bdc37ad695dfdc870cb912f17fffd54bda2b89b..17080edb896f74c9393049041c25347d38a8a6f5 100644
+--- a/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp
++++ b/Controllers/ENESMBusController/ENESMBusInterface/ENESMBusInterface_SpectrixS40G.cpp
+@@ -10,6 +10,7 @@
+ #include "ENESMBusInterface_SpectrixS40G.h"
+ #include <sys/ioctl.h>
+ #include <cstring>
++#include <cstdint>
+ 
+ /*---------------------------------------------------------------------*\
+ | Functions for submitting NVME admin passthrough command taken from    |
+diff --git a/Controllers/SteelSeriesController/SteelSeriesMouseController.h b/Controllers/SteelSeriesController/SteelSeriesMouseController.h
+index 64df7a1cc0351ccb8f306984c8b554f8eb3dcc6e..a4e561a3504c1def8acdd1921dc3955df7f68271 100644
+--- a/Controllers/SteelSeriesController/SteelSeriesMouseController.h
++++ b/Controllers/SteelSeriesController/SteelSeriesMouseController.h
+@@ -10,6 +10,7 @@
+ #include <hidapi/hidapi.h>
+ #include <vector>
+ #include "SteelSeriesGeneric.h"
++#include <cstdint>
+ 
+ #pragma once
+ 
+diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
+index 8f0cd4cdb637ea5f474b1caf587dc3c98c5dba89..367e9175b07548845696616aef86920ca2536bb4 100644
+--- a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
++++ b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
+@@ -11,6 +11,7 @@
+ #include <cstring>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstdint>
+ 
+ static void send_usb_msg(hid_device* dev, char * data_pkt, unsigned int size)
+ {

diff --git a/app-misc/openrgb/openrgb-0.8-r1.ebuild b/app-misc/openrgb/openrgb-0.8-r1.ebuild
index 672546f43e85..05c82b84efb7 100644
--- a/app-misc/openrgb/openrgb-0.8-r1.ebuild
+++ b/app-misc/openrgb/openrgb-0.8-r1.ebuild
@@ -18,7 +18,8 @@ fi
 DESCRIPTION="Open source RGB lighting control"
 HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
-# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+# subslot is OPENRGB_PLUGIN_API_VERSION from
+# https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
 SLOT="0/2"
 
 RDEPEND="
@@ -41,6 +42,7 @@ BDEPEND="
 "
 
 PATCHES+=(
+	"${FILESDIR}"/${PN}-0.8-gcc-13.patch
 	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
 	"${FILESDIR}"/OpenRGB-0.8-includes.patch
 )


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/
@ 2023-07-17 12:33 Maciej Barć
  0 siblings, 0 replies; 10+ messages in thread
From: Maciej Barć @ 2023-07-17 12:33 UTC (permalink / raw
  To: gentoo-commits

commit:     05730b64674c86435b207321bba02368658e9f37
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Jul 16 10:47:13 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 12:33:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05730b64

app-misc/openrgb: add 0.9

Closes: https://bugs.gentoo.org/910405
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-misc/openrgb/Manifest                          |  1 +
 .../openrgb/files/OpenRGB-0.9-build-system.patch   | 12 +++
 .../openrgb/files/OpenRGB-0.9-udev-check.patch     | 12 +++
 app-misc/openrgb/openrgb-0.9.ebuild                | 91 ++++++++++++++++++++++
 4 files changed, 116 insertions(+)

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index e0ff770dc389..eeeff9b27642 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1 +1,2 @@
 DIST OpenRGB-release_0.8.tar.bz2 28631365 BLAKE2B 3b328e38f1c52646da02b0b2b2c22b1285f3b31b0a2bc684e99d491d04bd14a91b49bc196b3b81b537320cd872e5568aaa8aec34744f4f15392d9424a81ac6f0 SHA512 d69686da7cab33099b13cfb5ab876fc2db047f79aa01bf8150507ec41321b4c6c092f81623823b89916c70a1a24c4a102f77b1001c5caa721ff4c0c52e0630d2
+DIST OpenRGB-release_0.9.tar.bz2 28689813 BLAKE2B 9fcf08d5e4d07ffc0f7867516f09044e18ce488bcdd99c8b44e0afe291b8a21a7ba92d6e7fd683ef22462a262004a992621efb59a5df6ed7551f4e9f75843241 SHA512 fb1bdbc7bcbd3bac888be313cfb6403a13d39de659ac6993858f9c1b17ad40e9c4a7d4c7c90682181841db1659a0ee298363c442a7120d43347aaf4485e7dccf

diff --git a/app-misc/openrgb/files/OpenRGB-0.9-build-system.patch b/app-misc/openrgb/files/OpenRGB-0.9-build-system.patch
new file mode 100644
index 000000000000..567e60787b72
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.9-build-system.patch
@@ -0,0 +1,12 @@
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -46,9 +46,6 @@ TEMPLATE    = app
+ #-----------------------------------------------------------------------------------------------#
+ win32:BUILDDATE = $$system(date /t)
+ unix:BUILDDATE  = $$system(date -R -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}")
+-GIT_COMMIT_ID   = $$system(git log -n 1 --pretty=format:"%H")
+-GIT_COMMIT_DATE = $$system(git log -n 1 --pretty=format:"%ci")
+-GIT_BRANCH      = $$system(git branch --show-current)
+ 
+ DEFINES +=                                                                                      \
+     VERSION_STRING=\\"\"\"$$VERSION\\"\"\"                                                      \

diff --git a/app-misc/openrgb/files/OpenRGB-0.9-udev-check.patch b/app-misc/openrgb/files/OpenRGB-0.9-udev-check.patch
new file mode 100644
index 000000000000..e3525c116baf
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.9-udev-check.patch
@@ -0,0 +1,12 @@
+We install udev to /lib/udev instead, which it doesn't check
+
+--- a/ResourceManager.cpp
++++ b/ResourceManager.cpp
+@@ -895,7 +895,6 @@ void ResourceManager::DetectDevicesThreadFunction()
+     {
+         if(access("/usr/lib/udev/rules.d/60-openrgb.rules", F_OK) != 0)
+         {
+-            udev_not_exist  = true;
+         }
+     }
+     else

diff --git a/app-misc/openrgb/openrgb-0.9.ebuild b/app-misc/openrgb/openrgb-0.9.ebuild
new file mode 100644
index 000000000000..0b3ebc85f6c8
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic qmake-utils udev xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~loong ~x86"
+	PATCHES=( "${FILESDIR}"/OpenRGB-0.9-build-system.patch )
+fi
+
+DESCRIPTION="Open source RGB lighting control"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+# subslot is OPENRGB_PLUGIN_API_VERSION from
+# https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/3"
+
+RDEPEND="
+	dev-cpp/cpp-httplib:=
+	dev-libs/hidapi
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/mbedtls:=
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+	dev-libs/mdns
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.9-udev-check.patch
+)
+
+src_prepare() {
+	default
+	rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+		|| die "Failed to remove unneded deps"
+}
+
+src_configure() {
+	# Some plugins require symbols defined in the main binary.
+	# The upstream build system of plugins bundles OpenRGB as a submodule
+	# instead, and compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	# > warning: ‘-pipe’ ignored because ‘-save-temps’ specified
+	filter-flags -pipe
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\"" \
+		LIBS+=-lhttplib
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	rm -r "${ED}"/usr/lib/udev/ || die
+	udev_dorules 60-openrgb.rules
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	udev_reload
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-07-17 12:33 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-08 23:13 [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/files/, app-misc/OpenRGB/ Patrick McLean
  -- strict thread matches above, loose matches on Subject: below --
2021-06-08 23:13 Patrick McLean
2021-06-22 23:00 [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/files/, app-misc/openrgb/ Patrick McLean
2021-09-22  0:05 Patrick McLean
2022-01-11 22:15 Patrick McLean
2022-11-27 21:09 Andrew Ammerlaan
2023-01-05 14:31 Maciej Barć
2023-02-16 21:36 Maciej Barć
2023-03-28 23:07 Maciej Barć
2023-07-17 12:33 Maciej Barć

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox