git: 0546bc051f39 - main - multimedia/musikcube: Update 0.98.0 → 0.99.5

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 11 Mar 2023 09:16:30 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0546bc051f3934afa953d52e3775d48492157515

commit 0546bc051f3934afa953d52e3775d48492157515
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-03-11 09:14:26 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-03-11 09:16:18 +0000

    multimedia/musikcube: Update 0.98.0 → 0.99.5
    
    Reported by:    portscout
---
 multimedia/musikcube/Makefile                               | 11 +++++++----
 multimedia/musikcube/distinfo                               |  6 +++---
 multimedia/musikcube/files/patch-CMakeLists.txt             | 13 -------------
 .../files/patch-src_plugins_gmedecoder_gme_blargg__endian.h | 13 -------------
 multimedia/musikcube/files/patch-src_plugins_pulseout_pch.h |  8 --------
 multimedia/musikcube/pkg-plist                              |  6 +++++-
 6 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile
index c14d40ea98fd..55303a5c55c9 100644
--- a/multimedia/musikcube/Makefile
+++ b/multimedia/musikcube/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	musikcube
-DISTVERSION=	0.98.0
-PORTREVISION=	3
+DISTVERSION=	0.99.5
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,7 +9,9 @@ WWW=		https://musikcube.com/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+BUILD_DEPENDS=	asio>0:net/asio
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libavcodec.so:multimedia/ffmpeg \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libev.so:devel/libev \
@@ -21,12 +22,14 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libmpg123.so:audio/mpg123 \
 		libogg.so:audio/libogg \
 		libopenmpt.so:audio/libopenmpt \
+		libpipewire-0.3.so:multimedia/pipewire \
+		libportaudio.so:audio/portaudio \
 		libpulse.so:audio/pulseaudio \
 		libsndio.so:audio/sndio \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 
-USES=		cmake:noninja compiler:c++14-lang pkgconfig ssl
+USES=		cmake:noninja compiler:c++17-lang pkgconfig ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
diff --git a/multimedia/musikcube/distinfo b/multimedia/musikcube/distinfo
index 5b2f99005671..e84b9ce410aa 100644
--- a/multimedia/musikcube/distinfo
+++ b/multimedia/musikcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656988955
-SHA256 (clangen-musikcube-0.98.0_GH0.tar.gz) = a4ae9d6d0fa5ce99de2e7bbc1de75cc8638704a2284b38a51178e23bbe55499c
-SIZE (clangen-musikcube-0.98.0_GH0.tar.gz) = 6484960
+TIMESTAMP = 1678521534
+SHA256 (clangen-musikcube-0.99.5_GH0.tar.gz) = 917fe53dc01a9d88b769e52c42f3332ddd35d354b399eded093c0b27f0aab319
+SIZE (clangen-musikcube-0.99.5_GH0.tar.gz) = 4820666
diff --git a/multimedia/musikcube/files/patch-CMakeLists.txt b/multimedia/musikcube/files/patch-CMakeLists.txt
deleted file mode 100644
index b10cd691bb73..000000000000
--- a/multimedia/musikcube/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt.orig	2022-07-05 03:16:16 UTC
-+++ CMakeLists.txt
-@@ -97,7 +97,9 @@ add_dependencies(musikcubed musikcore)
- add_plugin("src/plugins/taglib_plugin" "taglibreader")
- # outputs
- add_plugin("src/plugins/nullout" "nullout")
--add_plugin("src/plugins/alsaout" "alsaout")
-+if(NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  add_plugin("src/plugins/alsaout" "alsaout")
-+endif()
- add_plugin("src/plugins/pulseout" "pulseout")
- add_plugin("src/plugins/pipewireout" "pipewireout")
- add_plugin("src/plugins/sndioout" "sndioout")
diff --git a/multimedia/musikcube/files/patch-src_plugins_gmedecoder_gme_blargg__endian.h b/multimedia/musikcube/files/patch-src_plugins_gmedecoder_gme_blargg__endian.h
deleted file mode 100644
index 7613a988e0f7..000000000000
--- a/multimedia/musikcube/files/patch-src_plugins_gmedecoder_gme_blargg__endian.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/plugins/gmedecoder/gme/blargg_endian.h.orig	2021-04-05 20:58:30 UTC
-+++ src/plugins/gmedecoder/gme/blargg_endian.h
-@@ -34,9 +34,7 @@
- #if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \
- 		(defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234)
- 	#define BLARGG_LITTLE_ENDIAN 1
--#endif
--
--#if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
-+#elif defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
- 	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
diff --git a/multimedia/musikcube/files/patch-src_plugins_pulseout_pch.h b/multimedia/musikcube/files/patch-src_plugins_pulseout_pch.h
deleted file mode 100644
index 1b58a6f86c19..000000000000
--- a/multimedia/musikcube/files/patch-src_plugins_pulseout_pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/plugins/pulseout/pch.h.orig	2022-07-05 03:39:04 UTC
-+++ src/plugins/pulseout/pch.h
-@@ -38,4 +38,4 @@
- #include <musikcore/config.h>
- #include <iostream>
- 
--#include <alsa/asoundlib.h>
-+//#include <alsa/asoundlib.h>
diff --git a/multimedia/musikcube/pkg-plist b/multimedia/musikcube/pkg-plist
index c411773f4b13..72a1de07d8a3 100644
--- a/multimedia/musikcube/pkg-plist
+++ b/multimedia/musikcube/pkg-plist
@@ -45,7 +45,9 @@ include/musikcube/musikcore/sdk/IVisualizer.h
 include/musikcube/musikcore/sdk/ReplayGain.h
 include/musikcube/musikcore/sdk/String.h
 include/musikcube/musikcore/sdk/constants.h
+include/musikcube/musikcore/sdk/version.h
 %%DATADIR%%/libmusikcore.so
+%%DATADIR%%/locales/cs_CZ.json
 %%DATADIR%%/locales/de_DE.json
 %%DATADIR%%/locales/en_US.json
 %%DATADIR%%/locales/es_ES.json
@@ -56,11 +58,13 @@ include/musikcube/musikcore/sdk/constants.h
 %%DATADIR%%/locales/zh_CN.json
 %%DATADIR%%/musikcube
 %%DATADIR%%/musikcubed
+%%DATADIR%%/plugins/libalsaout.so
 %%DATADIR%%/plugins/libffmpegdecoder.so
-%%DATADIR%%/plugins/libgmedecoder.so
 %%DATADIR%%/plugins/libhttpdatastream.so
 %%DATADIR%%/plugins/libnullout.so
 %%DATADIR%%/plugins/libopenmptdecoder.so
+%%DATADIR%%/plugins/libpipewireout.so
+%%DATADIR%%/plugins/libportaudioout.so
 %%DATADIR%%/plugins/libpulseout.so
 %%DATADIR%%/plugins/libserver.so
 %%DATADIR%%/plugins/libsndioout.so