CVS commit: pkgsrc/audio/qmmp

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 31 16:50:46 UTC 2025

Modified Files:
        pkgsrc/audio/qmmp: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/audio/qmmp/patches: patch-src_qmmp_output.cpp

Log Message:
qmmp: Update to 1.7.4

Fixes a crash and the build on FreeBSD, among other things.

Verified to build on NetBSD & Linux by drecklypkg ci.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/audio/qmmp/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/qmmp/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/qmmp/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/qmmp/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/qmmp/patches/patch-src_qmmp_output.cpp

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

Modified files:

Index: pkgsrc/audio/qmmp/Makefile
diff -u pkgsrc/audio/qmmp/Makefile:1.63 pkgsrc/audio/qmmp/Makefile:1.64
--- pkgsrc/audio/qmmp/Makefile:1.63     Wed Feb 12 06:44:28 2025
+++ pkgsrc/audio/qmmp/Makefile  Mon Mar 31 16:50:45 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2025/02/12 06:44:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2025/03/31 16:50:45 nia Exp $
 
-DISTNAME=      qmmp-1.6.5
-PKGREVISION=   13
+DISTNAME=      qmmp-1.7.4
 CATEGORIES=    audio
 MASTER_SITES=  https://qmmp.ylsoftware.com/files/qmmp/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.bz2
@@ -11,10 +10,11 @@ HOMEPAGE=   https://qmmp.ylsoftware.com/
 COMMENT=       Audio player similar to Winamp/XMMS using Qt5
 LICENSE=       gnu-gpl-v2
 
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
+USE_CXX_FEATURES+=     c++17
+
 TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 # using mpg123 instead, it's better maintained
@@ -23,6 +23,7 @@ CMAKE_CONFIGURE_ARGS+=        -DUSE_MAD=OFF
 # ??? seems to break playing some files
 CMAKE_CONFIGURE_ARGS+= -DUSE_MPLAYER=OFF
 
+# package not available
 CMAKE_CONFIGURE_ARGS+= -DUSE_PIPEWIRE=OFF
 
 .include "../../mk/oss.buildlink3.mk"
@@ -31,25 +32,35 @@ CMAKE_CONFIGURE_ARGS+=      -DUSE_PIPEWIRE=OF
 PLIST_VARS+=           oss oss4
 .  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
 PLIST.oss4=            yes
-CMAKE_CONFIGURE_ARGS+=         -DUSE_OSS=OFF
-CMAKE_CONFIGURE_ARGS+=         -DUSE_OSS4=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS4=ON
 .  else
 PLIST.oss=             yes
-CMAKE_CONFIGURE_ARGS+=         -DUSE_OSS=ON
-CMAKE_CONFIGURE_ARGS+=         -DUSE_OSS4=OFF
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS=ON
+CMAKE_CONFIGURE_ARGS+= -DUSE_OSS4=OFF
 LDFLAGS+=              ${LIBOSSAUDIO}
 .  endif
 SUBST_CLASSES+=                oss
 SUBST_STAGE.oss=       pre-build
 SUBST_MESSAGE.oss=     Correcting the path to OSS device.
