multimedia/nymph*: update to latest RC

There are now RC's for all the parts of nymphcast, update
to those versions. Release notes (although they mostly
point at new binary-builds of the tools) are at

	https://github.com/MayaPosch/NymphRPC/releases/tag/v0.1-rc0
	https://github.com/MayaPosch/libnymphcast/releases/tag/v0.1-rc0
	https://github.com/MayaPosch/NymphCast/releases/tag/v0.1-rc1

15 files changed, 34 insertions, 210 deletions

diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile
index f05fc6969883..2f2ce3c39398 100644
--- a/multimedia/nymphcast/Makefile
+++ b/multimedia/nymphcast/Makefile
@@ -1,20 +1,12 @@
 PORTNAME=	NymphCast
-DISTVERSION=	v0.1-rc0
-PORTREVISION=	2
+DISTVERSION=	v0.1-rc1
 CATEGORIES=	multimedia
 
-# -p3 because WRKSRC_SUBDIR is set; the patches are from the toplevel,
-# similarly the LICENSE_FILE lives at the toplevel of the upstream
-# source repo, outside of WRKSRC_SUBDIR.
-PATCHFILES=	e4de6983e738acff88db8c81a2e5bb0760db5855.patch:-p3 \
-		1d32a9d470dd8b6c2af5f6638b53b9a012865cc7.patch:-p3 \
-		40e8c286f7d5f37e976e655a086d5630107c7f09.patch:-p3 \
-		9e192666796bdb1913a2f965314a8cf51c2a644f.patch:-p3
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Audio and video source for a television or powered speakers
 
+# The LICENSE_FILE lives outside the top-of-the-tree because
+# WRKSRC_SUBDIR is set.
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
@@ -38,7 +30,4 @@ GH_ACCOUNT=	MayaPosch
 
 WRKSRC_SUBDIR=	src/server
 
-post-extract:
-	${MV} ${WRKSRC}/version ${WRKSRC}/version.mk
-
 .include <bsd.port.mk>
diff --git a/multimedia/nymphcast/distinfo b/multimedia/nymphcast/distinfo
index 6b6e612a7c3b..a92df743b75b 100644
--- a/multimedia/nymphcast/distinfo
+++ b/multimedia/nymphcast/distinfo
@@ -1,11 +1,3 @@
-TIMESTAMP = 1644866502
-SHA256 (MayaPosch-NymphCast-v0.1-rc0_GH0.tar.gz) = f1b24fb7a1e33f3a6d265d88f38d3311fa52ac682f3da6723fd920d12aa8eb51
-SIZE (MayaPosch-NymphCast-v0.1-rc0_GH0.tar.gz) = 122440019
-SHA256 (e4de6983e738acff88db8c81a2e5bb0760db5855.patch) = 1f2e867df817feef5c23ddd2b17b15ee7e67664e6bedbcfac5007b8397939ace
-SIZE (e4de6983e738acff88db8c81a2e5bb0760db5855.patch) = 562
-SHA256 (1d32a9d470dd8b6c2af5f6638b53b9a012865cc7.patch) = 44b8327462c0ed85b785957e0b40792268342e20cab5092b211b449bf2bde7f7
-SIZE (1d32a9d470dd8b6c2af5f6638b53b9a012865cc7.patch) = 978
-SHA256 (40e8c286f7d5f37e976e655a086d5630107c7f09.patch) = d192afdd52b623350816583d3ceb4d2ecf624098e9a0dadd88cfce8abb3b8be7
-SIZE (40e8c286f7d5f37e976e655a086d5630107c7f09.patch) = 815
-SHA256 (9e192666796bdb1913a2f965314a8cf51c2a644f.patch) = 2cb24f1af222cd555b1e6aa9700aa1b4b841075f5cdaa1b76c40eff025c9764c
-SIZE (9e192666796bdb1913a2f965314a8cf51c2a644f.patch) = 1601
+TIMESTAMP = 1647378241
+SHA256 (MayaPosch-NymphCast-v0.1-rc1_GH0.tar.gz) = d677f648c264cf774d9230479ac987649652acdbba3ad6687db69d78f80aa853
+SIZE (MayaPosch-NymphCast-v0.1-rc1_GH0.tar.gz) = 124183013
diff --git a/multimedia/nymphcast/files/patch-Makefile b/multimedia/nymphcast/files/patch-Makefile
index ce39d1cd8969..f717953d1fc0 100644
--- a/multimedia/nymphcast/files/patch-Makefile
+++ b/multimedia/nymphcast/files/patch-Makefile
@@ -1,15 +1,14 @@
---- Makefile.orig	2021-12-29 08:48:31 UTC
+--- Makefile.orig	2022-03-15 23:26:07 UTC
 +++ Makefile
