Currently, lmms is disabling the ZynAddSubFX plugin.
This diff enables it.

- remove patches/patch-plugins_CMakeLists_txt to build zynaddsubfx
- add required libraries to WANTLIB and LIB_DEPENDS
- bump up REVISION to 1

  In this diff, I just delete all lines in patch-plugins_CMakeLists_txt.
  I would like to 'cvs remove' it if this diff is ok.

I had confirmed that build and install on my OpenBSD 6.7 (amd64) succeeded.
And I could play ZynAddSubFX within lmms.

ok?

Kinichiro Inoguchi


Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/lmms/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile    30 Jan 2020 14:13:47 -0000      1.23
+++ Makefile    27 Jun 2020 06:34:22 -0000
@@ -5,7 +5,7 @@ COMMENT =               music studio with tracking, s
 # rolled from git; requires submodules
 # git clone --recurse-submodules -b v1.2.0 https://github.com/lmms/lmms
 DISTNAME =             lmms-1.2.0
-REVISION =             0
+REVISION =             1
 EXTRACT_SUFX =         .tar.xz
 
 CATEGORIES =           audio
@@ -18,9 +18,10 @@ MASTER_SITES =               https://spacehopper.org/
 PERMIT_PACKAGE =       Yes
 
 WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets Qt5Xml
-WANTLIB += c curses fftw3f fluidsynth jack m mp3lame ogg portaudio
-WANTLIB += readline samplerate sndfile sndio vorbis vorbisenc
-WANTLIB += vorbisfile
+WANTLIB += Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama
+WANTLIB += c curses fftw3 fftw3f fluidsynth fltk fontconfig jack lo
+WANTLIB += m mp3lame mxml ogg portaudio readline samplerate sndfile sndio
+WANTLIB += vorbis vorbisenc vorbisfile z
 
 COMPILER =             base-clang ports-gcc
 
@@ -32,13 +33,18 @@ BUILD_DEPENDS =             shells/bash
 RUN_DEPENDS =          devel/desktop-file-utils \
                        misc/shared-mime-info \
                        x11/gtk+3,-guic
+
 LIB_DEPENDS =          audio/fluidsynth \
                        audio/jack \
                        audio/lame \
+                       audio/liblo \
                        audio/libsamplerate \
                        audio/libvorbis \
                        audio/portaudio-svn \
-                       math/fftw3,float
+                       math/fftw3 \
+                       math/fftw3,float \
+                       textproc/mxml \
+                       x11/fltk
 
 CONFIGURE_ENV =                CFLAGS="${CFLAGS} -I${X11BASE}/include 
-I${LOCALBASE}/include" \
                        CXXFLAGS="${CXXFLAGS} -I${X11BASE}/include 
-I${LOCALBASE}/include" \
Index: patches/patch-plugins_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/lmms/patches/patch-plugins_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-plugins_CMakeLists_txt
--- patches/patch-plugins_CMakeLists_txt        24 Jun 2018 11:57:13 -0000      
1.1
+++ patches/patch-plugins_CMakeLists_txt        27 Jun 2020 06:34:22 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-plugins_CMakeLists_txt,v 1.1 2018/06/24 11:57:13 sthen Exp $
-
-Index: plugins/CMakeLists.txt
---- plugins/CMakeLists.txt.orig
-+++ plugins/CMakeLists.txt
-@@ -80,7 +80,7 @@ IF("${PLUGIN_LIST}" STREQUAL "")
-               watsyn
-               waveshaper
-               vibed
--              zynaddsubfx
-+#             zynaddsubfx
-       )
- 
- ENDIF("${PLUGIN_LIST}" STREQUAL "")
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/lmms/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST   30 Jan 2020 14:13:47 -0000      1.7
+++ pkg/PLIST   27 Jun 2020 06:34:22 -0000
@@ -1,7 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.7 2020/01/30 14:13:47 sthen Exp $
 @bin bin/lmms
 lib/lmms/
+@bin lib/lmms/RemoteZynAddSubFx
 @so lib/lmms/libOPL2.so
+@so lib/lmms/libZynAddSubFxCore.so
 @so lib/lmms/libamplifier.so
 @so lib/lmms/libaudiofileprocessor.so
 @so lib/lmms/libbassbooster.so
@@ -38,6 +40,7 @@ lib/lmms/
 @so lib/lmms/libvibedstrings.so
 @so lib/lmms/libwatsyn.so
 @so lib/lmms/libwaveshaper.so
+@so lib/lmms/libzynaddsubfx.so
 @man man/man1/lmms.1
 share/applications/lmms.desktop
 share/bash-completion/completions/lmms

Reply via email to