Wed Mar 18 01:46:13 2020 UTC ()
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


(nia)
diff -r1.1 -r1.2 pkgsrc/devel/allegro5/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/allegro5/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/devel/allegro5/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/allegro5/Makefile 2020/03/18 01:23:01 1.1
+++ pkgsrc/devel/allegro5/Makefile 2020/03/18 01:46:12 1.2
@@ -1,33 +1,38 @@ @@ -1,33 +1,38 @@
1# $NetBSD: Makefile,v 1.1 2020/03/18 01:23:01 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2020/03/18 01:46:12 nia Exp $
2 2
3DISTNAME= allegro-5.2.6.0 3DISTNAME= allegro-5.2.6.0
4PKGNAME= ${DISTNAME:S/allegro-/allegro5-/1} 4PKGNAME= ${DISTNAME:S/allegro-/allegro5-/1}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=liballeg/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=liballeg/}
7GITHUB_PROJECT= allegro5 8GITHUB_PROJECT= allegro5
8GITHUB_RELEASE= ${PKGVERSION_NOREV} 9GITHUB_RELEASE= ${PKGVERSION_NOREV}
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://liballeg.org/ 12HOMEPAGE= https://liballeg.org/
12COMMENT= Cross-platform library aimed at video game programming 13COMMENT= Cross-platform library aimed at video game programming
13LICENSE= zlib 14LICENSE= zlib
14 15
15USE_CMAKE= yes 16USE_CMAKE= yes
16USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
17USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
18 19
19CMAKE_ARGS+= -Wno-dev 20CMAKE_ARGS+= -Wno-dev
20CMAKE_ARGS+= -DWANT_IMAGE_FREEIMAGE=OFF 21CMAKE_ARGS+= -DWANT_IMAGE_FREEIMAGE=OFF
 22# TODO: make this work and turn it into an option
 23CMAKE_ARGS+= -DWANT_DOCS=OFF
 24CMAKE_ARGS+= -DWANT_DEMO=OFF
 25CMAKE_ARGS+= -DWANT_EXAMPLES=OFF