-@@ -9,7 +9,7 @@ TARGET := $(PLATFORM)
+@@ -9,15 +9,15 @@ TARGET := $(PLATFORM)
  CROSSC := 1
  else
  # Get the compiler's (GCC or Clang) target triplet and use that as platform.
 -TARGET := $(shell g++ -dumpmachine)
-+TARGET :=
- $(info TARGET: $(TARGET))
++# TARGET := $(shell g++ -dumpmachine)
  endif
  
-@@ -17,8 +17,8 @@ ifdef TOOLCHAIN
+ ifdef TOOLCHAIN
  #include Makefile.$(TARGET)
  include toolchain/$(TOOLCHAIN).mk
  else
@@ -20,34 +19,16 @@
  STRIP = strip
  MAKEDIR = mkdir -p
  RM = rm
-@@ -34,7 +34,7 @@ UMCH := $(shell uname -m)
- TARGET_BIN := $(TARGET)/
- 
- # Include the file with the versioning information ('VERSION' variable).
--include version
-+include version.mk
- VERSIONINFO = -D__VERSION="\"$(VERSION)\""
- 
- OUTPUT = nymphcast_server
-@@ -47,7 +47,7 @@ INCLUDE = -I . -I ffplay -I angelscript/angelscript/in
- 			-I gui/core/nanosvg
- ifdef CROSSC
- INCLUDE += -I $(SYSROOT)/usr/include/SDL2 -I $(SYSROOT)/usr/include/freetype2
--else 
-+else
- INCLUDE += `sdl2-config --cflags` \
- 			`pkg-config --cflags freetype2`
- endif
-@@ -55,7 +55,7 @@ endif
- LIB := -lnymphrpc -lPocoNet -lPocoNetSSL -lPocoUtil -lPocoFoundation -lPocoJSON -lPocoData \
- 		-lPocoDataSQLite -lswscale -lavcodec -lavdevice -lavformat -lavutil -lpostproc \
+@@ -56,7 +56,7 @@ endif
+ LIB := -lnymphrpc -lPocoUtil -lPocoNet -lPocoNetSSL -lPocoJSON -lPocoData -lPocoDataSQLite \
+ 		-lPocoFoundation -lswscale -lavcodec -lavdevice -lavformat -lavutil -lpostproc \
  		-lswresample -lavfilter -lSDL2_image -Langelscript/angelscript/lib-$(TARGET) -langelscript \
 -		-lstdc++fs -lfreetype \
 +		-lfreetype \
- 			 -lcurl -lvlc -lfreeimage \
+ 			 -lcurl -lfreeimage \
  			-lnymphcast -lPocoNet -lPocoUtil -lPocoFoundation
- ifdef CROSSC
-@@ -76,7 +76,7 @@ ifdef OS
+ 			# -lvlc
+@@ -95,7 +95,7 @@ ifdef OS
  	LDFLAGS += -lws2_32 -lopengl32 -lwinmm -lole32
  	OUTPUT := $(OUTPUT).exe
  else
@@ -56,71 +37,21 @@
  endif
  
  # Check which version of OpenGL or OpenGL ES to use.
-@@ -157,10 +157,10 @@ makedir:
- 	$(MAKEDIR) obj/$(TARGET_BIN)lcdapi/api
- 	$(MAKEDIR) obj/$(TARGET_BIN)lcdapi/sensors
+@@ -178,7 +178,7 @@ makedir:
  	$(MAKEDIR) bin/$(TARGET)
--	
-+
+ 	
  angelscript:
 -	make -C angelscript/angelscript/projects/gnuc/ static
--	
 +	$(MAKE) -C angelscript/angelscript/projects/gnuc/ static
-+
+ 	
  gui: $(GUI_OBJECTS)
  