-SUBST_FILES.oss+=      src/plugins/Output/oss/outputoss.cpp
-SUBST_FILES.oss+=      src/plugins/Output/oss/settingsdialog.cpp
-SUBST_FILES.oss+=      src/plugins/Output/oss4/outputoss4.h
+SUBST_FILES.oss+=      src/plugins/Output/oss/*
+SUBST_FILES.oss+=      src/plugins/Output/oss4/*
 SUBST_SED.oss+=                -e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_VARS.oss+=       LIBOSSAUDIO
 .endif
 
+QMMP_VER=              ${PKGVERSION_NOREV:R}
+PLIST_SUBST+=          QMMP_VER=${QMMP_VER}
+PRINT_PLIST_AWK+=      {gsub(/qmmp-${QMMP_VER}/, "qmmp-$${QMMP_VER}");}
+PRINT_PLIST_AWK+=      /libalsa./ { print "$${PLIST.alsa}" $$0; next }
+PRINT_PLIST_AWK+=      /libjack./ { print "$${PLIST.jack}" $$0; next }
+PRINT_PLIST_AWK+=      /libpulse./ { print "$${PLIST.pulse}" $$0; next }
+PRINT_PLIST_AWK+=      /liboss.so/ { print "$${PLIST.oss}" $$0; next }
+PRINT_PLIST_AWK+=      /liboss4.so/ { print "$${PLIST.oss4}" $$0; next }
+PRINT_PLIST_AWK+=      /libffmpeg./ { print "$${PLIST.ffmpeg}" $$0; next }
+
 .include "options.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/game-music-emu/buildlink3.mk"
@@ -67,6 +78,11 @@ SUBST_VARS.oss+=     LIBOSSAUDIO
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.if ${OPSYS} == "Darwin"
+.  include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.else
+# enable pulseaudio option instead
+CMAKE_CONFIGURE_ARGS+= -DUSE_QTMULTIMEDIA=OFF
+.  include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/qmmp/PLIST
diff -u pkgsrc/audio/qmmp/PLIST:1.6 pkgsrc/audio/qmmp/PLIST:1.7
--- pkgsrc/audio/qmmp/PLIST:1.6 Sun Oct 29 13:28:08 2023
+++ pkgsrc/audio/qmmp/PLIST     Mon Mar 31 16:50:45 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/10/29 13:28:08 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.7 2025/03/31 16:50:45 nia Exp $
 bin/qmmp-1
 include/qmmp-1/qmmp/abstractengine.h
 include/qmmp-1/qmmp/audioconverter.h
@@ -29,6 +29,7 @@ include/qmmp-1/qmmp/visual.h
 include/qmmp-1/qmmp/visualfactory.h
 include/qmmp-1/qmmp/volume.h
 include/qmmp-1/qmmp/volumehandler.h
+include/qmmp-1/qmmpui/colorwidget.h
 include/qmmp-1/qmmpui/commandlinehandler.h
 include/qmmp-1/qmmpui/commandlinemanager.h
 include/qmmp-1/qmmpui/configdialog.h
@@ -51,10 +52,12 @@ include/qmmp-1/qmmpui/playlistparser.h
 include/qmmp-1/qmmpui/playlisttrack.h
 include/qmmp-1/qmmpui/qmmpui_export.h
 include/qmmp-1/qmmpui/qmmpuisettings.h
+include/qmmp-1/qmmpui/shortcutdialog.h
 include/qmmp-1/qmmpui/templateeditor.h
 include/qmmp-1/qmmpui/uifactory.h
 include/qmmp-1/qmmpui/uihelper.h
 include/qmmp-1/qmmpui/uiloader.h
+include/qmmp-1/qmmpui/visualmenu.h
 lib/libqmmp-1.so
 lib/libqmmp-1.so.1
 lib/libqmmp-1.so.${PKGVERSION}
@@ -63,67 +66,66 @@ lib/libqmmpui-1.so.1
 lib/libqmmpui-1.so.${PKGVERSION}
 lib/pkgconfig/qmmp-1.pc
 lib/pkgconfig/qmmpui-1.pc
-lib/qmmp-1.6/CommandLineOptions/libincdecvolumeoption.so
-lib/qmmp-1.6/CommandLineOptions/libplaylistoption.so
-lib/qmmp-1.6/CommandLineOptions/libseekoption.so
-lib/qmmp-1.6/CommandLineOptions/libstatusoption.so
-lib/qmmp-1.6/Effect/libcrossfade.so
-lib/qmmp-1.6/Effect/libfilewriter.so
-lib/qmmp-1.6/Effect/libladspa.so
-lib/qmmp-1.6/Effect/libmonotostereo.so
-lib/qmmp-1.6/Effect/libsoxr.so
-lib/qmmp-1.6/Effect/libstereo.so
-lib/qmmp-1.6/FileDialogs/libqmmpfiledialog.so
-lib/qmmp-1.6/FileDialogs/libtwopanelfiledialog.so
-lib/qmmp-1.6/General/libconverter.so
-lib/qmmp-1.6/General/libcopypaste.so
-lib/qmmp-1.6/General/libcovermanager.so
-lib/qmmp-1.6/General/libfileops.so
-lib/qmmp-1.6/General/libgnomehotkey.so
-lib/qmmp-1.6/General/libhistory.so
-lib/qmmp-1.6/General/libhotkey.so
-lib/qmmp-1.6/General/libkdenotify.so
-lib/qmmp-1.6/General/liblibrary.so
-lib/qmmp-1.6/General/liblistenbrainz.so
-lib/qmmp-1.6/General/liblyrics.so
-lib/qmmp-1.6/General/libmpris.so
-lib/qmmp-1.6/General/libnotifier.so
-lib/qmmp-1.6/General/librgscan.so
-lib/qmmp-1.6/General/libscrobbler.so
-lib/qmmp-1.6/General/libsleepinhibitor.so
-lib/qmmp-1.6/General/libstatusicon.so
-lib/qmmp-1.6/General/libstreambrowser.so
-lib/qmmp-1.6/General/libtrackchange.so
-lib/qmmp-1.6/General/libudisks.so
-lib/qmmp-1.6/Input/libaac.so
-lib/qmmp-1.6/Input/libcue.so
-${PLIST.ffmpeg}lib/qmmp-1.6/Input/libffmpeg.so
-lib/qmmp-1.6/Input/libflac.so
-lib/qmmp-1.6/Input/libgme.so
-${PLIST.mpc}lib/qmmp-1.6/Input/libmpc.so
-lib/qmmp-1.6/Input/libmpeg.so
-lib/qmmp-1.6/Input/libopus.so
-${PLIST.sid}lib/qmmp-1.6/Input/libsid.so
-lib/qmmp-1.6/Input/libsndfile.so
-lib/qmmp-1.6/Input/libvorbis.so
-${PLIST.wv}lib/qmmp-1.6/Input/libwavpack.so
-lib/qmmp-1.6/Input/libwildmidi.so
-lib/qmmp-1.6/Input/libxmp.so
-${PLIST.alsa}lib/qmmp-1.6/Output/libalsa.so
-${PLIST.jack}lib/qmmp-1.6/Output/libjack.so
-lib/qmmp-1.6/Output/libnull.so
-${PLIST.oss}lib/qmmp-1.6/Output/liboss.so
-${PLIST.oss4}lib/qmmp-1.6/Output/liboss4.so
-${PLIST.pulse}lib/qmmp-1.6/Output/libpulseaudio.so
-lib/qmmp-1.6/Output/libqtmultimedia.so
-lib/qmmp-1.6/Output/libshout.so
-lib/qmmp-1.6/PlayListFormats/libm3uplaylistformat.so
-lib/qmmp-1.6/PlayListFormats/libplsplaylistformat.so
-lib/qmmp-1.6/PlayListFormats/libxspfplaylistformat.so
-lib/qmmp-1.6/Transports/libhttp.so
-lib/qmmp-1.6/Ui/libqsui.so
-lib/qmmp-1.6/Ui/libskinned.so
-lib/qmmp-1.6/Visual/libanalyzer.so
+lib/qmmp-${QMMP_VER}/CommandLineOptions/libincdecvolumeoption.so
+lib/qmmp-${QMMP_VER}/CommandLineOptions/libplaylistoption.so
+lib/qmmp-${QMMP_VER}/CommandLineOptions/libseekoption.so
+lib/qmmp-${QMMP_VER}/CommandLineOptions/libstatusoption.so
+lib/qmmp-${QMMP_VER}/Effect/libcrossfade.so
+lib/qmmp-${QMMP_VER}/Effect/libfilewriter.so
+lib/qmmp-${QMMP_VER}/Effect/libladspa.so
+lib/qmmp-${QMMP_VER}/Effect/libmonotostereo.so
+lib/qmmp-${QMMP_VER}/Effect/libsoxr.so
+lib/qmmp-${QMMP_VER}/Effect/libstereo.so
+lib/qmmp-${QMMP_VER}/FileDialogs/libqmmpfiledialog.so
+lib/qmmp-${QMMP_VER}/FileDialogs/libtwopanelfiledialog.so
+lib/qmmp-${QMMP_VER}/General/libconverter.so
+lib/qmmp-${QMMP_VER}/General/libcopypaste.so
+lib/qmmp-${QMMP_VER}/General/libcovermanager.so
+lib/qmmp-${QMMP_VER}/General/libfileops.so
+lib/qmmp-${QMMP_VER}/General/libgnomehotkey.so
+lib/qmmp-${QMMP_VER}/General/libhistory.so
+lib/qmmp-${QMMP_VER}/General/libhotkey.so
+lib/qmmp-${QMMP_VER}/General/libkdenotify.so
+lib/qmmp-${QMMP_VER}/General/liblibrary.so
+lib/qmmp-${QMMP_VER}/General/liblistenbrainz.so
+lib/qmmp-${QMMP_VER}/General/liblyrics.so
+lib/qmmp-${QMMP_VER}/General/libmpris.so
+lib/qmmp-${QMMP_VER}/General/libnotifier.so
+lib/qmmp-${QMMP_VER}/General/librgscan.so
+lib/qmmp-${QMMP_VER}/General/libscrobbler.so
+lib/qmmp-${QMMP_VER}/General/libsleepinhibitor.so
+lib/qmmp-${QMMP_VER}/General/libstatusicon.so
+lib/qmmp-${QMMP_VER}/General/libstreambrowser.so
+lib/qmmp-${QMMP_VER}/General/libtrackchange.so
+lib/qmmp-${QMMP_VER}/General/libudisks.so
+lib/qmmp-${QMMP_VER}/Input/libaac.so
+lib/qmmp-${QMMP_VER}/Input/libcue.so
+${PLIST.ffmpeg}lib/qmmp-${QMMP_VER}/Input/libffmpeg.so
+lib/qmmp-${QMMP_VER}/Input/libflac.so
+lib/qmmp-${QMMP_VER}/Input/libgme.so
+${PLIST.mpc}lib/qmmp-${QMMP_VER}/Input/libmpc.so
+lib/qmmp-${QMMP_VER}/Input/libmpeg.so
+lib/qmmp-${QMMP_VER}/Input/libopus.so
+${PLIST.sid}lib/qmmp-${QMMP_VER}/Input/libsid.so
+lib/qmmp-${QMMP_VER}/Input/libsndfile.so
+lib/qmmp-${QMMP_VER}/Input/libvorbis.so
+${PLIST.wv}lib/qmmp-${QMMP_VER}/Input/libwavpack.so
+lib/qmmp-${QMMP_VER}/Input/libwildmidi.so
+lib/qmmp-${QMMP_VER}/Input/libxmp.so
+${PLIST.alsa}lib/qmmp-${QMMP_VER}/Output/libalsa.so
+${PLIST.jack}lib/qmmp-${QMMP_VER}/Output/libjack.so
+lib/qmmp-${QMMP_VER}/Output/libnull.so
+${PLIST.oss}lib/qmmp-${QMMP_VER}/Output/liboss.so
+${PLIST.oss4}lib/qmmp-${QMMP_VER}/Output/liboss4.so
+${PLIST.pulse}lib/qmmp-${QMMP_VER}/Output/libpulse.so
+lib/qmmp-${QMMP_VER}/Output/libshout.so
+lib/qmmp-${QMMP_VER}/PlayListFormats/libm3uplaylistformat.so
+lib/qmmp-${QMMP_VER}/PlayListFormats/libplsplaylistformat.so
+lib/qmmp-${QMMP_VER}/PlayListFormats/libxspfplaylistformat.so
+lib/qmmp-${QMMP_VER}/Transports/libhttp.so
+lib/qmmp-${QMMP_VER}/Ui/libqsui.so
+lib/qmmp-${QMMP_VER}/Ui/libskinned.so
+lib/qmmp-${QMMP_VER}/Visual/libanalyzer.so
 share/applications/qmmp-1.desktop
 share/applications/qmmp-dir-1.desktop
 share/applications/qmmp-enqueue-1.desktop
@@ -136,7 +138,7 @@ share/icons/hicolor/56x56/apps/qmmp-1.pn
 share/icons/hicolor/64x64/apps/qmmp-1.png
 share/icons/hicolor/scalable/apps/qmmp-1.svgz
 share/icons/hicolor/scalable/apps/qmmp-simple-1.svgz
-share/metainfo/qmmp-1.appdata.xml
+share/metainfo/com.ylsoftware.qmmp-1.metainfo.xml
 share/qmmp-1/images/app_icon.png
 share/qmmp-1/images/empty_cover.png
 share/qmmp-1/scripts/kwin.sh

Index: pkgsrc/audio/qmmp/distinfo
diff -u pkgsrc/audio/qmmp/distinfo:1.13 pkgsrc/audio/qmmp/distinfo:1.14
--- pkgsrc/audio/qmmp/distinfo:1.13     Sun Oct 29 13:28:08 2023
+++ pkgsrc/audio/qmmp/distinfo  Mon Mar 31 16:50:45 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.13 2023/10/29 13:28:08 rhialto Exp $
+$NetBSD: distinfo,v 1.14 2025/03/31 16:50:45 nia Exp $
 
-BLAKE2s (qmmp-1.6.5.tar.bz2) = 191571c004090e137765b1c437fde140de30fcbf21fbcb11ba123206e3bde9d2
-SHA512 (qmmp-1.6.5.tar.bz2) = 195185a06d053c481b90ccd8b06200734b9623b569bb29eaea95e2777e463d98ca7e4825f2aac27ce18b3f573cfbfa66ea963f1349fed5a4cc7f3e65334bee9e
-Size (qmmp-1.6.5.tar.bz2) = 1379947 bytes
+BLAKE2s (qmmp-1.7.4.tar.bz2) = ef55a056b4e45bfe1f0ceffdebf14084997306f6240caf7430fda01800019cc2
+SHA512 (qmmp-1.7.4.tar.bz2) = 4a73b32fa66aca8443005b60b08ae2e6c32a49ea4c4cc6897858c86bc3f463276356a8dd3fd5e3c77583f9cdbdd96d1b25f65c7e6afa9d68da56aaf0d7115ab8
+Size (qmmp-1.7.4.tar.bz2) = 1424474 bytes
+SHA1 (patch-src_qmmp_output.cpp) = f41527c9005f6f345df3dd2e8bc7a497c99dd949

Index: pkgsrc/audio/qmmp/options.mk
diff -u pkgsrc/audio/qmmp/options.mk:1.4 pkgsrc/audio/qmmp/options.mk:1.5
--- pkgsrc/audio/qmmp/options.mk:1.4    Sun Aug 25 06:18:25 2024
+++ pkgsrc/audio/qmmp/options.mk        Mon Mar 31 16:50:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2024/08/25 06:18:25 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2025/03/31 16:50:45 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmmp
 PKG_SUPPORTED_OPTIONS+=                alsa jack pulseaudio
@@ -35,7 +35,7 @@ CMAKE_CONFIGURE_ARGS+=        -DUSE_JACK=OFF
 PLIST_VARS+=   ffmpeg
 .if !empty(PKG_OPTIONS:Mffmpeg)
 PLIST.ffmpeg=  yes
-.  include "../../multimedia/ffmpeg4/buildlink3.mk"
+.  include "../../multimedia/ffmpeg7/buildlink3.mk"
 .else
 CMAKE_CONFIGURE_ARGS+= -DUSE_FFMPEG=OFF
 .endif

Added files:

Index: pkgsrc/audio/qmmp/patches/patch-src_qmmp_output.cpp
diff -u /dev/null pkgsrc/audio/qmmp/patches/patch-src_qmmp_output.cpp:1.1
--- /dev/null   Mon Mar 31 16:50:46 2025
+++ pkgsrc/audio/qmmp/patches/patch-src_qmmp_output.cpp Mon Mar 31 16:50:45 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_qmmp_output.cpp,v 1.1 2025/03/31 16:50:45 nia Exp $
+
+Default to oss instead of oss4 so this works on more systems.
+
+--- src/qmmp/output.cpp.orig   2025-03-31 12:04:58.753946864 +0000
++++ src/qmmp/output.cpp
+@@ -154,7 +154,7 @@ OutputFactory *Output::currentFactory()
+ #elif defined Q_OS_MAC
+     QString name = settings.value(u"Output/current_plugin"_s, u"qtmultimedia"_s).toString();
+ #else
+-    QString name = settings.value(u"Output/current_plugin"_s, u"oss4"_s).toString();
++    QString name = settings.value(u"Output/current_plugin"_s, u"oss"_s).toString();
+ #endif
+ #endif //QMMP_DEFAULT_OUTPUT
+     for(QmmpPluginCache *item : std::as_const(*m_cache))