gentoo auto-resync : 04:08:2022 - 14:05:20

6 files changed, 102 insertions, 142 deletions

diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 25e69fb03390..4d03fb6bb5c3 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,9 +1,6 @@
-DIST QLC+_4.12.2.tar.gz 10804401 BLAKE2B 95b005985da99d1d1f557b4ac5d6ae7d844ea4f69a7cfa63d79b288ce654b5a70f9e6168f6fd4144496d3cff59a721972acd3ba47fd1477ab4bfd0218f5aeeda SHA512 b274f0559ce15e045d653f4c034dc083922a13c6f9c5e7ba11026b3be9bb85fe447bb489d536dd24bb99bd4b08433f24f1713b73701afff99fa845fcef2547af
-DIST QLC+_4.12.3.tar.gz 10954027 BLAKE2B 9a188e2bc2cce1a0a5170122989d5ee1194a83e7d1c8c05a80ad6271e903941effb5c63940a941fa32146699b3b2a7943b9938a5407420da69c1199b5f6f217b SHA512 f25601a44a81d2fd15c54a05588e687fa1f0c0473d0e2188fa0c052b905df806b0516f8b80bf28451a583aa241d137f858fe83b9d7e0e0747bcc3b0bae91d9f0
-DIST QLC+_4.12.4.tar.gz 11166224 BLAKE2B 37b5088c8e7be08fa39aa11e35b8284e60788da94ac4f2dfb9bf4b0615408735c8c1b7c61efe37810ea7ee662a4efe5c0e17d54d45a7b637ddef4a1cc4c5a760 SHA512 19893c5f29602e2e65db9eb162c3f45ce3f028424ecf17d7615f9d3ada8a871dd1a1827ea9a243d7bd0f23ba7e9fb2340531154ac557d5756f0aa05648c56b13
-DIST QLC+_5.0.0_alpha3.tar.gz 10016411 BLAKE2B 51c0885f6e2e286f9f63830bcd269db699946c0969cb0f0a0139f82a421a9a4957ab07612db7aa047fe6650a642479282f6cfe0d124a41a935dd853d09b7253f SHA512 e703747aa243bc4c6b2e9fc3cf1a4e67524fa13fa64a59054e66164e879073b1bd69756a42bb423ff05dcb7da946cbcd99bb9edc3fde9a70d75b8a9f164a71d0
-EBUILD qlcplus-4.12.2.ebuild 1217 BLAKE2B bd8c0c256e255ff88eed2f6f9e9f5d9f6af0011f1a5b540f254e8b068dcc7246cc8b08ef8e5ef12b7bfd4f2d9275929701f6dbff946aa37e888f2c4bdf4d45ab SHA512 f31e8a8572b0a6bb49576aed423449e33d6ea8bda937cbee4f4456202eb5b5b96e26d21a061c925f04f8e2364119827bd707ba7a8bd3215c6c7b86375e523e3f
-EBUILD qlcplus-4.12.3.ebuild 1217 BLAKE2B c4c507caf1551d22815ed9f2a863b5860fdb9e0aaaeef3e5dd7038e6e220c092bad8c3ac17861c3c13bf9df0f0c0a01088e9a3fc96d42715e84eced2ff4d33cf SHA512 4e10f5121e8d3c425c1a1c29ef7e72141cc3cbe5cdfe1273c83f6c63ea8e670a31259eae25f509847b4da8cfa424aa898e7c92d95d045f3aa8b6c3af617d2c80
-EBUILD qlcplus-4.12.4.ebuild 1217 BLAKE2B 9bc28c918fd34785f3c0dff2cadb3e83b364e790c12aa56fbaf9557ce021583e1c846d6e61ef3d75c99b2ab46ad35420f10fcd2a7402685e1490db7947885a09 SHA512 15a356f6ada2c4d0ebeb0d1363b963e51fa97609fb99a57555015bdf7aa59ab9aff657e49b97c2e2ec6aafc2084d761cb970679e1271fdcb29c53c50152b95b2
-EBUILD qlcplus-5.0.0_alpha3.ebuild 1550 BLAKE2B 2d6eaf0b2bbc348903813f202bb42f841d2f3da045827bc5b91cf9e6f27ee013e17b5b3c14d7cf45989af7f29dbd86d748eaaf69999df7e4a3b57f0c2c093f52 SHA512 dd496c3a3beba8fe9212bea0fb1b8e446ea9c5733df93133bbeeddd5180d6dd5004a57238bcd228da1cd2bd80dc9dc8da95f0ab41a0ff6b0d1e6bd3c9d98bae6
+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+_5.0.0_beta1.tar.gz 11170124 BLAKE2B aebc0ddbd2ee9b4dd242d4766a708a9e83621c1f5ab6a69ab4ad4884f10eae954ad5a7d6aaef908ec4d1c725705231676ec77a3f65f0bcee73099344540bae00 SHA512 f831be1e31a995151768a09d1cdeb8815086d2ce3fc8c4e0abf12aefe6eb02870c6d86ae87cd7061ec353ce1d23ac7f73cd7646f3c2f00ddde45c25ff36ec884
+EBUILD qlcplus-4.12.5.ebuild 1505 BLAKE2B 4096ab414102d8cb3d2aedbd60ca86f7443ac9f966867d32d42f164a08a4d6694cfaecbcbe3ea1aeff47486aac71774d412b6ef28f76c4f7c8d3ce4dcb77bb0c SHA512 770ebdbb388c79c66cfa8a6f199d8fa65258191d3a689159b49c8a82caf76346df6f035128b0f3e44a9c46836c4d9a09200fc9ca9c9cf651963e27bbe558718e
+EBUILD qlcplus-5.0.0_beta1.ebuild 1758 BLAKE2B 6aab149c6f0de4761bd6977c10d3d5897831f56cbae25f04fb46d828e87d8f8a3221b1361009490677609d063c21a00a09b389c4706c57dd96b1fb36bb55fd2e SHA512 ad07b8da5060d74dea37d1196bd0256224618c2d8cb9f117bd1267407ccfaf471e7c72e95fe0b9461343fefa4bd70b1a5699bc7a20b195f0f76fe5cf0f97d1c1
 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
