pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/lmms lmms: configure fails unless qt5-qttools is...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9151bf45384
branches:  trunk
changeset: 397118:d9151bf45384
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jun 17 07:31:12 2019 +0000

description:
lmms: configure fails unless qt5-qttools is installed.

diffstat:

 audio/lmms/Makefile   |  7 ++-----
 audio/lmms/options.mk |  5 ++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 5db0cda55001 -r d9151bf45384 audio/lmms/Makefile
--- a/audio/lmms/Makefile       Mon Jun 17 05:43:02 2019 +0000
+++ b/audio/lmms/Makefile       Mon Jun 17 07:31:12 2019 +0000
@@ -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 @@
 # 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 @@
 .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"
diff -r 5db0cda55001 -r d9151bf45384 audio/lmms/options.mk
--- a/audio/lmms/options.mk     Mon Jun 17 05:43:02 2019 +0000
+++ b/audio/lmms/options.mk     Mon Jun 17 07:31:12 2019 +0000
@@ -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 @@
 
 .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"



Home | Main Index | Thread Index | Old Index