gentoo auto-resync : 27:09:2022 - 15:10:20

3 files changed, 2 insertions, 64 deletions

diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index cf708009b138..8e86565cc539 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,6 +1,5 @@
-AUX qlcplus-4.12.5-fix-test-issue.patch 2302 BLAKE2B 7d863367d2f1ddd91b398be1dcce3f421ba598aa8f99743fec559e6eafb9dfa341f71ee551e5e72548e3adb0d8413e9b873b790c716377e9d2d1a1c366f3936c SHA512 53b6666d261b1b60e3aa86b4c4d37f77e4230642e647ea2661e21b1fb679d888d394dfb125734f661cb8f73a1153939bfa21ceae2d9a3bc5d24156e79f2f303a
-DIST QLC+_4.12.5.tar.gz 11331655 BLAKE2B b7d274c0940d0d58486c36abab1c413dca91044e50fa1d6ee6fa2b2c24a8ca52800fa1e2ad20c057b1b32d4f755292ea4c9a360125fc2a2e8b157903d8e4884d SHA512 15c58c694dc5732effc0cfb2705c4540fc377e09b20cc36cb9a94566658b3dbfb759cbddb16cd51b22be889d580d8b45073ae0cff068a10c3dbe796ae1a027eb
+DIST QLC+_4.12.6.tar.gz 11345674 BLAKE2B 6035f29f22dd214c1190bd13fbdf5e4bd7b4fb3e3cf20f5556fe31aa318dc1490ffe5159f00e3accd88bff8cdb4bb2763e29e318073a3bf2f00ca3676fff266a SHA512 80869bc0c1682aeb81f5463253be595aa4745d3c4b5e20a1c8ae1c3d9ceabbbf251b52bebb723d9e0297bc712cc75fe2dd472182b79bef84b351cd4795231765
 DIST QLC+_5.0.0_beta1.tar.gz 11170124 BLAKE2B aebc0ddbd2ee9b4dd242d4766a708a9e83621c1f5ab6a69ab4ad4884f10eae954ad5a7d6aaef908ec4d1c725705231676ec77a3f65f0bcee73099344540bae00 SHA512 f831be1e31a995151768a09d1cdeb8815086d2ce3fc8c4e0abf12aefe6eb02870c6d86ae87cd7061ec353ce1d23ac7f73cd7646f3c2f00ddde45c25ff36ec884
-EBUILD qlcplus-4.12.5.ebuild 1505 BLAKE2B 4096ab414102d8cb3d2aedbd60ca86f7443ac9f966867d32d42f164a08a4d6694cfaecbcbe3ea1aeff47486aac71774d412b6ef28f76c4f7c8d3ce4dcb77bb0c SHA512 770ebdbb388c79c66cfa8a6f199d8fa65258191d3a689159b49c8a82caf76346df6f035128b0f3e44a9c46836c4d9a09200fc9ca9c9cf651963e27bbe558718e
+EBUILD qlcplus-4.12.6.ebuild 1442 BLAKE2B 412e450ca330a5f89ef8f67f9f4b0044f2ad2568c933eeb51fc0302fdfb1f1b0eabc2091e8b11d5fa34aeec93288228b1bb2ce8f50ee085b96f9d0b3b5c77f78 SHA512 7b9328c2aec1a9ea41e8520e39bf3cd72e7cc9844d2cf23d0c95ce1b54a620a455853965a63ab5f53033b08fd2792a961a5d9d6f452bcdad77cf5ed3183ee8ad
 EBUILD qlcplus-5.0.0_beta1.ebuild 1665 BLAKE2B ff009a6617d1dbba4e82424e7bb4817fc98e700624df95d7e11c766d8257b2d20dcb2a7f439402f3158cf014f637630935ca54a61ba788b135daf5653cf8fa7f SHA512 595286b7e00e9bf66c62b77896cf7390d26d225016c34b92a370979e2d811058a18556fd4f38b99f4688339db1536891a9c4eef6ad57369a4e5513584400a921
 MISC metadata.xml 486 BLAKE2B 1455b8274a3b5fc5ee88086c13ca8f10a81058cc68ea572d0fd324be938c9a6795728f65ef4ba1c0f1dedd04ad1b5737c3da103253a08fc35e18891f407c7887 SHA512 7105d0f5556f8d456410dd8354737edff4efbdf6ebdc286bb8391dedb6f5d6bcd7bebf9d9cfc313753249025d12f3459474df8bb7d6b740a5950ee709e58bf63
