Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/
Date: Sat, 27 Aug 2022 23:11:53
Message-Id: 1661558221.aef9f1c95eb175d285128d28aada26dc29d3f762.chutzpah@gentoo
1 commit: aef9f1c95eb175d285128d28aada26dc29d3f762
2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
3 AuthorDate: Mon Aug 22 23:43:14 2022 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 26 23:57:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef9f1c9
7
8 app-misc/openrgb: drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 app-misc/openrgb/Manifest | 1 -
15 app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch | 11 ----
16 app-misc/openrgb/files/OpenRGB-0.6-plugins.patch | 24 --------
17 app-misc/openrgb/openrgb-0.6-r1.ebuild | 75 ------------------------
18 4 files changed, 111 deletions(-)
19
20 diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
21 index 7b8c113774cc..2e2723147628 100644
22 --- a/app-misc/openrgb/Manifest
23 +++ b/app-misc/openrgb/Manifest
24 @@ -1,2 +1 @@
25 -DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
26 DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
27
28 diff --git a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
29 deleted file mode 100644
30 index 380b1091d225..000000000000
31 --- a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
32 +++ /dev/null
33 @@ -1,11 +0,0 @@
34 ---- a/OpenRGB.pro 2021-06-06 22:51:12.022561718 +0100
35 -+++ b/OpenRGB.pro 2021-06-06 22:51:24.466105358 +0100
36 -@@ -837,7 +837,7 @@ unix:!macx {
37 - # hidapi-hidraw >= 0.10.1 supports USAGE/USAGE_PAGE #
38 - # Define USE_HID_USAGE if hidapi-hidraw supports it #
39 - #---------------------------------------------------------------------------------------#
40 -- HIDAPI_HIDRAW_VERSION = $$system(pkgconf --modversion hidapi-hidraw)
41 -+ HIDAPI_HIDRAW_VERSION = $$system(pkg-config --modversion hidapi-hidraw)
42 - if(versionAtLeast(HIDAPI_HIDRAW_VERSION, "0.10.1")) {
43 - DEFINES += USE_HID_USAGE
44 - }
45
46 diff --git a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
47 deleted file mode 100644
48 index ccc83de27ebe..000000000000
49 --- a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
50 +++ /dev/null
51 @@ -1,24 +0,0 @@
52 -Allow installation of plugins not only in ~/.config
53 -
54 -Used by app-misc/openrgb-plugin-* packages
55 -
56 -diff --git a/PluginManager.cpp b/PluginManager.cpp
57 -index b424b8b..991fb75 100644
58 ---- a/PluginManager.cpp
59 -+++ b/PluginManager.cpp
60 -@@ -15,7 +15,8 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
61 - \*--------------------------------------------------------------------------------------*/
62 - OpenRGBPluginInterface *OpenRGBPlugin = nullptr;
63 -
64 -- const QDir pluginsDir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
65 -+ for (const QDir pluginsDir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
66 -+ QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
67 -
68 - std::vector<std::string> FileList;
69 -
70 -@@ -54,4 +56,5 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
71 - std::cout << loader.errorString().toStdString() << std::endl;
72 - }
73 - }
74 -+ }
75 - }
76
77 diff --git a/app-misc/openrgb/openrgb-0.6-r1.ebuild b/app-misc/openrgb/openrgb-0.6-r1.ebuild
78 deleted file mode 100644
79 index b53579dca202..000000000000
80 --- a/app-misc/openrgb/openrgb-0.6-r1.ebuild
81 +++ /dev/null
82 @@ -1,75 +0,0 @@
83 -# Copyright 2020-2021 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=7
87 -
88 -inherit flag-o-matic qmake-utils
89 -
90 -if [[ ${PV} == *9999* ]]; then
91 - inherit git-r3
92 - EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
93 -else
94 - SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
95 - S="${WORKDIR}/OpenRGB-release_${PV}"
96 - KEYWORDS="~amd64 ~x86"
97 - PATCHES=(
98 - "${FILESDIR}"/OpenRGB-0.5-build-system.patch
99 - )
100 -fi
101 -
102 -DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
103 -HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
104 -LICENSE="GPL-2"
105 -SLOT="0/1"
106 -
107 -RDEPEND="
108 - dev-libs/hidapi:=
109 - dev-qt/qtcore:5
110 - dev-qt/qtgui:5
111 - dev-qt/qtwidgets:5
112 - virtual/libusb:1
113 -"
114 -DEPEND="
115 - ${RDEPEND}
116 - dev-cpp/nlohmann_json
117 -"
118 -BDEPEND="
119 - virtual/pkgconfig
120 -"
121 -
122 -PATCHES+=(
123 - "${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
124 - "${FILESDIR}"/OpenRGB-0.6-plugins.patch
125 -)
126 -
127 -src_prepare() {
128 - default
129 - rm -r dependencies/{hidapi,libusb,json}* || die
130 -}
131 -
132 -src_configure() {
133 - # Some plugins require symbols defined in the main binary.
134 - # The official build system bundles OpenRGB as a submodule instead, and
135 - # compiles the .cpp file again.
136 - append-ldflags -Wl,--export-dynamic
137 -
138 - eqmake5 \
139 - INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
140 - DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
141 -}
142 -
143 -src_install() {
144 - emake INSTALL_ROOT="${ED}" install
145 -
146 - dodoc README.md OpenRGB.patch
147 -
148 - # This is for plugins. Upstream doesn't install any headers at all.
149 - insinto /usr/include/OpenRGB
150 - doins *.h
151 - insinto /usr/include/OpenRGB/RGBController
152 - doins RGBController/*.h
153 - insinto /usr/include/OpenRGB/i2c_smbus
154 - doins i2c_smbus/*.h
155 - insinto /usr/include/OpenRGB/net_port
156 - doins net_port/*.h
157 -}