new file mode 100644
index 000000000000..d7cffba6ff8c
--- /dev/null
+++ b/app-misc/qlcplus/files/qlcplus-4.12.5-fix-test-issue.patch
@@ -0,0 +1,59 @@
+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.3.ebuild b/app-misc/qlcplus/qlcplus-4.12.3.ebuild
deleted file mode 100644
index 6fb4d8a64529..000000000000
--- a/app-misc/qlcplus/qlcplus-4.12.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils udev virtualx xdg
-
-DESCRIPTION="A software to control DMX or analog lighting systems"
-HOMEPAGE="https://www.qlcplus.org/"
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
-S="${WORKDIR}/qlcplus-QLC-_${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-embedded/libftdi:=
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libmad
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	virtual/libusb:1
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	default
-
-	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
-		-i variables.pri || die
-
-	## Remove Werror-flag since there are some warnings with gcc-9.x
-	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
-		-i variables.pri || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-misc/qlcplus/qlcplus-4.12.4.ebuild b/app-misc/qlcplus/qlcplus-4.12.4.ebuild
deleted file mode 100644
index e2652b670439..000000000000
--- a/app-misc/qlcplus/qlcplus-4.12.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils udev virtualx xdg
-
-DESCRIPTION="A software to control DMX or analog lighting systems"
-HOMEPAGE="https://www.qlcplus.org/"
-SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
-S="${WORKDIR}/qlcplus-QLC-_${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-embedded/libftdi:=
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	media-libs/libmad
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	virtual/libusb:1
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	default
-
-	sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
-		-i variables.pri || die
-
-	## Remove Werror-flag since there are some warnings with gcc-9.x
-	sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
-		-i variables.pri || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-misc/qlcplus/qlcplus-4.12.2.ebuild b/app-misc/qlcplus/qlcplus-4.12.5.ebuild
index 9b5db416960b..bdcb55edcf6b 100644
--- a/app-misc/qlcplus/qlcplus-4.12.2.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.12.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils udev virtualx xdg
 
@@ -37,10 +37,15 @@ RDEPEND="
 	virtual/libusb:1
 	virtual/udev
 "
+IDEPEND="
+	dev-util/desktop-file-utils
+"
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 "
 
+PATCHES=( "${FILESDIR}"/qlcplus-4.12.5-fix-test-issue.patch )
+
 src_prepare() {
 	default
 
@@ -60,6 +65,20 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
 
+pkg_postinst() {
+	udev_reload
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
 src_test() {
 	virtx emake check
 }
+
+pkg_postrm() {
+	udev_reload
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild b/app-misc/qlcplus/qlcplus-5.0.0_beta1.ebuild
index 23abfd174edb..323b2b3da76d 100644
--- a/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
+++ b/app-misc/qlcplus/qlcplus-5.0.0_beta1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils udev virtualx xdg
 
@@ -40,6 +40,9 @@ RDEPEND="
 	virtual/libusb:1
 	virtual/udev
 "
+IDEPEND="
+	dev-util/desktop-file-utils
+"
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
 "
@@ -63,11 +66,23 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
 
+pkg_postinst() {
+	udev_reload
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
 src_test() {
 	virtx emake check
 }
 
 pkg_postinst() {
+	udev_reload
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
 	elog "Some configurations of KDE Plasma break the layout of"
 	elog "QLC+ 5's QML UI."
 	elog "As a workaround, try those environment variables:"