21 26
22.include "../../mk/oss.buildlink3.mk" 27.include "../../mk/oss.buildlink3.mk"
23.if ${OSS_TYPE} != "none" 28.if ${OSS_TYPE} != "none"
24LDFLAGS+= ${LIBOSSAUDIO} 29LDFLAGS+= ${LIBOSSAUDIO}
25.else 30.else
26CMAKE_ARGS+= -DWANT_OSS=OFF 31CMAKE_ARGS+= -DWANT_OSS=OFF
27.endif 32.endif
28 33
29PKGCONFIG_OVERRIDE+= misc/allegro.pc.in 34PKGCONFIG_OVERRIDE+= misc/allegro.pc.in
30PKGCONFIG_OVERRIDE+= misc/allegro_acodec.pc.in 35PKGCONFIG_OVERRIDE+= misc/allegro_acodec.pc.in
31PKGCONFIG_OVERRIDE+= misc/allegro_audio.pc.in 36PKGCONFIG_OVERRIDE+= misc/allegro_audio.pc.in
32PKGCONFIG_OVERRIDE+= misc/allegro_color.pc.in 37PKGCONFIG_OVERRIDE+= misc/allegro_color.pc.in
33PKGCONFIG_OVERRIDE+= misc/allegro_dialog.pc.in 38PKGCONFIG_OVERRIDE+= misc/allegro_dialog.pc.in
@@ -47,15 +52,14 @@ PKGCONFIG_OVERRIDE+= misc/allegro_video. @@ -47,15 +52,14 @@ PKGCONFIG_OVERRIDE+= misc/allegro_video.
47. include "../../graphics/MesaLib/buildlink3.mk" 52. include "../../graphics/MesaLib/buildlink3.mk"
48. include "../../graphics/glu/buildlink3.mk" 53. include "../../graphics/glu/buildlink3.mk"
49. include "../../graphics/png/buildlink3.mk" 54. include "../../graphics/png/buildlink3.mk"
50. include "../../mk/jpeg.buildlink3.mk" 55. include "../../mk/jpeg.buildlink3.mk"
51.endif 56.endif
52.include "../../audio/dumb/buildlink3.mk" 57.include "../../audio/dumb/buildlink3.mk"
53.include "../../audio/flac/buildlink3.mk" 58.include "../../audio/flac/buildlink3.mk"
54.include "../../audio/libvorbis/buildlink3.mk" 59.include "../../audio/libvorbis/buildlink3.mk"
55.include "../../audio/opusfile/buildlink3.mk" 60.include "../../audio/opusfile/buildlink3.mk"
56.include "../../devel/physfs/buildlink3.mk" 61.include "../../devel/physfs/buildlink3.mk"
57.include "../../graphics/freetype2/buildlink3.mk" 62.include "../../graphics/freetype2/buildlink3.mk"
58.include "../../graphics/libwebp/buildlink3.mk" 63.include "../../graphics/libwebp/buildlink3.mk"
59.include "../../multimedia/libtheora/buildlink3.mk" 64.include "../../multimedia/libtheora/buildlink3.mk"
60.include "../../net/enet/buildlink3.mk" 
61.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/allegro5/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/allegro5/options.mk 2020/03/18 01:23:01 1.1
+++ pkgsrc/devel/allegro5/options.mk 2020/03/18 01:46:12 1.2
@@ -1,39 +1,42 @@ @@ -1,39 +1,42 @@
1# $NetBSD: options.mk,v 1.1 2020/03/18 01:23:01 nia Exp $ 1# $NetBSD: options.mk,v 1.2 2020/03/18 01:46:12 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.allegro5 3PKG_OPTIONS_VAR= PKG_OPTIONS.allegro5
4PKG_SUPPORTED_OPTIONS= alsa openal pulseaudio x11 4PKG_SUPPORTED_OPTIONS= alsa openal pulseaudio x11
5PKG_SUGGESTED_OPTIONS.Linux= alsa 5PKG_SUGGESTED_OPTIONS.Linux= alsa
6 6
7.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
8 8
9.if ${OPSYS} != "Darwin" 9.if ${OPSYS} != "Darwin"
10PKG_SUGGESTED_OPTIONS= x11 10PKG_SUGGESTED_OPTIONS= openal x11
11.endif 11.endif
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15.if !empty(PKG_OPTIONS:Malsa) 15.if !empty(PKG_OPTIONS:Malsa)
16CMAKE_ARGS+= -DWANT_ALSA=ON 16CMAKE_ARGS+= -DWANT_ALSA=ON
17. include "../../audio/alsa-lib/buildlink3.mk" 17. include "../../audio/alsa-lib/buildlink3.mk"
18.else 18.else
19CMAKE_ARGS+= -DWANT_ALSA=OFF 19CMAKE_ARGS+= -DWANT_ALSA=OFF
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mopenal) 22.if !empty(PKG_OPTIONS:Mopenal)
23CMAKE_ARGS+= -DWANT_OPENAL=ON 23CMAKE_ARGS+= -DWANT_OPENAL=ON
24. include "../../audio/openal-soft/buildlink3.mk" 24. include "../../audio/openal-soft/buildlink3.mk"
25.else 25.else
 26# OpenAL is required on Darwin and also built-in.
 27. if ${OPSYS} != "Darwin"
26CMAKE_ARGS+= -DWANT_OPENAL=OFF 28CMAKE_ARGS+= -DWANT_OPENAL=OFF
 29. endif
27.endif 30.endif
28 31
29.if !empty(PKG_OPTIONS:Mpulseaudio) 32.if !empty(PKG_OPTIONS:Mpulseaudio)
30CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON 33CMAKE_ARGS+= -DWANT_PULSEAUDIO=ON
31. include "../../audio/pulseaudio/buildlink3.mk" 34. include "../../audio/pulseaudio/buildlink3.mk"
32.else 35.else
33CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF 36CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF
34.endif 37.endif
35 38
36.if !empty(PKG_OPTIONS:Mx11) 39.if !empty(PKG_OPTIONS:Mx11)
37CMAKE_ARGS+= -DWANT_X11=ON 40CMAKE_ARGS+= -DWANT_X11=ON
38. include "../../x11/libICE/buildlink3.mk" 41. include "../../x11/libICE/buildlink3.mk"
39. include "../../x11/libXScrnSaver/buildlink3.mk" 42. include "../../x11/libXScrnSaver/buildlink3.mk"