From 128f6c8e6d0421070893a975eaa31c7c827b1ae2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <adridg@FreeBSD.org>
Date: Tue, 22 Feb 2022 00:00:57 +0100
Subject: multimedia/nymphcast: tidy & fix build

- nymphrpc didn't build for me in poudriere, needs a poke
  to ensure that the directory for storing the object files
  is created first (this is erratically a problem with -j)
- nymphcast can USE=sdl, suggestion from makc@
---
 multimedia/nymphcast/Makefile            |  7 +++----
 multimedia/nymphrpc/Makefile             |  1 +
 multimedia/nymphrpc/files/patch-Makefile | 12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile
index 8541324460fb..f05fc6969883 100644
--- a/multimedia/nymphcast/Makefile
+++ b/multimedia/nymphcast/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	NymphCast
 DISTVERSION=	v0.1-rc0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 # -p3 because WRKSRC_SUBDIR is set; the patches are from the toplevel,
@@ -23,16 +23,15 @@ LIB_DEPENDS=	libnymphrpc.so:multimedia/nymphrpc \
 		libnymphcast.so:multimedia/nymphcastlib \
 		libasound.so:audio/alsa-lib \
 		libPocoFoundation.so:devel/poco \
-		libSDL2.so:devel/sdl20 \
 		libcurl.so:ftp/curl \
 		libfreeimage.so:graphics/freeimage \
-		libSDL2_image-2.0.so.0:graphics/sdl2_image \
 		libavutil.so:multimedia/ffmpeg \
 		libvlccore.so:multimedia/vlc \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:c++17-lang gl gmake pkgconfig
+USES=		compiler:c++17-lang gl gmake pkgconfig sdl
 USE_GL=		gl
+USE_SDL=	sdl2 image2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MayaPosch
diff --git a/multimedia/nymphrpc/Makefile b/multimedia/nymphrpc/Makefile
index f36c8dd07393..bf772153a811 100644
--- a/multimedia/nymphrpc/Makefile
+++ b/multimedia/nymphrpc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	NymphRPC
 DISTVERSION=	v0.1-alpha1
+PORTREVISION=	1
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphrpc/files/patch-Makefile b/multimedia/nymphrpc/files/patch-Makefile
index 660f7f7da65f..e0039b646257 100644
--- a/multimedia/nymphrpc/files/patch-Makefile
+++ b/multimedia/nymphrpc/files/patch-Makefile
@@ -41,16 +41,20 @@
  
  ifdef ANDROID
  CFLAGS += -fPIC
-@@ -115,7 +116,7 @@ SHARED_OBJECTS := $(addprefix obj/shared/$(ARCH),$(not
+@@ -113,9 +114,10 @@ SOURCES := $(wildcard src/*.cpp)
+ OBJECTS := $(addprefix obj/static/$(ARCH),$(notdir) $(SOURCES:.cpp=.o))
+ SHARED_OBJECTS := $(addprefix obj/shared/$(ARCH),$(notdir) $(SOURCES:.cpp=.o))
  
- all: lib
+-all: lib
++all: makedir 
++	$(MAKE) lib
  
 -lib: makedir lib/$(ARCH)$(OUTPUT).a lib/$(ARCH)$(LIBNAME)
 +lib: makedir lib/$(OUTPUT).a lib/$(LIBNAME)
  	
  obj/static/$(ARCH)%.o: %.cpp
  	$(GCC) -c -o $@ $< $(CFLAGS)
-@@ -123,11 +124,11 @@ obj/static/$(ARCH)%.o: %.cpp
+@@ -123,11 +125,11 @@ obj/static/$(ARCH)%.o: %.cpp
  obj/shared/$(ARCH)%.o: %.cpp
  	$(GCC) -c -o $@ $< $(SHARED_FLAGS) $(CFLAGS) $(LIBS)
  	
@@ -64,7 +68,7 @@
  	$(GCC) -o $@ $(CFLAGS) $(SHARED_FLAGS) $(SHARED_OBJECTS) $(LIBS)
  	
  makedir:
-@@ -165,9 +166,9 @@ endif
+@@ -165,9 +167,9 @@ endif
  .PHONY: install
  install:
  	install -d $(DESTDIR)$(PREFIX)/lib/
-- 
cgit v1.2.3