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 \
