gentoo auto-resync : 27:08:2022 - 02:53:16

8 files changed, 77 insertions, 58 deletions

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 76f777ca28b2..4792c2b9933e 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1,11 +1,10 @@
 AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e09381a62ceaa58413b0aaa28017b6e860d032ab6ceb84f1140dc7f6c23dfecc1cadbcf696c8f872016307ea34d8870dc SHA512 50e110c01833113504a3a64e438a404196ae0af8e75007d6c42f3fcab5c20468f3fcb80f83d1f98ac7e1f4f88b1808ee28d0bf342b416d581c354a2388af32bf
-AUX OpenRGB-0.6-pkgconf.patch 709 BLAKE2B eec83247caac6527f0c0ca80716fc3fc3266cdca9635f643968bb620be3a03f3d3030c97e0c68af8e77a03725eaa46f7393667ceb72a63a665947ae87242afc8 SHA512 0436714eb4e900caa421dba2b3fcba41826ab74ed8f2e42884c48006f4af31fe10a114e84c41212343911b5f52804a27b031410fc55fe234138905779db4cf6b
-AUX OpenRGB-0.6-plugins.patch 1002 BLAKE2B 42bb7a51876603003a8cf84759754201a92ae50b6a1d6c3b234ca7a49ad0ad00a6dd6d8dc9e068cd7d865d90cbde6a4a9794845a200e06ca5cfe530d37505dd2 SHA512 6d590398dcc65db8720577e83fe8a11a46f7b0be485f1caf227148250450d936599b4ccc47df8b6f8676676cccfcfdf5ad7f02ad76ca415eb0a9c40a58970cbb
+AUX OpenRGB-0.7-json.patch 1408 BLAKE2B ab7a3eb14163db51cccebc9daa1d6e8a6373992381c1caadbd512bb184cb1ad6f44dfbb45eeed8b37bbbbed6e9a4670925ad6c42e24576b85b2be65f73c07707 SHA512 8e22c50ef73e238e4d499a8199224c7f5ec3d332ca7754011ecbaaa3a785481ec782c7225bdcd8252e10b30b08e938f406f8ab1d8eefc72fed2dd13921f580f6
 AUX OpenRGB-0.7-plugins.patch 1035 BLAKE2B 46025eea33f9cbef73994ea25284e05a7dc1848a7a9f2d60d9e173a5e6f40d98d1a0346d75fb5bf2bb05803bfafa1f3a94bb15a7feee25743565644370cc58fb SHA512 2a098ff5ec43347ed91ac43971e50872461a23762124ac252573b602236ced309c94e9a58b8667a52c85a06dd85eb519a1ee0aa7c8ecd577713a28d456db1c14
+AUX OpenRGB-0.7-r1-udev.patch 410 BLAKE2B 10e4ba5cc32abed1c5c6bf15426033b03c36929d0d54d247235793193d8e0df26dbd10e1a63edb626a88fbbc5b532f00fac997589afb8885205dad2f53022378 SHA512 0714dc6432fa0d75a8867079d6056f6dc35b98dd62da512643df8649cb2e6bf8de85408485e2b47b2707efef8727789549a216c8adf72447fd084320b1a8e931
 AUX OpenRGB-0.7-udev.patch 515 BLAKE2B c535efa9d6fbc5b0f56eb9914ca9c23d3d431f2d98b7d3bdee60bbb0abdb67eb5e21b75be9ec9226e8de1def3136d89175f0500e83ec97b3a23ad1ec1e5929ca SHA512 11c09942811077134c78fd916ab842c39361214888d13187071a2bbf8112f995915b491fd8e8574a5cb59b02d70477ac0ecf42592d433ec24feffe194f7a0534
-DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
 DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
-EBUILD openrgb-0.6-r1.ebuild 1831 BLAKE2B 3b56b2846aed9d03f6bbc2338063643ea50df986ed0912abbcebc85c22d44ea4d7fd87bbcc5aa9a16599697e09cc221d1ee4cfacd72317abfcce8b1ac9f66f93 SHA512 49ac7263ac9fe57e160f4743d6f712571305504bfa5a498ea17ef37dedfe48906e989f9d20a86a9d8de7dc9af7010bf6555001699f7821e780c2233cd18c8bb3
-EBUILD openrgb-0.7.ebuild 1864 BLAKE2B ed92c07073ce4286b0d0665365eaf562ee72f06ce4fc866773b214eac6a9ea2f704199eb15f2d76e4263646849c0fbfc311c4e518f3a6e7f938af73c746d2033 SHA512 2610f441cc2c169ea8a80d6055153e1677bb8183140a08e74bbd580fa917e2d8b1daebf8e1e86124928a8dca1fe73426419666f88dd06d3c43292242210e7a2a
-EBUILD openrgb-9999.ebuild 1865 BLAKE2B db8ba0bbc8b78e1d9fb4c375b3e234efda4056e2ea23069ff68d42a3bdb42f1e2b1baf03306aca93e2881605246d10bf52ef364bc3a5366a4a3e00af05cef9b4 SHA512 69782bcb0497ad92b33dda1300b80c4beb178cb7fd058f9d02d962f2eaa8ce53ce39c796ee1de2ec7a14e1356edc4332949a43f6bfdcaf7c55eb03d4be018d21
+EBUILD openrgb-0.7-r1.ebuild 2006 BLAKE2B 953f14e0cc8d84cf10bfcb6a01847498f49c4e3dcfdf364d8f550c74f4c4e05760fa5d43d621b88a04234f544d2de30d0c92ec481a56aea07c5d580436418457 SHA512 691fdbbe73f6cf18644ab30a4843c2bb031519d5b3bcbae6957c38c1b1714280bcb1e9193d677289090707c53e772e136c4158ecf185c757960174db05b6b5e6
+EBUILD openrgb-0.7.ebuild 1902 BLAKE2B 9c8a21faeb59e409f2957a05aaa5d86d79caaf32d80ee15720789cc445e6ad87c8d1c4c2d3dca7be2e714e9d69bee6cd0edc7372e1b8f7ab4266fbdc13a2b190 SHA512 adba8992c77da14cdcd8739b4f0d97eb8581edc6756611091c27decab37182aaa64d4d6c265b32aee942a3dcb8a7972857a7b85b6bf3896731f198a0628f8004
+EBUILD openrgb-9999.ebuild 1968 BLAKE2B 393382b51ae04f6859c5c670fae696aefe1dec28b47ffb2723b7c43355b1cf9f1bc77b91482ed22ce21dc08f87182f6b5a22e5333221e18ccc305dc83b147731 SHA512 7d8ff8cc9929da7cd09de6c2d0526ef3891489b2f560c0a7223c388dcdae6cea586a4c1f38163bb52ef819d1e8860011e034615869852f34d64611b8f349ee39
 MISC metadata.xml 469 BLAKE2B 39e7ed78f80bb0d2123efb9c94032ef7df8c514e29528f658f6865ab80f3734e7767108fc787c153dfc0df6c8ffa413fc1fdddb7da25e68cd2537c3d4ddbfe81 SHA512 de37a252c6697a9dacf486e71619b0f5fe895c67d48c55c71233b0082495662120a141cae683206293781b886526e92f0b48c91c30f2a536502cb6bd1e880c9a
diff --git a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
deleted file mode 100644
index 380b1091d225..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-         }
diff --git a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
deleted file mode 100644
index ccc83de27ebe..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/OpenRGB-0.7-json.patch b/app-misc/openrgb/files/OpenRGB-0.7-json.patch
new file mode 100644
index 000000000000..32474f545dd0
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-json.patch
@@ -0,0 +1,24 @@
+Fix build with dev-cpp/nlohmann_json-3.11.2
+    
+https://bugs.gentoo.org/865133
+https://gitlab.com/CalcProgrammer1/OpenRGB/-/merge_requests/1376
+--- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
++++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp
+@@ -329,7 +329,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
+     }
+     else
+     {
+-        for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items())
++        for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& it : device_settings[SectionLayout].items())
+         {
+             MBName2Layout.insert( std::pair<std::string, std::string>(it.key(), it.value() ));
+         }
+@@ -380,7 +380,7 @@ void RGBController_RGBFusion2USB::Load_Device_Config()
+             json json_HCL = device_settings[SectionCustom]["Data"];
+             layout.clear();
+ 
+-            for(nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items())
++            for(const nlohmann::detail::iteration_proxy_value<nlohmann::detail::iter_impl<nlohmann::json>>& json_layout_it : json_HCL.items())
+             {
+                 json json_zl = json_layout_it.value();
+                 std::vector<LedPort> v_lp;
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch
new file mode 100644
index 000000000000..54646dc66a50
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch
@@ -0,0 +1,15 @@
+Don't install udev rules
+
+This is handled by udev eclass instead
+
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -1246,7 +1246,5 @@ unix:!macx {
+     icon.files+=qt/OpenRGB.png
+     metainfo.path=$$PREFIX/share/metainfo/
+     metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
+-    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.6-r1.ebuild b/app-misc/openrgb/openrgb-0.7-r1.ebuild
index b53579dca202..f3ee7086508d 100644
--- a/app-misc/openrgb/openrgb-0.6-r1.ebuild
+++ b/app-misc/openrgb/openrgb-0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils udev
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -20,13 +20,15 @@ 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"
-SLOT="0/1"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
 
 RDEPEND="
-	dev-libs/hidapi:=
+	dev-libs/hidapi
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	net-libs/mbedtls:=
 	virtual/libusb:1
 "
 DEPEND="
@@ -38,13 +40,14 @@ BDEPEND="
 "
 
 PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
-	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+	"${FILESDIR}"/OpenRGB-0.7-json.patch
 )
 
 src_prepare() {
 	default
-	rm -r dependencies/{hidapi,libusb,json}* || die
+	rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die
 }
 
 src_configure() {
@@ -62,14 +65,17 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+	udev_dorules 60-openrgb.rules
 
 	# 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
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
 }
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
index bbc124653d95..a8ef5e62540f 100644
--- a/app-misc/openrgb/openrgb-0.7.ebuild
+++ b/app-misc/openrgb/openrgb-0.7.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
 	"${FILESDIR}"/OpenRGB-0.7-udev.patch
+	"${FILESDIR}"/OpenRGB-0.7-json.patch
 )
 
 src_prepare() {
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index f9e079015112..44c450e3c857 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
+inherit flag-o-matic qmake-utils udev
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -41,7 +41,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
-	"${FILESDIR}"/OpenRGB-0.7-udev.patch
+	"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
 )
 
 src_prepare() {
@@ -64,8 +64,17 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+	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() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}