Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1584495973111220"
MIME-Version: 1.0
Date: Wed, 18 Mar 2020 01:46:13 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/devel/allegro5
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200318014613.16312FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nia
Date:		Wed Mar 18 01:46:13 UTC 2020

Modified Files:
	pkgsrc/devel/allegro5: Makefile options.mk

Log Message:
allegro5: Remove unnecessary enet dependency

Only used by examples, which don't get installed anyway.

Enable OpenAL. Note that OpenAL cannot be disabled on Darwin.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/allegro5/Makefile \
    pkgsrc/devel/allegro5/options.mk

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


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

Modified files:

Index: pkgsrc/devel/allegro5/Makefile
diff -u pkgsrc/devel/allegro5/Makefile:1.1 pkgsrc/devel/allegro5/Makefile:1.2
--- pkgsrc/devel/allegro5/Makefile:1.1	Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/Makefile	Wed Mar 18 01:46:12 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/03/18 01:23:01 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/18 01:46:12 nia Exp $
 
 DISTNAME=	allegro-5.2.6.0
 PKGNAME=	${DISTNAME:S/allegro-/allegro5-/1}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=liballeg/}
 GITHUB_PROJECT=	allegro5
@@ -18,6 +19,10 @@ USE_LANGUAGES=	c c++
 
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_ARGS+=	-DWANT_IMAGE_FREEIMAGE=OFF
+# TODO: make this work and turn it into an option
+CMAKE_ARGS+=	-DWANT_DOCS=OFF
+CMAKE_ARGS+=	-DWANT_DEMO=OFF
+CMAKE_ARGS+=	-DWANT_EXAMPLES=OFF
 
 .include "../../mk/oss.buildlink3.mk"
 .if ${OSS_TYPE} != "none"
@@ -57,5 +62,4 @@ PKGCONFIG_OVERRIDE+=	misc/allegro_video.
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../net/enet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/allegro5/options.mk
diff -u pkgsrc/devel/allegro5/options.mk:1.1 pkgsrc/devel/allegro5/options.mk:1.2
--- pkgsrc/devel/allegro5/options.mk:1.1	Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/options.mk	Wed Mar 18 01:46:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/03/18 01:23:01 nia Exp $
+# $NetBSD: options.mk,v 1.2 2020/03/18 01:46:12 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.allegro5
 PKG_SUPPORTED_OPTIONS=		alsa openal pulseaudio x11
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS.Linux=	alsa
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${OPSYS} != "Darwin"
-PKG_SUGGESTED_OPTIONS=		x11
+PKG_SUGGESTED_OPTIONS=		openal x11
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -23,7 +23,10 @@ CMAKE_ARGS+=	-DWANT_ALSA=OFF
 CMAKE_ARGS+=	-DWANT_OPENAL=ON
 .  include "../../audio/openal-soft/buildlink3.mk"
 .else
+# OpenAL is required on Darwin and also built-in.
+.  if ${OPSYS} != "Darwin"
 CMAKE_ARGS+=	-DWANT_OPENAL=OFF
+.  endif
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)


--_----------=_1584495973111220--