diff --git a/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch b/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch
deleted file mode 100644
index d7cffba6ff8c..000000000000
--- a/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2ee0e053e39587d29789a26a37309445df222a0c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?=
- <jeromelebleu@users.noreply.github.com>
-Date: Fri, 8 Jul 2022 09:41:21 +0200
-Subject: [PATCH] Round values explicitly in FadeChannel and KeyPadParser
-
-Fix #1344
----
- engine/src/fadechannel.cpp  | 9 +++------
- engine/src/keypadparser.cpp | 6 ++++--
- 2 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/engine/src/fadechannel.cpp b/engine/src/fadechannel.cpp
-index 537b0fd9f..c642360be 100644
---- a/engine/src/fadechannel.cpp
-+++ b/engine/src/fadechannel.cpp
-@@ -323,14 +323,11 @@ uchar FadeChannel::calculateCurrent(uint fadeTime, uint elapsedTime)
-         // 16 bit fading works as long as MSB and LSB channels
-         // are targeting the same value. E.g. Red and Red Fine both at 158
-         float val = (float(m_target - m_start) * (float(elapsedTime) / float(fadeTime))) + float(m_start);
-+        long rval = lrintf(val * 256);
-         if (m_flags & Fine)
--        {
--            m_current = ((val - floor(val)) * float(UCHAR_MAX));
--        }
-+            m_current = rval & 0xff;
-         else
--        {
--            m_current = val;
--        }
-+            m_current = rval / 256;
-     }
- 
-     return uchar(m_current);
-diff --git a/engine/src/keypadparser.cpp b/engine/src/keypadparser.cpp
-index bc2d64cbc..36a4fe9b9 100644
---- a/engine/src/keypadparser.cpp
-+++ b/engine/src/keypadparser.cpp
-@@ -17,6 +17,8 @@
-   limitations under the License.
- */
- 
-+#include <cmath>
-+
- #include "keypadparser.h"
- #include "qlcmacros.h"
- 
-@@ -194,9 +196,9 @@ QList<SceneValue> KeyPadParser::parseCommand(Doc *doc, QString command,
-         else if (lastCommand == CommandMinus)
-             scv.value = CLAMP(uniValue - toValue, 0, 255);
-         else if (lastCommand == CommandPlusPercent)
--            scv.value = CLAMP(uniValue * (1.0 + toValue), 0, 255);
-+            scv.value = CLAMP(lrintf(uniValue * (1.0 + toValue)), 0, 255);
-         else if (lastCommand == CommandMinusPercent)
--            scv.value = CLAMP(uniValue - (float(uniValue) * toValue), 0, 255);
-+            scv.value = CLAMP(lrintf(uniValue - (float(uniValue) * toValue)), 0, 255);
-         else if (lastCommand == CommandZERO)
-             scv.value = 0;
-         else if (lastCommand == CommandFULL)
diff --git a/app-misc/qlcplus/qlcplus-4.12.5.ebuild b/app-misc/qlcplus/qlcplus-4.12.6.ebuild
index bdcb55edcf6b..a178db0add32 100644
--- a/app-misc/qlcplus/qlcplus-4.12.5.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.12.6.ebuild
@@ -44,8 +44,6 @@ DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 "
 
-PATCHES=( "${FILESDIR}"/qlcplus-4.12.5-fix-test-issue.patch )
-
 src_prepare() {
 	default