From nobody Mon Feb 21 23:12:43 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AAD4919D2EE3; Mon, 21 Feb 2022 23:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K2dPR3yS5z3Bqn; Mon, 21 Feb 2022 23:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645485163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQVh66U3ILqzvszOd+Ljg2MX6IvzMNQFliMQHajFG7I=; b=QUss7RCMjBLFXrjhLEzg9T+2VnZUZshuAKJB/9FCsS3YxLC/nxjzaoOkKn9oi9afZqRPZy IrY4YY9hVPIAeR5VR71qveecPL4Xu9S2SLei7lHpFQ5sYOsJHiT5JmCLSeN5ytLJy8AXy5 D/iIuxtXY9rimHapD81pRo9QsYXRQeyXqOwpFRlRDf9vVMLMZdrXWywG2HkL3iJvVRiI9n TLaHUOPqEEsw8LMvgBX9pFi1uQOQewV8GRCVvF5BIu/G5kxyDiQUmwvfNRHtGQUpgegmd/ cfF14YTuuSujJ8CYHd6d+tL+OWmawdNpuWg1VR/Ft5tzCTnvNRRV8yI34DhKqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67B2B18CF8; Mon, 21 Feb 2022 23:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21LNChqD060172; Mon, 21 Feb 2022 23:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LNChv6060171; Mon, 21 Feb 2022 23:12:43 GMT (envelope-from git) Date: Mon, 21 Feb 2022 23:12:43 GMT Message-Id: <202202212312.21LNChv6060171@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 128f6c8e6d04 - main - multimedia/nymphcast: tidy & fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 128f6c8e6d0421070893a975eaa31c7c827b1ae2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645485163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQVh66U3ILqzvszOd+Ljg2MX6IvzMNQFliMQHajFG7I=; b=JvZlbUJBZVm4zaT8gv5h/IBGLdq3d3VqlvuwMGMvFtHAiSVGdrfyqc+kxaP9FOFn1i/X9B 8b50BkgobKrZzhfmORXlDQ8Qlr7YfH9Hy1dDLlLPyMDsswpbVjI1o5jN3Ys/K5f9RUy5qQ 3idHPHoY7dhdgp68TVMW2X7MisGO8KbD/Y+Lk8GMmafH7uYV2dGC485uVLYQhKatEOuynh whqalHB7qVhPwqGYxMsK1ri4pU0FIJFBWGPKW4wARkQ5fW9N1TllrsUxmx+w0AirvcelBa FcEh7QP2ZVNlM0tKHdJ65/2AH/KWUGbi3acB2jRfoueMTFgR12jLSWpymT4nGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645485163; a=rsa-sha256; cv=none; b=MC00wZUijA320J3Mnw2fwA+cmjXbHI48jUR2McmarhlOnmSpLsc9fwDytCtA/SqW0jL+Vh fA+hRzKvL7nGYat9jyWTwy0s9qcRP2b9ecwhJv42CKPVczDdLhY1K/ebZTWoIieATLyeIw PISSa3MZLwR947QTDF7dw5+saWBCeT4zZfxyDFHZfmubigOAreiWBXeihewOkP59xmLwQ5 3Qmlpg2OSwDoNA1lHlKt8Zm5siNanXgJzx6MXDhN/N8t7tN19c0EneSTi/a8NYh51LIKq2 8ahnm3N6BZH8icMyc8t3nyN1C/FGbDJiYHajWoVOQAJ56Dr1VViWYi7I8IbbOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=128f6c8e6d0421070893a975eaa31c7c827b1ae2 commit 128f6c8e6d0421070893a975eaa31c7c827b1ae2 Author: Adriaan de Groot AuthorDate: 2022-02-21 23:00:57 +0000 Commit: Adriaan de Groot CommitDate: 2022-02-21 23:12:29 +0000 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(-) 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/