diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /media-sound/lmms | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'media-sound/lmms')
-rw-r--r-- | media-sound/lmms/Manifest | 5 | ||||
-rw-r--r-- | media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch | 61 | ||||
-rw-r--r-- | media-sound/lmms/lmms-1.2.0.ebuild | 106 | ||||
-rw-r--r-- | media-sound/lmms/lmms-1.2.1.ebuild | 6 |
4 files changed, 68 insertions, 110 deletions
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest index 8a8ae197521b..29aba03f3297 100644 --- a/media-sound/lmms/Manifest +++ b/media-sound/lmms/Manifest @@ -1,6 +1,5 @@ -DIST lmms-1.2.0.tar.xz 14541000 BLAKE2B f53206c2a78104d250fd7eda06ea1c646ad40c2db66baa9ed333213900e33bcab5312c95d5864636930be1b798ac1a79754035e3aec3a3772976aefb80dd8191 SHA512 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf +AUX lmms-1.2.1-add-missing-qpainterpath.patch 1833 BLAKE2B 74ee1bb96bbcdf801e5059bc3c4b067df165e217b6b4b70948dc26df5bde3afb452b9d41e2cedd75941b5c23ca120a739b8f00ef82ad9d05f814d2498e1e49b8 SHA512 1a64bdc01c33f19284ec4f3163bdfd208b40394c11ec767b3954cf0a8f32ddb0dda8014a0e8aa475e22bf75676e4fc3236317fdd76cfd4dd22b7e7bb3963ebae DIST lmms-1.2.1.tar.xz 14543092 BLAKE2B 23cdc201b32295634c5f50f258e5f63fb995cc4bbf7283c8230b35bc0c6ab26e36097860f574747747966e267c36b43d67b6e9e836a026351c48635c66a00aeb SHA512 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6 -EBUILD lmms-1.2.0.ebuild 2295 BLAKE2B 269a4f054b882c89a79509db4ac38e2304ca75d7d2b46bab628d226a90d37d98a866b14913bc298a2256e1011dff2b3a52e1d3d65be3bdcd1e4255d3b813e4e7 SHA512 f541e9a0747b1f8f5e0c95f833550d2c656d9e2c67c9f4f94fdb820a957e5436efd3b7641d56792870c9ad40a4d5553085203728f410c68523fdffbf96746ced -EBUILD lmms-1.2.1.ebuild 2295 BLAKE2B 269a4f054b882c89a79509db4ac38e2304ca75d7d2b46bab628d226a90d37d98a866b14913bc298a2256e1011dff2b3a52e1d3d65be3bdcd1e4255d3b813e4e7 SHA512 f541e9a0747b1f8f5e0c95f833550d2c656d9e2c67c9f4f94fdb820a957e5436efd3b7641d56792870c9ad40a4d5553085203728f410c68523fdffbf96746ced +EBUILD lmms-1.2.1.ebuild 2359 BLAKE2B 90b4d6757ca369e2d4dabd68d3b9d2b51c3d23c346688f172b6dcf8ab8777721622e35c7ab164ca0363710ad83827f0c2edee35b1873bd6516d788726028f60b SHA512 d448dc77290adb24c45606016529c5bff102302ab37f27e4239ce5ace5aab4f78868e921e019ac8a8df44d8b9a79b66e0f6263f12406a12b20e2dedeb19e034b EBUILD lmms-9999.ebuild 2288 BLAKE2B 96405ec7db1d97fa503934b6cbc4288a1331b45521c2b1668c2185dc616f323a274883036770140e05f24f87f04486139d9accaaf0bf6f3666047f5d3e2b377f SHA512 e0fb43cc8653aa1a07e3cc1a7950b36c628a6ffa6d31e48ed7e2db7762186e5ebd6276ca70a23460d8d6483f0db4358551c5ad68e431b3f776d61b802bc005bd MISC metadata.xml 956 BLAKE2B 9bda57bcbb5b4f6c0831ca465ed48bb27f0c86f8de7908369140b0e7865dc4b44cf0c7b9225bdd8ba786dd4ef22af4a338134e89b23163e0f872519f2e0becfc SHA512 4a3c3bb120894acf50733e003dfdf3132201ad9d9cab21fbde39aca76c38d1e4784d70f2f01c9b889378fc8156271e0e216100dee85d028caef1eaa6dc49a3e0 diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch new file mode 100644 index 000000000000..afade79b0fd8 --- /dev/null +++ b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch @@ -0,0 +1,61 @@ +From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001 +From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com> +Date: Mon, 18 May 2020 18:58:48 +0200 +Subject: [PATCH] Fix Qt 5.15 build issues (#5498) + +Add missing QPainterPath includes +--- + plugins/Eq/EqSpectrumView.h | 1 + + src/gui/AutomationPatternView.cpp | 1 + + src/gui/LmmsStyle.cpp | 1 + + src/gui/editors/AutomationEditor.cpp | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h +index cd3f177586..84feeff13e 100644 +--- a/plugins/Eq/EqSpectrumView.h ++++ b/plugins/Eq/EqSpectrumView.h +@@ -24,6 +24,7 @@ + #define EQSPECTRUMVIEW_H + + #include <QPainter> ++#include <QPainterPath> + #include <QWidget> + + #include "fft_helpers.h" +diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp +index 448c233cb4..9889a6b460 100644 +--- a/src/gui/AutomationPatternView.cpp ++++ b/src/gui/AutomationPatternView.cpp +@@ -25,6 +25,7 @@ + + #include <QMouseEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QMenu> + + #include "AutomationEditor.h" +diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp +index e57e29e479..4fe5cb503c 100644 +--- a/src/gui/LmmsStyle.cpp ++++ b/src/gui/LmmsStyle.cpp +@@ -28,6 +28,7 @@ + #include <QApplication> + #include <QFrame> + #include <QPainter> ++#include <QPainterPath> + #include <QStyleFactory> + #include <QStyleOption> + +diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp +index 5e8ea8a0af..74f15d358c 100644 +--- a/src/gui/editors/AutomationEditor.cpp ++++ b/src/gui/editors/AutomationEditor.cpp +@@ -35,6 +35,7 @@ + #include <QLayout> + #include <QMdiArea> + #include <QPainter> ++#include <QPainterPath> + #include <QScrollBar> + #include <QStyleOption> + #include <QToolTip> diff --git a/media-sound/lmms/lmms-1.2.0.ebuild b/media-sound/lmms/lmms-1.2.0.ebuild deleted file mode 100644 index e489666c90fe..000000000000 --- a/media-sound/lmms/lmms-1.2.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# The order is important here! Both, cmake and xdg define src_prepare. -# We need the one from cmake -inherit xdg cmake - -DESCRIPTION="Cross-platform music production software" -HOMEPAGE="https://lmms.io" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/LMMS/lmms.git" - inherit git-r3 -else - SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz -> ${P}.tar.xz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${P/_/-}" -fi - -LICENSE="GPL-2 LGPL-2" -SLOT="0" - -IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst" - -COMMON_DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - >=media-libs/libsamplerate-0.1.8 - >=media-libs/libsndfile-1.0.11 - sci-libs/fftw:3.0 - sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 - alsa? ( media-libs/alsa-lib ) - fluidsynth? ( media-sound/fluidsynth ) - jack? ( virtual/jack ) - libgig? ( media-libs/libgig ) - mp3? ( media-sound/lame ) - ogg? ( - media-libs/libogg - media-libs/libvorbis - ) - portaudio? ( >=media-libs/portaudio-19_pre ) - pulseaudio? ( media-sound/pulseaudio ) - sdl? ( - media-libs/libsdl - >=media-libs/sdl-sound-1.0.1 - ) - soundio? ( media-libs/libsoundio ) - stk? ( media-libs/stk ) - vst? ( virtual/wine ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qtx11extras:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND="${COMMON_DEPEND} - media-libs/ladspa-cmt - media-plugins/calf - media-plugins/caps-plugins - media-plugins/swh-plugins - media-plugins/tap-plugins -" - -DOCS=( README.md doc/AUTHORS ) - -src_configure() { - local mycmakeargs+=( - -DUSE_WERROR=FALSE - -DWANT_CAPS=FALSE - -DWANT_TAP=FALSE - -DWANT_SWH=FALSE - -DWANT_CMT=FALSE - -DWANT_CALF=FALSE - -DWANT_QT5=TRUE - -DWANT_ALSA=$(usex alsa) - -DWANT_JACK=$(usex jack) - -DWANT_GIG=$(usex libgig) - -DWANT_MP3LAME=$(usex mp3) - -DWANT_OGGVORBIS=$(usex ogg) - -DWANT_PORTAUDIO=$(usex portaudio) - -DWANT_PULSEAUDIO=$(usex pulseaudio) - -DWANT_SDL=$(usex sdl) - -DWANT_SOUNDIO=$(usex soundio) - -DWANT_STK=$(usex stk) - -DWANT_VST=$(usex vst) - -DWANT_SF2=$(usex fluidsynth) - ) - cmake_src_configure -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild index e489666c90fe..2f8eba8d8cdd 100644 --- a/media-sound/lmms/lmms-1.2.1.ebuild +++ b/media-sound/lmms/lmms-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -68,6 +68,10 @@ RDEPEND="${COMMON_DEPEND} DOCS=( README.md doc/AUTHORS ) +PATCHES=( + "${FILESDIR}/${P}-add-missing-qpainterpath.patch" +) + src_configure() { local mycmakeargs+=( -DUSE_WERROR=FALSE |