CVS commit: pkgsrc/audio/lmms

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 17 07:31:13 UTC 2019

Modified Files:
        pkgsrc/audio/lmms: Makefile options.mk

Log Message:
lmms: configure fails unless qt5-qttools is installed.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/audio/lmms/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/lmms/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/lmms/Makefile
diff -u pkgsrc/audio/lmms/Makefile:1.52 pkgsrc/audio/lmms/Makefile:1.53
--- pkgsrc/audio/lmms/Makefile:1.52     Mon Jun 10 19:08:42 2019
+++ pkgsrc/audio/lmms/Makefile  Mon Jun 17 07:31:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/06/10 19:08:42 nia Exp $
+# $NetBSD: Makefile,v 1.53 2019/06/17 07:31:12 nia Exp $
 #
 
 VERSION=               1.2.0
@@ -34,10 +34,6 @@ BUILDLINK_TRANSFORM+=        rm:-floop-optimize
 # for libzynaddsubfx.so in plugins/zynaddsubfx/.
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/lmms
 
-# libSDL defines some symbols that are also defined in libX11, which has
-# been fixed in SDL 1.2.11.
-BUILDLINK_ABI_DEPENDS.SDL+=    SDL>=1.2.11
-
 .include "options.mk"
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
@@ -49,6 +45,7 @@ BUILDLINK_ABI_DEPENDS.SDL+=   SDL>=1.2.11
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/audio/lmms/options.mk
diff -u pkgsrc/audio/lmms/options.mk:1.1 pkgsrc/audio/lmms/options.mk:1.2
--- pkgsrc/audio/lmms/options.mk:1.1    Mon Jun 10 19:08:42 2019
+++ pkgsrc/audio/lmms/options.mk        Mon Jun 17 07:31:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/06/10 19:08:42 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/06/17 07:31:12 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lmms
 
@@ -38,6 +38,9 @@ CMAKE_ARGS+=  -DWANT_PULSEAUDIO=OFF
 
 .if !empty(PKG_OPTIONS:Msdl)
 CMAKE_ARGS+=   -DWANT_SDL=ON
+# libSDL defines some symbols that are also defined in libX11, which has
+# been fixed in SDL 1.2.11.
+BUILDLINK_ABI_DEPENDS.SDL+=    SDL>=1.2.11
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../audio/SDL_sound/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"