CVS commit: pkgsrc/audio/spotify-qt

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Sep  6 12:25:21 UTC 2023

Modified Files:
        pkgsrc/audio/spotify-qt: Makefile
Added Files:
        pkgsrc/audio/spotify-qt: options.mk

Log Message:
audio/spotify-qt: enable Qt6

... and switch to it by default.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/spotify-qt/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/spotify-qt/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/spotify-qt/Makefile
diff -u pkgsrc/audio/spotify-qt/Makefile:1.21 pkgsrc/audio/spotify-qt/Makefile:1.22
--- pkgsrc/audio/spotify-qt/Makefile:1.21       Mon May 22 21:00:17 2023
+++ pkgsrc/audio/spotify-qt/Makefile    Wed Sep  6 12:25:21 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2023/05/22 21:00:17 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2023/09/06 12:25:21 pin Exp $
 
 DISTNAME=      spotify-qt-3.10
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=kraxarn/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,21 +11,15 @@ HOMEPAGE=   https://github.com/kraxarn/spo
 COMMENT=       Lightweight Spotify client using Qt
 LICENSE=       gnu-gpl-v3
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
-
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX=${PREFIX}
 
-pre-configure:
-       ${MKDIR} -p ${WRKSRC}/build
-
 DEPENDS+=      librespot-[0-9]*:../../audio/librespot
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "options.mk"
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/audio/spotify-qt/options.mk
diff -u /dev/null pkgsrc/audio/spotify-qt/options.mk:1.1
--- /dev/null   Wed Sep  6 12:25:21 2023
+++ pkgsrc/audio/spotify-qt/options.mk  Wed Sep  6 12:25:21 2023
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2023/09/06 12:25:21 pin Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.spotify-qt
+PKG_OPTIONS_OPTIONAL_GROUPS=   gui
+PKG_OPTIONS_GROUP.gui=         qt5 qt6
+PKG_SUGGESTED_OPTIONS=         qt6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mqt5)
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt6)
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.endif