Received: by mail.netbsd.org (Postfix, from userid 605)
	id 808A584F48; Sat, 21 May 2022 07:54:59 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id B903D84E66
	for <pkgsrc-changes@NetBSD.org>; Sat, 21 May 2022 07:54:58 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id izefmzQn0JXE for <pkgsrc-changes@netbsd.org>;
	Sat, 21 May 2022 07:54:58 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 06C8A84CFF
	for <pkgsrc-changes@NetBSD.org>; Sat, 21 May 2022 07:54:58 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 5F181FAEB; Sat, 21 May 2022 07:55:39 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165311973959330"
MIME-Version: 1.0
Date: Sat, 21 May 2022 07:55:39 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/strawberry
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
X-Mailer: log_accum
Message-Id: <20220521075539.5F181FAEB@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_165311973959330
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sat May 21 07:55:39 UTC 2022

Modified Files:
	pkgsrc/audio/strawberry: Makefile

Log Message:
strawberry: wants std::optional


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/audio/strawberry/Makefile

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


--_----------=_165311973959330
Content-Disposition: inline
Content-Length: 1264
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/strawberry/Makefile
diff -u pkgsrc/audio/strawberry/Makefile:1.34 pkgsrc/audio/strawberry/Makefile:1.35
--- pkgsrc/audio/strawberry/Makefile:1.34	Mon Apr 18 19:10:26 2022
+++ pkgsrc/audio/strawberry/Makefile	Sat May 21 07:55:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2022/04/18 19:10:26 adam Exp $
+# $NetBSD: Makefile,v 1.35 2022/05/21 07:55:39 nia Exp $
 
 DISTNAME=	strawberry-1.0.4
 PKGREVISION=	1
@@ -17,6 +17,7 @@ TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
+GCC_REQD+=	7 # std::optional
 
 DEPENDS+=	gst-plugins1-flac-[0-9]*:../../audio/gst-plugins1-flac
 DEPENDS+=	gst-plugins1-mpg123-[0-9]*:../../audio/gst-plugins1-mpg123
@@ -39,6 +40,14 @@ DEPENDS+=	gst-plugins1-oss-[0-9]*:../../
 
 .if ${OPSYS} == "NetBSD"
 PREFER.sqlite3=	pkgsrc # fts5
+# This package will link against libstdc++.so from the pkgsrc GCC when the
+# base OS GCC doesn't meet the minimum requirement. Thus we do this so the
+# appropriate gcc-libs package will be captured as a dependency, otherwise
+# binary packages will be broken.
+.  if ${OPSYS_VERSION} < 090000
+USE_PKGSRC_GCC=		yes
+USE_PKGSRC_GCC_RUNTIME=	yes
+.  endif
 .endif
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1


--_----------=_165311973959330--