Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/qlcplus/files/, app-misc/qlcplus/
Date: Tue, 27 Sep 2022 12:31:50
Message-Id: 1664281903.f090c3f4a6ad8983c4568e6da5b7f9dd2e58c95b.juippis@gentoo
1 commit: f090c3f4a6ad8983c4568e6da5b7f9dd2e58c95b
2 Author: Jannis Achstetter <kripton <AT> kripserver <DOT> net>
3 AuthorDate: Wed Aug 31 21:16:45 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 27 12:31:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f090c3f4
7
8 app-misc/qlcplus: Remove old v4.12.5
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Jannis Achstetter <kripton <AT> kripserver.net>
12 Closes: https://github.com/gentoo/gentoo/pull/27095
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 app-misc/qlcplus/Manifest | 1 -
16 .../files/qlcplus-4.12.5-fix-test-issue.patch | 59 ---------------
17 app-misc/qlcplus/qlcplus-4.12.5.ebuild | 84 ----------------------
18 3 files changed, 144 deletions(-)
19
20 diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
21 index 7d3ee6257243..cfa1f1f6dcea 100644
22 --- a/app-misc/qlcplus/Manifest
23 +++ b/app-misc/qlcplus/Manifest
24 @@ -1,3 +1,2 @@
25 -DIST QLC+_4.12.5.tar.gz 11331655 BLAKE2B b7d274c0940d0d58486c36abab1c413dca91044e50fa1d6ee6fa2b2c24a8ca52800fa1e2ad20c057b1b32d4f755292ea4c9a360125fc2a2e8b157903d8e4884d SHA512 15c58c694dc5732effc0cfb2705c4540fc377e09b20cc36cb9a94566658b3dbfb759cbddb16cd51b22be889d580d8b45073ae0cff068a10c3dbe796ae1a027eb
26 DIST QLC+_4.12.6.tar.gz 11345674 BLAKE2B 6035f29f22dd214c1190bd13fbdf5e4bd7b4fb3e3cf20f5556fe31aa318dc1490ffe5159f00e3accd88bff8cdb4bb2763e29e318073a3bf2f00ca3676fff266a SHA512 80869bc0c1682aeb81f5463253be595aa4745d3c4b5e20a1c8ae1c3d9ceabbbf251b52bebb723d9e0297bc712cc75fe2dd472182b79bef84b351cd4795231765
27 DIST QLC+_5.0.0_beta1.tar.gz 11170124 BLAKE2B aebc0ddbd2ee9b4dd242d4766a708a9e83621c1f5ab6a69ab4ad4884f10eae954ad5a7d6aaef908ec4d1c725705231676ec77a3f65f0bcee73099344540bae00 SHA512 f831be1e31a995151768a09d1cdeb8815086d2ce3fc8c4e0abf12aefe6eb02870c6d86ae87cd7061ec353ce1d23ac7f73cd7646f3c2f00ddde45c25ff36ec884
28
29 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
30 deleted file mode 100644
31 index d7cffba6ff8c..000000000000
32 --- a/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch
33 +++ /dev/null
34 @@ -1,59 +0,0 @@
35 -From 2ee0e053e39587d29789a26a37309445df222a0c Mon Sep 17 00:00:00 2001
36 -From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?=
37 - <jeromelebleu@××××××××××××××××××××.com>
38 -Date: Fri, 8 Jul 2022 09:41:21 +0200
39 -Subject: [PATCH] Round values explicitly in FadeChannel and KeyPadParser
40 -
41 -Fix #1344
42 ----
43 - engine/src/fadechannel.cpp | 9 +++------
44 - engine/src/keypadparser.cpp | 6 ++++--
45 - 2 files changed, 7 insertions(+), 8 deletions(-)
46 -
47 -diff --git a/engine/src/fadechannel.cpp b/engine/src/fadechannel.cpp
48 -index 537b0fd9f..c642360be 100644
49 ---- a/engine/src/fadechannel.cpp
50 -+++ b/engine/src/fadechannel.cpp
51 -@@ -323,14 +323,11 @@ uchar FadeChannel::calculateCurrent(uint fadeTime, uint elapsedTime)
52 - // 16 bit fading works as long as MSB and LSB channels
53 - // are targeting the same value. E.g. Red and Red Fine both at 158
54 - float val = (float(m_target - m_start) * (float(elapsedTime) / float(fadeTime))) + float(m_start);
55 -+ long rval = lrintf(val * 256);
56 - if (m_flags & Fine)
57 -- {
58 -- m_current = ((val - floor(val)) * float(UCHAR_MAX));
59 -- }
60 -+ m_current = rval & 0xff;
61 - else
62 -- {
63 -- m_current = val;
64 -- }
65 -+ m_current = rval / 256;
66 - }
67 -
68 - return uchar(m_current);
69 -diff --git a/engine/src/keypadparser.cpp b/engine/src/keypadparser.cpp
70 -index bc2d64cbc..36a4fe9b9 100644
71 ---- a/engine/src/keypadparser.cpp
72 -+++ b/engine/src/keypadparser.cpp
73 -@@ -17,6 +17,8 @@
74 - limitations under the License.
75 - */
76 -
77 -+#include <cmath>
78 -+
79 - #include "keypadparser.h"
80 - #include "qlcmacros.h"
81 -
82 -@@ -194,9 +196,9 @@ QList<SceneValue> KeyPadParser::parseCommand(Doc *doc, QString command,
83 - else if (lastCommand == CommandMinus)
84 - scv.value = CLAMP(uniValue - toValue, 0, 255);
85 - else if (lastCommand == CommandPlusPercent)
86 -- scv.value = CLAMP(uniValue * (1.0 + toValue), 0, 255);
87 -+ scv.value = CLAMP(lrintf(uniValue * (1.0 + toValue)), 0, 255);
88 - else if (lastCommand == CommandMinusPercent)
89 -- scv.value = CLAMP(uniValue - (float(uniValue) * toValue), 0, 255);
90 -+ scv.value = CLAMP(lrintf(uniValue - (float(uniValue) * toValue)), 0, 255);
91 - else if (lastCommand == CommandZERO)
92 - scv.value = 0;
93 - else if (lastCommand == CommandFULL)
94
95 diff --git a/app-misc/qlcplus/qlcplus-4.12.5.ebuild b/app-misc/qlcplus/qlcplus-4.12.5.ebuild
96 deleted file mode 100644
97 index bdcb55edcf6b..000000000000
98 --- a/app-misc/qlcplus/qlcplus-4.12.5.ebuild
99 +++ /dev/null
100 @@ -1,84 +0,0 @@
101 -# Copyright 1999-2022 Gentoo Authors
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -EAPI=8
105 -
106 -inherit qmake-utils udev virtualx xdg
107 -
108 -DESCRIPTION="A software to control DMX or analog lighting systems"
109 -HOMEPAGE="https://www.qlcplus.org/"
110 -SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
111 -S="${WORKDIR}/qlcplus-QLC-_${PV}"
112 -
113 -LICENSE="Apache-2.0"
114 -SLOT="0"
115 -KEYWORDS="~amd64"
116 -IUSE="test"
117 -
118 -RESTRICT="!test? ( test )"
119 -
120 -BDEPEND="
121 - dev-qt/linguist-tools:5
122 -"
123 -RDEPEND="
124 - dev-embedded/libftdi:=
125 - dev-libs/glib:2
126 - dev-qt/qtcore:5
127 - dev-qt/qtgui:5
128 - dev-qt/qtmultimedia:5[widgets]
129 - dev-qt/qtnetwork:5
130 - dev-qt/qtscript:5
131 - dev-qt/qtwidgets:5
132 - media-libs/alsa-lib
133 - media-libs/libmad
134 - media-libs/libsndfile
135 - sci-libs/fftw:3.0
136 - virtual/libusb:0
137 - virtual/libusb:1
138 - virtual/udev
139 -"
140 -IDEPEND="
141 - dev-util/desktop-file-utils
142 -"
143 -DEPEND="${RDEPEND}
144 - dev-qt/qttest:5
145 -"
146 -
147 -PATCHES=( "${FILESDIR}"/qlcplus-4.12.5-fix-test-issue.patch )
148 -
149 -src_prepare() {
150 - default
151 -
152 - sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
153 - -i variables.pri || die
154 -
155 - ## Remove Werror-flag since there are some warnings with gcc-9.x
156 - sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
157 - -i variables.pri || die
158 -}
159 -
160 -src_configure() {
161 - eqmake5
162 -}
163 -
164 -src_install() {
165 - emake INSTALL_ROOT="${D}" install
166 -}
167 -
168 -pkg_postinst() {
169 - udev_reload
170 -
171 - xdg_desktop_database_update
172 - xdg_mimeinfo_database_update
173 -}
174 -
175 -src_test() {
176 - virtx emake check
177 -}
178 -
179 -pkg_postrm() {
180 - udev_reload
181 -
182 - xdg_desktop_database_update
183 - xdg_mimeinfo_database_update
184 -}