From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- app-misc/OpenRGB/Manifest | 8 +-- app-misc/OpenRGB/OpenRGB-0.4.ebuild | 55 --------------------- app-misc/OpenRGB/OpenRGB-0.6.ebuild | 57 ++++++++++++++++++++++ app-misc/OpenRGB/OpenRGB-9999.ebuild | 15 ++++-- .../OpenRGB/files/OpenRGB-0.2-build-system.patch | 14 ------ app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch | 11 +++++ 6 files changed, 82 insertions(+), 78 deletions(-) delete mode 100644 app-misc/OpenRGB/OpenRGB-0.4.ebuild create mode 100644 app-misc/OpenRGB/OpenRGB-0.6.ebuild delete mode 100644 app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch create mode 100644 app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch (limited to 'app-misc/OpenRGB') diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest index ba26cc77353d..cd23d3c3a8ed 100644 --- a/app-misc/OpenRGB/Manifest +++ b/app-misc/OpenRGB/Manifest @@ -1,8 +1,8 @@ -AUX OpenRGB-0.2-build-system.patch 736 BLAKE2B cf03e1690f6bc671de860cc2d7346cb8bf97bb0bde16d6931f476794358a682b740f976ffac12c0e3ab8b52a11d785d1b31706120c3323e35cc812cede2a98e5 SHA512 5959c2b2c07f53f583fbb7c6f29e2128343167daff4bad59d652be44dd6b8fb6bcf04e84bf523731ccd2d8f296966bd7239c8edbccb72b3a9c42a3e184db71f7 AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e09381a62ceaa58413b0aaa28017b6e860d032ab6ceb84f1140dc7f6c23dfecc1cadbcf696c8f872016307ea34d8870dc SHA512 50e110c01833113504a3a64e438a404196ae0af8e75007d6c42f3fcab5c20468f3fcb80f83d1f98ac7e1f4f88b1808ee28d0bf342b416d581c354a2388af32bf -DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd +AUX OpenRGB-0.6-pkgconf.patch 709 BLAKE2B eec83247caac6527f0c0ca80716fc3fc3266cdca9635f643968bb620be3a03f3d3030c97e0c68af8e77a03725eaa46f7393667ceb72a63a665947ae87242afc8 SHA512 0436714eb4e900caa421dba2b3fcba41826ab74ed8f2e42884c48006f4af31fe10a114e84c41212343911b5f52804a27b031410fc55fe234138905779db4cf6b DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb -EBUILD OpenRGB-0.4.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832 +DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32 EBUILD OpenRGB-0.5.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9 -EBUILD OpenRGB-9999.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9 +EBUILD OpenRGB-0.6.ebuild 1148 BLAKE2B c67c05a6a8562bb036b39b9f56d2d921efbd49a169232d20dbfcbb5c5c3880bff05b25b2a2c05b622a68e979f957e41d818a1e3b74031b6de1c6d8a00fdd5514 SHA512 896f54875ae900b173b0aaa50dab04e8da6c830faaeed79c0176437574e8effbac616729e3b333e59dbfc83dce3489fce3575afb79e0e3ba71d7f7f8f121a770 +EBUILD OpenRGB-9999.ebuild 1176 BLAKE2B ffa186f6395fde7f33f259ac47dbe5fb13320d6841103e665af9aa2bea6bcd527b02ebd339c43a235522ff5a6264af0581e0a6a2d14b043f94f3157649a26f5d SHA512 3739d5f3d9b82e54ebdb25707d38e9c66c5cea186bf5fb5de688c04096fcf3620460e8dd06c70be1c3f94ca5b91e8b2e5fc3eb08b69da08361d2a3f43093dcdc MISC metadata.xml 468 BLAKE2B 995cee43adec6a52c9ee8cef1abd9940cfe501e860cad863ed32161ef04c9bb1fa8d11d87869dea37d882170d8c54b548666ba788641899a3d8364b1307d7450 SHA512 9dab70cc3cc39d8051f93190030aaffbdf5256a4ca68c0ae85c4563021d6c459fa4fa4319efdce25f7dea18f797d4fb52ea63d448dda90e5ac69b79d98f21ecf diff --git a/app-misc/OpenRGB/OpenRGB-0.4.ebuild b/app-misc/OpenRGB/OpenRGB-0.4.ebuild deleted file mode 100644 index f8119c80c919..000000000000 --- a/app-misc/OpenRGB/OpenRGB-0.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils udev - -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" -fi - -DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software" -HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/" -LICENSE="GPL-2" -SLOT="0" -IUSE="udev" - -DEPEND=" - dev-libs/hidapi:= - dev-qt/qtcore:5= - dev-qt/qtgui:5= - dev-qt/qtwidgets:5= - virtual/libusb:1 -" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -src_prepare() { - default - rm -rf dependencies/{hidapi,libusb}* || die - if [[ ${PV} != *9999* ]]; then - eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch" - fi -} - -src_configure() { - eqmake5 -} - -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-0.6.ebuild b/app-misc/OpenRGB/OpenRGB-0.6.ebuild new file mode 100644 index 000000000000..c356d7aff6fb --- /dev/null +++ b/app-misc/OpenRGB/OpenRGB-0.6.ebuild @@ -0,0 +1,57 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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://gitlab.com/CalcProgrammer1/OpenRGB/" +LICENSE="GPL-2" +SLOT="0" + +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 +) + +src_prepare() { + default + rm -r dependencies/{hidapi,libusb,json}* || die +} + +src_configure() { + eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" +} + +src_install() { + emake INSTALL_ROOT="${ED}" install + + dodoc README.md OpenRGB.patch +} diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-9999.ebuild index 6c5d8e23cd0c..c1f1eb4bbcb3 100644 --- a/app-misc/OpenRGB/OpenRGB-9999.ebuild +++ b/app-misc/OpenRGB/OpenRGB-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,6 +12,9 @@ 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" @@ -24,6 +27,7 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 + net-libs/mbedtls:= virtual/libusb:1 " DEPEND=" @@ -34,12 +38,13 @@ BDEPEND=" virtual/pkgconfig " +PATCHES+=( + "${FILESDIR}"/OpenRGB-0.6-pkgconf.patch +) + src_prepare() { default - rm -r dependencies/{hidapi,libusb,json}* || die - if [[ ${PV} != *9999* ]]; then - eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch" - fi + rm -r dependencies/{hidapi,libusb,json,mbedtls}* || die } src_configure() { diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch deleted file mode 100644 index b2cd6cbd1d58..000000000000 --- a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.6-pkgconf.patch b/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch new file mode 100644 index 000000000000..380b1091d225 --- /dev/null +++ b/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch @@ -0,0 +1,11 @@ +--- 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 + } -- cgit v1.2.3