9 files changed, 23 insertions, 59 deletions
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 94b2b56b641a..149901635448 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	lmms
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.1
-PORTREVISION=	2
+DISTVERSION=	1.2.2
 PORTEPOCH=	2
 CATEGORIES=	audio
 
@@ -24,7 +23,10 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libogg.so:audio/libogg \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
-		libfltk.so:x11-toolkits/fltk
+		libfltk.so:x11-toolkits/fltk \
+		libcarla_utils.so:audio/carla \
+		libQt5Xml.so:textproc/qt5-xml \
+		libQt5X11Extras.so:x11/qt5-x11extras
 RUN_DEPENDS=	${LOCALBASE}/share/ladspa/rdf/caps.rdf:audio/caps-plugins \
 		${LOCALBASE}/lib/ladspa/cmt.so:audio/cmt \
 		${LOCALBASE}/share/ladspa/rdf/swh-plugins.rdf:audio/swhplugins \
@@ -78,6 +80,8 @@ post-patch-OSS-off:
 		${WRKSRC}/CMakeLists.txt
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions && \
+		${INSTALL_DATA} ${WRKSRC}/doc/bash-completion/lmms ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	@${RLN} ${STAGEDIR}${DATADIR}/themes/default/icon.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/lmms.png
 
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo
index 29339999755a..e745c5b69733 100644
--- a/audio/lmms/distinfo
+++ b/audio/lmms/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1571646445
-SHA256 (LMMS-lmms-v1.2.1_GH0.tar.gz) = e95e87dbc22b796376c240e0762e5a27346af22170b4690c7ee44da2436e6055
-SIZE (LMMS-lmms-v1.2.1_GH0.tar.gz) = 16497672
+TIMESTAMP = 1609923213
+SHA256 (LMMS-lmms-v1.2.2_GH0.tar.gz) = 41e15eaa8ee0968b41c983275a5d2e3ea57c3481de643869584fc0d1ce092ef6
+SIZE (LMMS-lmms-v1.2.2_GH0.tar.gz) = 16501132
 SHA256 (mjansson-rpmalloc-1.4.0_GH0.tar.gz) = c5b63c40253d7f048d4489a6fa78e7a0c77d90037018c712df3bf68c033888a8
 SIZE (mjansson-rpmalloc-1.4.0_GH0.tar.gz) = 71692
 SHA256 (lukas-w-qt5-x11embed-ec77d4ba40bebc0c53a016adb646b6fa65dd5faf_GH0.tar.gz) = 57213eb6da900412b182322e342366815c2cc2d3213cd948c2a7e405d6e41f06
diff --git a/audio/lmms/files/patch-cmake_modules_BashCompletion.cmake b/audio/lmms/files/patch-cmake_modules_BashCompletion.cmake
deleted file mode 100644
index b1910f88e0a9..000000000000
--- a/audio/lmms/files/patch-cmake_modules_BashCompletion.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-BASHCOMP_SCRIPT doesn't really require bash.
-
---- cmake/modules/BashCompletion.cmake.orig	2019-02-19 07:43:51 UTC
-+++ cmake/modules/BashCompletion.cmake
-@@ -71,7 +71,7 @@ ELSE()
- 		SET(BASHCOMP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_${SCRIPT_NAME}_completion.sh")
- 
- 		FILE(WRITE ${BASHCOMP_SCRIPT} "\
--#!${BASH}\n\
-+#!/bin/sh\n\
- set -e\n\
- if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
-   BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
diff --git a/audio/lmms/files/patch-doc_CMakeLists.txt b/audio/lmms/files/patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..259db3266d91
--- /dev/null
+++ b/audio/lmms/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,9 @@
+--- doc/CMakeLists.txt.orig 2021-01-11 09:02:46 UTC
++++ doc/CMakeLists.txt
+@@ -15,6 +15,3 @@
+                COMMENT "Generating API documentation with Doxygen"
+                SOURCES Doxyfile.in)
+ endif(DOXYGEN_FOUND)
+-
+-ADD_SUBDIRECTORY(bash-completion)
+-
diff --git a/audio/lmms/files/patch-plugins_Eq_EqSpectrumView.h b/audio/lmms/files/patch-plugins_Eq_EqSpectrumView.h
deleted file mode 100644
index e25684f1f9a8..000000000000
--- a/audio/lmms/files/patch-plugins_Eq_EqSpectrumView.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/Eq/EqSpectrumView.h.orig	2020-05-21 10:45:40 UTC
-+++ plugins/Eq/EqSpectrumView.h
-@@ -24,6 +24,7 @@
- #define EQSPECTRUMVIEW_H
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWidget>
- 
- #include "fft_helpers.h"
diff --git a/audio/lmms/files/patch-src_gui_AutomationPatternView.cpp b/audio/lmms/files/patch-src_gui_AutomationPatternView.cpp
deleted file mode 100644
index c8e4acbc41cd..000000000000
--- a/audio/lmms/files/patch-src_gui_AutomationPatternView.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/AutomationPatternView.cpp.orig	2020-05-21 10:43:44 UTC
-+++ src/gui/AutomationPatternView.cpp
-@@ -25,6 +25,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMenu>
- 
- #include "AutomationEditor.h"
diff --git a/audio/lmms/files/patch-src_gui_LmmsStyle.cpp b/audio/lmms/files/patch-src_gui_LmmsStyle.cpp
deleted file mode 100644
index fc9e32bd3bd7..000000000000
--- a/audio/lmms/files/patch-src_gui_LmmsStyle.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/LmmsStyle.cpp.orig	2020-05-21 10:47:28 UTC
-+++ src/gui/LmmsStyle.cpp
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QFrame>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleFactory>
- #include <QStyleOption>
- 
diff --git a/audio/lmms/files/patch-src_gui_editors_AutomationEditor.cpp b/audio/lmms/files/patch-src_gui_editors_AutomationEditor.cpp
deleted file mode 100644
index 42fa1d347f95..000000000000
--- a/audio/lmms/files/patch-src_gui_editors_AutomationEditor.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/editors/AutomationEditor.cpp.orig	2020-05-21 10:49:08 UTC
-+++ 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/audio/lmms/pkg-plist b/audio/lmms/pkg-plist
index 9bf9dfbb6dfb..37e82a1a4ebb 100644
--- a/audio/lmms/pkg-plist
+++ b/audio/lmms/pkg-plist
@@ -237,12 +237,16 @@ lib/lmms/libaudiofileprocessor.so
 lib/lmms/libbassbooster.so
 lib/lmms/libbitcrush.so
 lib/lmms/libbitinvader.so
+lib/lmms/libcarlabase.so
+lib/lmms/libcarlapatchbay.so
+lib/lmms/libcarlarack.so
 lib/lmms/libcrossovereq.so
 lib/lmms/libdelay.so
 lib/lmms/libdualfilter.so
 lib/lmms/libdynamicsprocessor.so
 lib/lmms/libeq.so
 lib/lmms/libflanger.so
+lib/lmms/libgigplayer.so
 lib/lmms/libhydrogenimport.so
 lib/lmms/libkicker.so
 lib/lmms/libladspabrowser.so