- obj/$(TARGET_BIN)%.o: %.cpp
-@@ -168,7 +168,7 @@ obj/$(TARGET_BIN)%.o: %.cpp
- 
- obj/$(TARGET_BIN)%.o: %.c
- 	$(GCC) -c -o $@ $< -g3 $(CFLAGS)
--	
-+
- bin/$(TARGET_BIN)$(OUTPUT): angelscript $(OBJECTS) $(C_OBJECTS) $(GUI_OBJECTS)
- 	$(GPP) -o $@ $(OBJECTS) $(GUI_OBJECTS) $(C_OBJECTS) $(LDFLAGS)
- 	cp $@ $@.debug
-@@ -178,15 +178,15 @@ clean: clean-objects clean-angelscript clean-gui
- 
- clean-objects:
+@@ -199,7 +199,7 @@ clean-objects:
  	$(RM) $(OBJECTS) $(C_OBJECTS)
--	
-+
+ 	
  clean-angelscript:
 -	make -C angelscript/angelscript/projects/gnuc/ clean
--	
 +	$(MAKE) -C angelscript/angelscript/projects/gnuc/ clean
-+
+ 	
  clean-gui:
  	$(RM) $(GUI_OBJECTS)
--	
-+
- .PHONY: all clean angelscript makedir gui
--	
-+
- .PHONY: install
- install:
- 	install -d $(DESTDIR)$(PREFIX)/bin/ \
-@@ -201,12 +201,12 @@ install:
- 
- .PHONY: install-systemd
- install-systemd:
--	#install -d $(DESTDIR)$(CONFDIR)/systemd/system/ 
-+	#install -d $(DESTDIR)$(CONFDIR)/systemd/system/
- 	sed ${SED_REPLACE} systemd/nymphcast.service > /etc/systemd/system/nymphcast.service
- 
- .PHONY: install-openrc
- install-openrc:
--	install -d $(DESTDIR)$(CONFDIR)/init.d/	
-+	install -d $(DESTDIR)$(CONFDIR)/init.d/
- 	sed ${SED_REPLACE} openrc/nymphcast > $(DESTDIR)$(CONFDIR)/init.d/nymphcast
- 	chmod 0755 $(DESTDIR)$(CONFDIR)/init.d/nymphcast
- 
-@@ -227,7 +227,7 @@ ar-rasp-full: bin/$(TARGET_BIN)$(OUTPUT)
- 	cp -r wallpapers/ out/tmp/payload/usr/local/share/nymphcast/.
- 	#tar -cvJf out/nymphcast_raspbian.xz -C out/tmp/ .
- 	cd out/tmp && zip --symlinks -vr ../nymphcast_raspbian.zip . && cd -
--	
-+
- ar-rasp-audio: bin/$(TARGET_BIN)$(OUTPUT)
- 	rm -rf out/tmp
- 	rm -f out/nymphcast_audio_raspbian.zip
diff --git a/multimedia/nymphcast/files/patch-bytebauble.h b/multimedia/nymphcast/files/patch-bytebauble.h
deleted file mode 100644
index 61b3bffb634e..000000000000
--- a/multimedia/nymphcast/files/patch-bytebauble.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- bytebauble.h.orig	2022-02-05 21:38:24 UTC
-+++ bytebauble.h
-@@ -19,6 +19,7 @@
- 
- #include <climits>
- #include <cstdint>
-+#include <cstddef>
- 
- #ifdef _MSC_VER
- #include <stdlib.h>
diff --git a/multimedia/nymphcast/files/patch-ffplay_audio__renderer.cpp b/multimedia/nymphcast/files/patch-ffplay_audio__renderer.cpp
deleted file mode 100644
index e46d4eefac9c..000000000000
--- a/multimedia/nymphcast/files/patch-ffplay_audio__renderer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffplay/audio_renderer.cpp.orig	2022-02-05 21:39:05 UTC
-+++ ffplay/audio_renderer.cpp
-@@ -149,7 +149,7 @@ int AudioRenderer::configure_audio_filters(VideoState 
-                    1, is->audio_filter_src.freq);
-     if (is->audio_filter_src.channel_layout)
-         snprintf(asrc_args + ret, sizeof(asrc_args) - ret,
--                 ":channel_layout=0x%"PRIx64,  is->audio_filter_src.channel_layout);
-+                 ":channel_layout=0x%" PRIx64,  is->audio_filter_src.channel_layout);
- 
-     ret = avfilter_graph_create_filter(&filt_asrc,
-                                        avfilter_get_by_name("abuffer"), "ffplay_abuffer",
diff --git a/multimedia/nymphcast/files/patch-ffplay_video__renderer.cpp b/multimedia/nymphcast/files/patch-ffplay_video__renderer.cpp
deleted file mode 100644
index 9660ca48d947..000000000000
--- a/multimedia/nymphcast/files/patch-ffplay_video__renderer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffplay/video_renderer.cpp.orig	2022-02-05 21:45:21 UTC
-+++ ffplay/video_renderer.cpp
-@@ -204,7 +204,7 @@ display:
- 			//FileMetaInfo::position = master_clock;	// Copy to FleMetaInfo structure for the current file.
- 			FileMetaInfo::setPosition(master_clock);
-             av_log(NULL, AV_LOG_INFO,
--                   "%7.2f %s:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%"PRId64"/%"PRId64"   \r",
-+                   "%7.2f %s:%7.3f fd=%4d aq=%5dKB vq=%5dKB sq=%5dB f=%" PRId64 "/%" PRId64 "   \r",
-                    master_clock,
-                    (is->audio_st && is->video_st) ? "A-V" : (is->video_st ? "M-V" : (is->audio_st ? "M-A" : "   ")),
-                    av_diff,
diff --git a/multimedia/nymphcast/files/patch-gui_core_utils_TimeUtil.h b/multimedia/nymphcast/files/patch-gui_core_utils_TimeUtil.h
deleted file mode 100644
index acb11426a4aa..000000000000
--- a/multimedia/nymphcast/files/patch-gui_core_utils_TimeUtil.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/core/utils/TimeUtil.h.orig	2022-02-16 14:27:26 UTC
-+++ gui/core/utils/TimeUtil.h
-@@ -2,6 +2,8 @@
- #ifndef ES_CORE_UTILS_TIME_UTIL_H
- #define ES_CORE_UTILS_TIME_UTIL_H
- 
-+#include <ctime>
-+
- #include <string>
- 
- namespace Utils
diff --git a/multimedia/nymphcast/files/patch-lcdapi_api_LCDMutex.cpp b/multimedia/nymphcast/files/patch-lcdapi_api_LCDMutex.cpp
deleted file mode 100644
index 68776a771cd1..000000000000
--- a/multimedia/nymphcast/files/patch-lcdapi_api_LCDMutex.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- lcdapi/api/LCDMutex.cpp.orig	2022-02-05 21:50:30 UTC
-+++ lcdapi/api/LCDMutex.cpp
-@@ -22,7 +22,7 @@ namespace lcdapi {
- 
- using namespace std;
- 
--LCDMutex::LCDMutex() : _mutex(), _owner(static_cast<pthread_t>(-1)) {
-+LCDMutex::LCDMutex() : _mutex(), _owner(nullptr) {
-   ::pthread_mutex_init(&_mutex, 0);
- }
- 
-@@ -38,7 +38,7 @@ void LCDMutex::lock() {
- }
- 
- void LCDMutex::unlock() {
--  _owner = static_cast<pthread_t>(-1);
-+  _owner = nullptr;
-   ::pthread_mutex_unlock(&_mutex);
- }
- 
diff --git a/multimedia/nymphcast/files/patch-lcdapi_sensors_LCDSensor.cpp b/multimedia/nymphcast/files/patch-lcdapi_sensors_LCDSensor.cpp
deleted file mode 100644
index 5eb551b58b91..000000000000
--- a/multimedia/nymphcast/files/patch-lcdapi_sensors_LCDSensor.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- lcdapi/sensors/LCDSensor.cpp.orig	2022-02-05 21:52:04 UTC
-+++ lcdapi/sensors/LCDSensor.cpp
-@@ -36,7 +36,7 @@ const int LCDSensor::MAX_CMD_RESULT_LINE_SIZE = 255;
- LCDSensor::LCDSensor()
-   : _exist(true),
-     _onChangeThreadStarted(false),
--    _onChangeThread(static_cast<pthread_t>(-1)),
-+    _onChangeThread(nullptr),
-     _onChangeList(),
-     _onTimeOutList()
- {
diff --git a/multimedia/nymphcast/files/patch-lcdapi_sensors_LCDSensor.h b/multimedia/nymphcast/files/patch-lcdapi_sensors_LCDSensor.h
deleted file mode 100644
index 3035e1e5b931..000000000000
--- a/multimedia/nymphcast/files/patch-lcdapi_sensors_LCDSensor.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- lcdapi/sensors/LCDSensor.h.orig	2022-02-05 21:39:20 UTC
-+++ lcdapi/sensors/LCDSensor.h
-@@ -53,12 +53,12 @@ class LCDWidgetTimeOut {
- 
-  LCDWidgetTimeOut()
-     : _widgetId(), _timeOut(0), _widget(NULL),
--    _thread(static_cast<pthread_t>(-1))
-+    _thread(nullptr)
-   {
-   }
- 
-   bool isValid() {
--    return (_thread != static_cast<pthread_t>(-1));
-+    return (_thread != nullptr);
-   }
- 
-   const LCDWidgetTimeOut& operator=(const LCDWidgetTimeOut& rhs) {
diff --git a/multimedia/nymphcast/pkg-plist b/multimedia/nymphcast/pkg-plist
index 702c14b9e576..570f4e99859c 100644
--- a/multimedia/nymphcast/pkg-plist
+++ b/multimedia/nymphcast/pkg-plist
@@ -11,7 +11,11 @@ share/nymphcast/apps/hellocast/index.html
 share/nymphcast/apps/hellocast/logo.jpg
 share/nymphcast/apps/hellocast/logo_large.jpg
 share/nymphcast/apps/soundcloud/logo.png
+share/nymphcast/apps/soundcloud/index.html
 share/nymphcast/apps/soundcloud/soundcloud.as
+share/nymphcast/apps/soundcloud/templates/footer.html
+share/nymphcast/apps/soundcloud/templates/header.html
 share/nymphcast/wallpapers/forest_brook.jpg
 share/nymphcast/wallpapers/green.jpg
 @dir etc/avahi/services
+
diff --git a/multimedia/nymphcastlib/Makefile b/multimedia/nymphcastlib/Makefile
index e1d5ca389cb7..edf01fd6d309 100644
--- a/multimedia/nymphcastlib/Makefile
+++ b/multimedia/nymphcastlib/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	NymphCastLib
-DISTVERSION=	v0.1-beta0
+DISTVERSION=	v0.1-rc0
 CATEGORIES=	multimedia
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphcastlib/distinfo b/multimedia/nymphcastlib/distinfo
index 2d3bf47bdf92..8e6f1ea758c3 100644
--- a/multimedia/nymphcastlib/distinfo
+++ b/multimedia/nymphcastlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643981378
-SHA256 (MayaPosch-libnymphcast-v0.1-beta0_GH0.tar.gz) = 319a6666693b93851a1ef2c73e2967d2be833fa7ea3b486915b434d6c8672d9d
-SIZE (MayaPosch-libnymphcast-v0.1-beta0_GH0.tar.gz) = 206661
+TIMESTAMP = 1647378120
+SHA256 (MayaPosch-libnymphcast-v0.1-rc0_GH0.tar.gz) = 90869adadb2e3fa2dafe7c6775399c7f617dd7dbbd893eb629a523322991d139
+SIZE (MayaPosch-libnymphcast-v0.1-rc0_GH0.tar.gz) = 208599
diff --git a/multimedia/nymphrpc/Makefile b/multimedia/nymphrpc/Makefile
index bf772153a811..d46f7f74fa74 100644
--- a/multimedia/nymphrpc/Makefile
+++ b/multimedia/nymphrpc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	NymphRPC
-DISTVERSION=	v0.1-alpha1
-PORTREVISION=	1
+DISTVERSION=	v0.1-rc0
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphrpc/distinfo b/multimedia/nymphrpc/distinfo
index 0b9d5b8bf1ba..cfcfed685e80 100644
--- a/multimedia/nymphrpc/distinfo
+++ b/multimedia/nymphrpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643980281
-SHA256 (MayaPosch-NymphRPC-v0.1-alpha1_GH0.tar.gz) = e002829eabc75e2db061d301a0102ff982e2917cbc119f68f05b02e1ad168844
-SIZE (MayaPosch-NymphRPC-v0.1-alpha1_GH0.tar.gz) = 14119499
+TIMESTAMP = 1647378074
+SHA256 (MayaPosch-NymphRPC-v0.1-rc0_GH0.tar.gz) = 3b944545c8178505edafc50a3b0a74362329c976ad2668ebe5d638f080053645
+SIZE (MayaPosch-NymphRPC-v0.1-rc0_GH0.tar.gz) = 14123020