* [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/, app-misc/OpenRGB/files/
@ 2020-07-20 4:31 Patrick McLean
0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2020-07-20 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 676d261eac853b090a1fd184fb0b1fb68453a9a2
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 04:30:59 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 04:31:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676d261e
app-misc/OpenRGB: New package
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/OpenRGB/Manifest | 1 +
app-misc/OpenRGB/OpenRGB-0.2.ebuild | 55 +++++++++++++++++++++
.../OpenRGB/files/OpenRGB-0.2-build-system.patch | 14 ++++++
app-misc/OpenRGB/files/OpenRGB-0.2-install.patch | 23 +++++++++
.../files/OpenRGB-0.2-use-system-hidapi.patch | 57 ++++++++++++++++++++++
app-misc/OpenRGB/metadata.xml | 8 +++
6 files changed, 158 insertions(+)
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
new file mode 100644
index 00000000000..951fffac07a
--- /dev/null
+++ b/app-misc/OpenRGB/Manifest
@@ -0,0 +1 @@
+DIST OpenRGB-0.2.tar.bz2 2064388 BLAKE2B 0001a4f66576cd26e04a87abb2f7d36df243c5d45b449f689a51d7523f6f26079622d58aa1f33166f52634326552ba1788344ff5f6034ceb9123dbc1eadb992b SHA512 06b5026c014674097c5f6b9ad54b1232f9aaa192663dd6324a402be8d12169e648b8ed4e748b4aebd970538519a88203621b45d8cb794fc0e6bae562e15c5f2b
diff --git a/app-misc/OpenRGB/OpenRGB-0.2.ebuild b/app-misc/OpenRGB/OpenRGB-0.2.ebuild
new file mode 100644
index 00000000000..c9b8a8b6db1
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils
+
+MY_P="${PN}-release_${PV}"
+COMMIT_HASH="13414ec9b84c299631e5100744f2b83923cba3c8"
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.2/${P}.tar.bz2"
+S="${WORKDIR}/${MY_P}-${COMMIT_HASH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/hidapi:=
+ dev-libs/libbsd:=
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtwidgets:5=
+ virtual/libusb:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+ "${FILESDIR}/OpenRGB-0.2-use-system-hidapi.patch"
+ "${FILESDIR}/OpenRGB-0.2-install.patch"
+)
+
+src_prepare() {
+ default
+ rm -rf dependencies/{hidapi,libusb}* || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ dodoc README.md
+
+ make_desktop_entry ${PN} ${PN} ${PN} 'System;Monitor;HardwareSettings;'
+}
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
new file mode 100644
index 00000000000..b2cd6cbd1d5
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
@@ -0,0 +1,14 @@
+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\\"\"\" \
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch
new file mode 100644
index 00000000000..745efe57b2c
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch
@@ -0,0 +1,23 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 9553b1f..fb4e4be 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -389,3 +389,18 @@ unix:SOURCES += \
+ RGBController/OpenRazerDetect.cpp \
+ RGBController/RGBController_Faustus.cpp \
+ RGBController/RGBController_OpenRazer.cpp \
++
++ #-------------------------------------------------------------------#
++ # Set up install paths #
++ # These install paths are used for AppImage and .deb packaging #
++ #-------------------------------------------------------------------#
++ isEmpty(PREFIX) {
++ PREFIX = /usr
++ }
++
++ target.path=$$PREFIX/bin/
++ desktop.path=$$PREFIX/share/applications/
++ desktop.files+=qt/OpenRGB.desktop
++ pixmap.path=$$PREFIX/share/pixmaps/
++ pixmap.files+=qt/OpenRGB.png
++ INSTALLS += target desktop pixmap
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch
new file mode 100644
index 00000000000..51ca8fca5cc
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch
@@ -0,0 +1,57 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 91e0079..306085b 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -23,7 +23,6 @@ RC_ICONS = qt/OpenRGB.ico
+
+ INCLUDEPATH += \
+ dependencies/ColorWheel \
+- dependencies/hidapi \
+ dependencies/libe131/src/ \
+ i2c_smbus/ \
+ i2c_tools/ \
+@@ -64,7 +63,6 @@ INCLUDEPATH += \
+
+ SOURCES += \
+ dependencies/ColorWheel/ColorWheel.cpp \
+- dependencies/hidapi/hidapi.c \
+ dependencies/libe131/src/e131.c \
+ main.cpp \
+ cli.cpp \
+@@ -288,6 +286,7 @@ FORMS += \
+ # Windows specific project configuration
+ #-----------------------------------------------
+ win32:INCLUDEPATH += \
++ dependencies/hidapi \
+ dependencies/inpout32_1501/Win32/ \
+ dependencies/libusb-1.0.22/include \
+ dependencies/NVFC \
+@@ -295,6 +294,7 @@ win32:INCLUDEPATH += \
+ wmi/ \
+
+ win32:SOURCES += \
++ dependencies/hidapi/hidapi.c \
+ dependencies/NVFC/nvapi.cpp \
+ i2c_smbus/i2c_smbus_i801.cpp \
+ i2c_smbus/i2c_smbus_nct6775.cpp \
+@@ -369,6 +369,20 @@ unix:LIBS += \
+ -lusb-1.0 \
+ -lstdc++fs \
+
++ #-------------------------------------------------------------------#
++ # Determine which hidapi to use based on availability #
++ #-------------------------------------------------------------------#
++ packagesExist(hidapi-libusb) {
++ LIBS += -lhidapi-libusb
++ } else {
++ packagesExist(hidapi) {
++ LIBS += -lhidapi
++ } else {
++ LIBS += -lhidapi-libusb
++ }
++ }
++
++
+ unix:SOURCES += \
+ i2c_smbus/i2c_smbus_linux.cpp \
+ serial_port/find_usb_serial_port_linux.cpp \
diff --git a/app-misc/OpenRGB/metadata.xml b/app-misc/OpenRGB/metadata.xml
new file mode 100644
index 00000000000..cee379b1540
--- /dev/null
+++ b/app-misc/OpenRGB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/, app-misc/OpenRGB/files/
@ 2020-07-28 1:33 Patrick McLean
0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2020-07-28 1:33 UTC (permalink / raw
To: gentoo-commits
commit: c7de1a67c9ee6cc9645a674b3c7d93eb99167abc
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 01:33:03 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 01:33:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7de1a67
app-misc/OpenRGB-0.3: Version bump
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/OpenRGB/Manifest | 2 +-
.../{OpenRGB-0.2.ebuild => OpenRGB-0.3.ebuild} | 10 ++--
app-misc/OpenRGB/files/OpenRGB-0.2-install.patch | 23 ---------
.../files/OpenRGB-0.2-use-system-hidapi.patch | 57 ----------------------
4 files changed, 4 insertions(+), 88 deletions(-)
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index 951fffac07a..436a2c36c15 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1 +1 @@
-DIST OpenRGB-0.2.tar.bz2 2064388 BLAKE2B 0001a4f66576cd26e04a87abb2f7d36df243c5d45b449f689a51d7523f6f26079622d58aa1f33166f52634326552ba1788344ff5f6034ceb9123dbc1eadb992b SHA512 06b5026c014674097c5f6b9ad54b1232f9aaa192663dd6324a402be8d12169e648b8ed4e748b4aebd970538519a88203621b45d8cb794fc0e6bae562e15c5f2b
+DIST OpenRGB-0.3.tar.bz2 2153970 BLAKE2B 2b913fd867cfd2d856d70d15ec91abd6a6d2822b367bc72f8f4275784793474beab4f442bc1af0ec3c3f33630b2f6b09d490d4f326fa4dbc4dbe11e4944cbc6f SHA512 629eb654636051b18da0f49cccf4e35dbe11a1373941cd355b27492b8382c113637d80039fa7aa749ae3f36bf838ad4da8da00f5abf5a0b8910be0ad1ecd999c
diff --git a/app-misc/OpenRGB/OpenRGB-0.2.ebuild b/app-misc/OpenRGB/OpenRGB-0.3.ebuild
similarity index 75%
rename from app-misc/OpenRGB/OpenRGB-0.2.ebuild
rename to app-misc/OpenRGB/OpenRGB-0.3.ebuild
index c9b8a8b6db1..eb6dc109ba4 100644
--- a/app-misc/OpenRGB/OpenRGB-0.2.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-0.3.ebuild
@@ -3,14 +3,14 @@
EAPI=7
-inherit desktop qmake-utils
+inherit qmake-utils
MY_P="${PN}-release_${PV}"
-COMMIT_HASH="13414ec9b84c299631e5100744f2b83923cba3c8"
+COMMIT_HASH="308bb6f9b8169c8e1c5123f9499373509f140268"
DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
-SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.2/${P}.tar.bz2"
+SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/${P}.tar.bz2"
S="${WORKDIR}/${MY_P}-${COMMIT_HASH}"
LICENSE="GPL-2"
@@ -33,8 +33,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/OpenRGB-0.2-build-system.patch"
- "${FILESDIR}/OpenRGB-0.2-use-system-hidapi.patch"
- "${FILESDIR}/OpenRGB-0.2-install.patch"
)
src_prepare() {
@@ -50,6 +48,4 @@ src_install() {
emake INSTALL_ROOT="${D}" install
dodoc README.md
-
- make_desktop_entry ${PN} ${PN} ${PN} 'System;Monitor;HardwareSettings;'
}
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch
deleted file mode 100644
index 745efe57b2c..00000000000
--- a/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/OpenRGB.pro b/OpenRGB.pro
-index 9553b1f..fb4e4be 100644
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -389,3 +389,18 @@ unix:SOURCES += \
- RGBController/OpenRazerDetect.cpp \
- RGBController/RGBController_Faustus.cpp \
- RGBController/RGBController_OpenRazer.cpp \
-+
-+ #-------------------------------------------------------------------#
-+ # Set up install paths #
-+ # These install paths are used for AppImage and .deb packaging #
-+ #-------------------------------------------------------------------#
-+ isEmpty(PREFIX) {
-+ PREFIX = /usr
-+ }
-+
-+ target.path=$$PREFIX/bin/
-+ desktop.path=$$PREFIX/share/applications/
-+ desktop.files+=qt/OpenRGB.desktop
-+ pixmap.path=$$PREFIX/share/pixmaps/
-+ pixmap.files+=qt/OpenRGB.png
-+ INSTALLS += target desktop pixmap
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch
deleted file mode 100644
index 51ca8fca5cc..00000000000
--- a/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/OpenRGB.pro b/OpenRGB.pro
-index 91e0079..306085b 100644
---- a/OpenRGB.pro
-+++ b/OpenRGB.pro
-@@ -23,7 +23,6 @@ RC_ICONS = qt/OpenRGB.ico
-
- INCLUDEPATH += \
- dependencies/ColorWheel \
-- dependencies/hidapi \
- dependencies/libe131/src/ \
- i2c_smbus/ \
- i2c_tools/ \
-@@ -64,7 +63,6 @@ INCLUDEPATH += \
-
- SOURCES += \
- dependencies/ColorWheel/ColorWheel.cpp \
-- dependencies/hidapi/hidapi.c \
- dependencies/libe131/src/e131.c \
- main.cpp \
- cli.cpp \
-@@ -288,6 +286,7 @@ FORMS += \
- # Windows specific project configuration
- #-----------------------------------------------
- win32:INCLUDEPATH += \
-+ dependencies/hidapi \
- dependencies/inpout32_1501/Win32/ \
- dependencies/libusb-1.0.22/include \
- dependencies/NVFC \
-@@ -295,6 +294,7 @@ win32:INCLUDEPATH += \
- wmi/ \
-
- win32:SOURCES += \
-+ dependencies/hidapi/hidapi.c \
- dependencies/NVFC/nvapi.cpp \
- i2c_smbus/i2c_smbus_i801.cpp \
- i2c_smbus/i2c_smbus_nct6775.cpp \
-@@ -369,6 +369,20 @@ unix:LIBS += \
- -lusb-1.0 \
- -lstdc++fs \
-
-+ #-------------------------------------------------------------------#
-+ # Determine which hidapi to use based on availability #
-+ #-------------------------------------------------------------------#
-+ packagesExist(hidapi-libusb) {
-+ LIBS += -lhidapi-libusb
-+ } else {
-+ packagesExist(hidapi) {
-+ LIBS += -lhidapi
-+ } else {
-+ LIBS += -lhidapi-libusb
-+ }
-+ }
-+
-+
- unix:SOURCES += \
- i2c_smbus/i2c_smbus_linux.cpp \
- serial_port/find_usb_serial_port_linux.cpp \
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/, app-misc/OpenRGB/files/
@ 2020-12-11 18:37 Patrick McLean
0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2020-12-11 18:37 UTC (permalink / raw
To: gentoo-commits
commit: b55e4172724289ad70018689f7af10fb0e7d4b6c
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri Dec 11 15:04:32 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 18:36:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b55e4172
app-misc/OpenRGB: version 0.5
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/18609
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/OpenRGB/Manifest | 1 +
.../OpenRGB/{OpenRGB-9999.ebuild => OpenRGB-0.5.ebuild} | 9 ++-------
app-misc/OpenRGB/OpenRGB-9999.ebuild | 9 ++-------
app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch | 13 +++++++++++++
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index be8a7c45393..c2ca31416fa 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1 +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
diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-0.5.ebuild
similarity index 87%
copy from app-misc/OpenRGB/OpenRGB-9999.ebuild
copy to app-misc/OpenRGB/OpenRGB-0.5.ebuild
index 1499b76f727..6c5d8e23cd0 100644
--- a/app-misc/OpenRGB/OpenRGB-9999.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-0.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit qmake-utils udev
+inherit qmake-utils
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -18,7 +18,6 @@ DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacture
HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="udev"
RDEPEND="
dev-libs/hidapi:=
@@ -39,7 +38,7 @@ src_prepare() {
default
rm -r dependencies/{hidapi,libusb,json}* || die
if [[ ${PV} != *9999* ]]; then
- eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+ eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch"
fi
}
@@ -51,8 +50,4 @@ 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/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-9999.ebuild
index 1499b76f727..6c5d8e23cd0 100644
--- a/app-misc/OpenRGB/OpenRGB-9999.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit qmake-utils udev
+inherit qmake-utils
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -18,7 +18,6 @@ DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacture
HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="udev"
RDEPEND="
dev-libs/hidapi:=
@@ -39,7 +38,7 @@ src_prepare() {
default
rm -r dependencies/{hidapi,libusb,json}* || die
if [[ ${PV} != *9999* ]]; then
- eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+ eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch"
fi
}
@@ -51,8 +50,4 @@ 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.5-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch
new file mode 100644
index 00000000000..fe805988af5
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch
@@ -0,0 +1,13 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 91e0079..7f279dd 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -26,8 +26,5 @@ TEMPLATE = app
+ win32:BUILDDATE = $$system(date /t)
+ unix:BUILDDATE = $$system(date -R -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}")
+-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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/
@ 2022-08-26 23:57 Patrick McLean
0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2022-08-26 23:57 UTC (permalink / raw
To: gentoo-commits
commit: aef9f1c95eb175d285128d28aada26dc29d3f762
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Aug 22 23:43:14 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 23:57:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef9f1c9
app-misc/openrgb: drop old
Package-Manager: Portage-3.0.30, 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.6-pkgconf.patch | 11 ----
app-misc/openrgb/files/OpenRGB-0.6-plugins.patch | 24 --------
app-misc/openrgb/openrgb-0.6-r1.ebuild | 75 ------------------------
4 files changed, 111 deletions(-)
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 7b8c113774cc..2e2723147628 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1,2 +1 @@
-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.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/openrgb-0.6-r1.ebuild b/app-misc/openrgb/openrgb-0.6-r1.ebuild
deleted file mode 100644
index b53579dca202..000000000000
--- a/app-misc/openrgb/openrgb-0.6-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-SLOT="0/1"
-
-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
- "${FILESDIR}"/OpenRGB-0.6-plugins.patch
-)
-
-src_prepare() {
- default
- rm -r dependencies/{hidapi,libusb,json}* || 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
- 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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/
@ 2022-08-26 23:57 Patrick McLean
0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2022-08-26 23:57 UTC (permalink / raw
To: gentoo-commits
commit: e8d6ff8b97cc3de656480dc68436973c9572e877
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue Aug 23 00:00:59 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 23:57:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d6ff8b
app-misc/openrgb: use udev eclass
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://bugs.gentoo.org/854762
Closes: https://github.com/gentoo/gentoo/pull/26969
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
app-misc/openrgb/files/OpenRGB-0.7-r1-udev.patch | 15 +++++++++++++++
.../{openrgb-9999.ebuild => openrgb-0.7-r1.ebuild} | 14 ++++++++++++--
app-misc/openrgb/openrgb-9999.ebuild | 13 +++++++++++--
3 files changed, 38 insertions(+), 4 deletions(-)
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-9999.ebuild b/app-misc/openrgb/openrgb-0.7-r1.ebuild
similarity index 89%
copy from app-misc/openrgb/openrgb-9999.ebuild
copy to app-misc/openrgb/openrgb-0.7-r1.ebuild
index f9e079015112..f3ee7086508d 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-0.7-r1.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,8 @@ BDEPEND="
PATCHES+=(
"${FILESDIR}"/OpenRGB-0.7-plugins.patch
- "${FILESDIR}"/OpenRGB-0.7-udev.patch
+ "${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
+ "${FILESDIR}"/OpenRGB-0.7-json.patch
)
src_prepare() {
@@ -64,8 +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
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-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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/
@ 2022-08-26 23:57 Patrick McLean
0 siblings, 0 replies; 8+ messages in thread
From: Patrick McLean @ 2022-08-26 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 4afe1169372beb379f024cc5acdcdb2c48b6fe8b
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Aug 22 23:42:01 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 23:56:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4afe1169
app-misc/openrgb: fix build with dev-cpp/nlohmann_json-3.11.2
Closes: https://bugs.gentoo.org/865133
Package-Manager: Portage-3.0.30, 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-json.patch | 24 ++++++++++++++++++++++++
app-misc/openrgb/openrgb-0.7.ebuild | 1 +
2 files changed, 25 insertions(+)
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/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() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/
@ 2022-11-27 21:58 Andrew Ammerlaan
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Ammerlaan @ 2022-11-27 21:58 UTC (permalink / raw
To: gentoo-commits
commit: 56efce0ab4bc8d710e1abe8aca25689c7667a765
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:57:50 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:58:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56efce0a
app-misc/openrgb: update 9999 again, patch merged upstream
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 | 3 +--
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch
deleted file mode 100644
index a2d02cde3c7f..000000000000
--- a/app-misc/openrgb/files/OpenRGB-0.8-plugins.patch
+++ /dev/null
@@ -1,26 +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 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 74083c048810..343c012dd241 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -40,7 +40,6 @@ BDEPEND="
"
PATCHES+=(
- "${FILESDIR}"/OpenRGB-0.8-plugins.patch
"${FILESDIR}"/OpenRGB-0.7-r1-udev.patch
)
@@ -57,7 +56,7 @@ src_configure() {
eqmake5 \
INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
- DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
+ DEFINES+="OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
}
src_install() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/
@ 2023-01-05 14:31 Maciej Barć
0 siblings, 0 replies; 8+ messages in thread
From: Maciej Barć @ 2023-01-05 14:31 UTC (permalink / raw
To: gentoo-commits
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 <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/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() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-01-05 14:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-28 1:33 [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/, app-misc/OpenRGB/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2023-01-05 14:31 [gentoo-commits] repo/gentoo:master commit in: app-misc/openrgb/, app-misc/openrgb/files/ Maciej Barć
2022-11-27 21:58 Andrew Ammerlaan
2022-08-26 23:57 Patrick McLean
2022-08-26 23:57 Patrick McLean
2022-08-26 23:57 Patrick McLean
2020-12-11 18:37 [gentoo-commits] repo/gentoo:master commit in: app-misc/OpenRGB/, app-misc/OpenRGB/files/ Patrick McLean
2020-07-20 4:31 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox