commit:     e09258cf109ccecad290e58d8d85d89650b1b031
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Sep 15 22:46:56 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 17 21:20:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09258cf

app-misc/openrgb: add 1.0_rc2

Bug: https://bugs.gentoo.org/942035
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/43803
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-misc/openrgb/Manifest                                     |  1 +
 .../openrgb/{openrgb-9999.ebuild => openrgb-1.0_rc2.ebuild}   | 11 +++++++----
 app-misc/openrgb/openrgb-9999.ebuild                          | 11 +++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 13e88421e839..e4c89cd1f568 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1,3 +1,4 @@
 DIST OpenRGB-0.9-odr.patch 90600 BLAKE2B 
1cb0aaab997da90b5cf6fbf1e971cef6848d4372ba021d27efed070ff2c398074d7b79623a1669995bbdaaacae1c5a9ff09344ef0cab7098e9354f95d005b856
 SHA512 
5f2a5194419d14b97dc2e8ca47a2b9914c01148cfb24d61266a8a9615f6d09509906d7e69d8264ddbde71474955f789925b400f29682d12779c2a3d38a4bd6eb
 DIST OpenRGB-90c1e10cc59f4ba203bc797d75315885a32dddab.tar.bz2 10276845 BLAKE2B 
2f8645575a1848f3341404f01ffe85025577198aed260ac19b8f4e512474a3fa3bb99ca5672bbe873daea3a68958b95e2fe00610470913dbace3cc2ddeab1b95
 SHA512 
e713b3ba629ddf610f58f59b8a843ed8b2a2bb2997698913de0cb34f07d7ff9af0e4ad6f47e82a4f7f0378dfa6dcffde72ae8a5d57238f513321cd4df5a2c0f7
 DIST OpenRGB-release_0.9.tar.bz2 28689813 BLAKE2B 
9fcf08d5e4d07ffc0f7867516f09044e18ce488bcdd99c8b44e0afe291b8a21a7ba92d6e7fd683ef22462a262004a992621efb59a5df6ed7551f4e9f75843241
 SHA512 
fb1bdbc7bcbd3bac888be313cfb6403a13d39de659ac6993858f9c1b17ad40e9c4a7d4c7c90682181841db1659a0ee298363c442a7120d43347aaf4485e7dccf
+DIST OpenRGB-release_candidate_1.0rc2.tar.bz2 10326188 BLAKE2B 
72188e13dff896815ba65426df0badc36d50180a62c33d341a793ff2530a975ae0ba449fc3c1b82e0fb0829d3e22c1af10d0cf070d52d8049f2142614a3a6a5b
 SHA512 
2d5a1b21ad03b2e5f90a826c4b5ffdc39802fa257bdc8a5e56b18a52c3fd6178bb961d1969c9629a3a5c8dcf5807689d957bd9200ce993e88e7cb1024f3dacbf

diff --git a/app-misc/openrgb/openrgb-9999.ebuild 
b/app-misc/openrgb/openrgb-1.0_rc2.ebuild
similarity index 87%
copy from app-misc/openrgb/openrgb-9999.ebuild
copy to app-misc/openrgb/openrgb-1.0_rc2.ebuild
index d9e43df8bdc7..58788810ca41 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-1.0_rc2.ebuild
@@ -9,8 +9,9 @@ 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}"
+       MY_PV=$(ver_rs 2 "")
+       
SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_candidate_${MY_PV}/OpenRGB-release_candidate_${MY_PV}.tar.bz2";
+       S="${WORKDIR}/OpenRGB-release_candidate_${MY_PV}"
        KEYWORDS="~amd64 ~loong ~x86"
 fi
 
@@ -32,6 +33,7 @@ DEPEND="
        ${RDEPEND}
        dev-cpp/nlohmann_json
        dev-libs/mdns
+       dev-libs/stb
 "
 BDEPEND="
        dev-qt/qttools:6[linguist]
@@ -43,7 +45,7 @@ PATCHES=(
        "${FILESDIR}"/OpenRGB-0.9-udev-check.patch
 )
 if [[ ${PV} != *9999* ]]; then
-       PATCHES+=( "${FILESDIR}"/${P}-build-system.patch )
+       PATCHES+=( "${FILESDIR}"/openrgb-0.9_p20250802-build-system.patch )
 fi
 
 CHECKREQS_DISK_BUILD="2G"
@@ -51,7 +53,7 @@ CHECKREQS_DISK_BUILD="2G"
 src_prepare() {
        default
 
-       rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+       rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls,stb}* \
                || die "Failed to remove unneded deps"
 }
 
@@ -75,6 +77,7 @@ src_configure() {
 
        eqmake6 \
                INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+               INCLUDEPATH+="${ESYSROOT}/usr/include/stb" \
                
OPENRGB_SYSTEM_PLUGIN_DIRECTORY="${EPREFIX}/usr/$(get_libdir)/openrgb/plugins" \
                LIBS+="${libs[@]}" \
                PREFIX="${EPREFIX}/usr"

diff --git a/app-misc/openrgb/openrgb-9999.ebuild 
b/app-misc/openrgb/openrgb-9999.ebuild
index d9e43df8bdc7..7f6d0c4e8808 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -9,8 +9,9 @@ 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}"
+       MY_PV=$(ver_rs 2 "")
+       
SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${MY_PV}/OpenRGB-release_${MY_PV}.tar.bz2";
+       S="${WORKDIR}/OpenRGB-release_${MY_PV}"
        KEYWORDS="~amd64 ~loong ~x86"
 fi
 
@@ -32,6 +33,7 @@ DEPEND="
        ${RDEPEND}
        dev-cpp/nlohmann_json
        dev-libs/mdns
+       dev-libs/stb
 "
 BDEPEND="
        dev-qt/qttools:6[linguist]
@@ -43,7 +45,7 @@ PATCHES=(
        "${FILESDIR}"/OpenRGB-0.9-udev-check.patch
 )
 if [[ ${PV} != *9999* ]]; then
-       PATCHES+=( "${FILESDIR}"/${P}-build-system.patch )
+       PATCHES+=( "${FILESDIR}"/openrgb-0.9_p20250802-build-system.patch )
 fi
 
 CHECKREQS_DISK_BUILD="2G"
@@ -51,7 +53,7 @@ CHECKREQS_DISK_BUILD="2G"
 src_prepare() {
        default
 
-       rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls}* \
+       rm -r dependencies/{httplib,hidapi,libusb,mdns,json,mbedtls,stb}* \
                || die "Failed to remove unneded deps"
 }
 
@@ -75,6 +77,7 @@ src_configure() {
 
        eqmake6 \
                INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+               INCLUDEPATH+="${ESYSROOT}/usr/include/stb" \
                
OPENRGB_SYSTEM_PLUGIN_DIRECTORY="${EPREFIX}/usr/$(get_libdir)/openrgb/plugins" \
                LIBS+="${libs[@]}" \
                PREFIX="${EPREFIX}/usr"

Reply via email to