Mon Jan 20 21:32:59 2020 UTC ()
allegro: Remove (for wrong build system) esound support. Add alsa and jack.

Bump PKGREVISION because this changes default options (on Linux only)


(nia)
diff -r1.41 -r1.42 pkgsrc/devel/allegro/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/allegro/PLIST
diff -r0 -r1.1 pkgsrc/devel/allegro/PLIST.alsa
diff -r0 -r1.1 pkgsrc/devel/allegro/PLIST.jack
diff -r1.2 -r1.3 pkgsrc/devel/allegro/options.mk
cvs diff -r1.41 -r1.42 pkgsrc/devel/allegro/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/allegro/Makefile 2019/06/18 17:38:18 1.41
+++ pkgsrc/devel/allegro/Makefile 2020/01/20 21:32:59 1.42
@@ -1,54 +1,57 @@ @@ -1,54 +1,57 @@
1# $NetBSD: Makefile,v 1.41 2019/06/18 17:38:18 nia Exp $ 1# $NetBSD: Makefile,v 1.42 2020/01/20 21:32:59 nia Exp $
2 2
3DISTNAME= allegro-4.4.3.1 3DISTNAME= allegro-4.4.3.1
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=liballeg/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=liballeg/}
6GITHUB_PROJECT= allegro5 7GITHUB_PROJECT= allegro5
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 8GITHUB_RELEASE= ${PKGVERSION_NOREV}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://liballeg.org/ 11HOMEPAGE= https://liballeg.org/
11COMMENT= Allegro game programming library 12COMMENT= Allegro game programming library
12#LICENSE= # TODO: (see mk/license.mk) 13#LICENSE= # TODO: (see mk/license.mk)
13 14
14USE_CMAKE= yes 15USE_CMAKE= yes
15USE_TOOLS+= pkg-config makeinfo 16USE_TOOLS+= pkg-config makeinfo
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
17 18
18INFO_FILES= yes 19INFO_FILES= yes
19CMAKE_ARGS+= -DINFODIR=${PKGINFODIR:Q} 20CMAKE_ARGS+= -DINFODIR=${PKGINFODIR:Q}
20 21
 22PLIST_SUBST+= ALLEG_VER=${PKGVERSION_NOREV:R}
 23
21SUBST_CLASSES.NetBSD+= ossmidi 24SUBST_CLASSES.NetBSD+= ossmidi
22SUBST_STAGE.ossmidi= pre-configure 25SUBST_STAGE.ossmidi= pre-configure
23SUBST_MESSAGE.ossmidi= NetBSD's OSS midi emulation is non-existent. 26SUBST_MESSAGE.ossmidi= NetBSD OSS midi emulation is non-existent.
24SUBST_FILES.ossmidi= CMakeLists.txt 27SUBST_FILES.ossmidi= CMakeLists.txt
25SUBST_SED.ossmidi= -e 's/ALLEGRO_WITH_OSSMIDI 1/ALLEGRO_WITH_OSSMIDI 0/' 28SUBST_SED.ossmidi= -e 's/ALLEGRO_WITH_OSSMIDI 1/ALLEGRO_WITH_OSSMIDI 0/'
26 29
27PKGCONFIG_OVERRIDE+= misc/logg.pc.in 30PKGCONFIG_OVERRIDE+= misc/logg.pc.in
28PKGCONFIG_OVERRIDE+= misc/loadpng.pc.in 31PKGCONFIG_OVERRIDE+= misc/loadpng.pc.in
29PKGCONFIG_OVERRIDE+= misc/allegrogl.pc.in 32PKGCONFIG_OVERRIDE+= misc/allegrogl.pc.in
30PKGCONFIG_OVERRIDE+= misc/jpgalleg.pc.in 33PKGCONFIG_OVERRIDE+= misc/jpgalleg.pc.in
31PKGCONFIG_OVERRIDE+= misc/allegro.pc.in 34PKGCONFIG_OVERRIDE+= misc/allegro.pc.in
32 35
33INSTALLATION_DIRS= share/aclocal 36INSTALLATION_DIRS= share/aclocal
34 37
35post-install: 38post-install:
36 ${INSTALL_DATA} ${WRKSRC}/misc/allegro.m4 ${DESTDIR}${PREFIX}/share/aclocal 39 ${INSTALL_DATA} ${WRKSRC}/misc/allegro.m4 ${DESTDIR}${PREFIX}/share/aclocal
37 40
 41.include "options.mk"
38.include "../../audio/libvorbis/buildlink3.mk" 42.include "../../audio/libvorbis/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
40.include "../../graphics/glu/buildlink3.mk" 44.include "../../graphics/glu/buildlink3.mk"
41.include "../../graphics/png/buildlink3.mk" 45.include "../../graphics/png/buildlink3.mk"
42.include "../../mk/oss.buildlink3.mk" 46.include "../../mk/oss.buildlink3.mk"
43.include "../../mk/pthread.buildlink3.mk" 47.include "../../mk/pthread.buildlink3.mk"
44.include "../../multimedia/libogg/buildlink3.mk" 48.include "../../multimedia/libogg/buildlink3.mk"
45.include "../../x11/libICE/buildlink3.mk" 49.include "../../x11/libICE/buildlink3.mk"
46.include "../../x11/libSM/buildlink3.mk" 50.include "../../x11/libSM/buildlink3.mk"
47.include "../../x11/libX11/buildlink3.mk" 51.include "../../x11/libX11/buildlink3.mk"
48.include "../../x11/libXcursor/buildlink3.mk" 52.include "../../x11/libXcursor/buildlink3.mk"
49.include "../../x11/libXext/buildlink3.mk" 53.include "../../x11/libXext/buildlink3.mk"
50.include "../../x11/libXpm/buildlink3.mk" 54.include "../../x11/libXpm/buildlink3.mk"
51.include "../../x11/libXxf86dga/buildlink3.mk" 55.include "../../x11/libXxf86dga/buildlink3.mk"
52.include "../../x11/libXxf86vm/buildlink3.mk" 56.include "../../x11/libXxf86vm/buildlink3.mk"
53 
54.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/devel/allegro/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/allegro/PLIST 2019/06/18 17:38:18 1.15
+++ pkgsrc/devel/allegro/PLIST 2020/01/20 21:32:59 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2019/06/18 17:38:18 nia Exp $ 1@comment $NetBSD: PLIST,v 1.16 2020/01/20 21:32:59 nia Exp $
2bin/allegro-config 2bin/allegro-config
3bin/colormap 3bin/colormap
4bin/dat 4bin/dat
5bin/dat2c 5bin/dat2c
6bin/dat2s 6bin/dat2s
7bin/exedat 7bin/exedat
8bin/grabber 8bin/grabber
9bin/pack 9bin/pack
10bin/pat2dat 10bin/pat2dat
11bin/rgbmap 11bin/rgbmap
12bin/textconv 12bin/textconv
13include/alleggl.h 13include/alleggl.h
14include/allegro.h 14include/allegro.h
@@ -107,57 +107,57 @@ include/allegrogl/GLext/glx_ext_defs.h @@ -107,57 +107,57 @@ include/allegrogl/GLext/glx_ext_defs.h
107include/allegrogl/GLext/glx_ext_list.h 107include/allegrogl/GLext/glx_ext_list.h
108include/allegrogl/GLext/wgl_ext_alias.h 108include/allegrogl/GLext/wgl_ext_alias.h
109include/allegrogl/GLext/wgl_ext_api.h 109include/allegrogl/GLext/wgl_ext_api.h
110include/allegrogl/GLext/wgl_ext_defs.h 110include/allegrogl/GLext/wgl_ext_defs.h
111include/allegrogl/GLext/wgl_ext_list.h 111include/allegrogl/GLext/wgl_ext_list.h
112include/allegrogl/alleggl_config.h 112include/allegrogl/alleggl_config.h
113include/allegrogl/gl_ext.h 113include/allegrogl/gl_ext.h
114include/allegrogl/gl_header_detect.h 114include/allegrogl/gl_header_detect.h
115include/jpgalleg.h 115include/jpgalleg.h
116include/loadpng.h 116include/loadpng.h
117include/logg.h 117include/logg.h
118include/xalleg.h 118include/xalleg.h
119info/allegro.info 119info/allegro.info
120lib/allegro/4.4.3/alleg-dga2.so 120lib/allegro/${ALLEG_VER}/alleg-dga2.so
121lib/allegro/4.4.3/modules.lst 121lib/allegro/${ALLEG_VER}/modules.lst
122lib/liballeg.so 122lib/liballeg.so
123lib/liballeg.so.4.4 123lib/liballeg.so.4.4
124lib/liballeg.so.4.4.3 124lib/liballeg.so.${ALLEG_VER}
125lib/liballeggl.so 125lib/liballeggl.so
126lib/liballeggl.so.4.4 126lib/liballeggl.so.4.4
127lib/liballeggl.so.4.4.3 127lib/liballeggl.so.${ALLEG_VER}
128lib/libjpgalleg.so 128lib/libjpgalleg.so
129lib/libjpgalleg.so.4.4 129lib/libjpgalleg.so.4.4
130lib/libjpgalleg.so.4.4.3 130lib/libjpgalleg.so.${ALLEG_VER}
131lib/libloadpng.so 131lib/libloadpng.so
132lib/libloadpng.so.4.4 132lib/libloadpng.so.4.4
133lib/libloadpng.so.4.4.3 133lib/libloadpng.so.${ALLEG_VER}
134lib/liblogg.so 134lib/liblogg.so
135lib/liblogg.so.4.4 135lib/liblogg.so.4.4
136lib/liblogg.so.4.4.3 136lib/liblogg.so.${ALLEG_VER}
137lib/pkgconfig/allegro.pc 137lib/pkgconfig/allegro.pc
138lib/pkgconfig/allegrogl.pc 138lib/pkgconfig/allegrogl.pc
139lib/pkgconfig/jpgalleg.pc 139lib/pkgconfig/jpgalleg.pc
140lib/pkgconfig/loadpng.pc 140lib/pkgconfig/loadpng.pc
141lib/pkgconfig/logg.pc 141lib/pkgconfig/logg.pc
142share/aclocal/allegro.m4 142share/aclocal/allegro.m4
143share/doc/allegro-4.4.3/AUTHORS 143share/doc/allegro-${ALLEG_VER}/AUTHORS
144share/doc/allegro-4.4.3/CHANGES 144share/doc/allegro-${ALLEG_VER}/CHANGES
145share/doc/allegro-4.4.3/THANKS 145share/doc/allegro-${ALLEG_VER}/THANKS
146share/doc/allegro-4.4.3/abi.txt 146share/doc/allegro-${ALLEG_VER}/abi.txt
147share/doc/allegro-4.4.3/addons.txt 147share/doc/allegro-${ALLEG_VER}/addons.txt
148share/doc/allegro-4.4.3/ahack.txt 148share/doc/allegro-${ALLEG_VER}/ahack.txt
149share/doc/allegro-4.4.3/allegro.txt 149share/doc/allegro-${ALLEG_VER}/allegro.txt
150share/doc/allegro-4.4.3/api.txt 150share/doc/allegro-${ALLEG_VER}/api.txt
151share/doc/allegro-4.4.3/const.txt 151share/doc/allegro-${ALLEG_VER}/const.txt
152share/doc/allegro-4.4.3/dat.txt 152share/doc/allegro-${ALLEG_VER}/dat.txt
153share/doc/allegro-4.4.3/dat2c.txt 153share/doc/allegro-${ALLEG_VER}/dat2c.txt
154share/doc/allegro-4.4.3/dat2s.txt 154share/doc/allegro-${ALLEG_VER}/dat2s.txt
155share/doc/allegro-4.4.3/datafile.txt 155share/doc/allegro-${ALLEG_VER}/datafile.txt
156share/doc/allegro-4.4.3/faq.txt 156share/doc/allegro-${ALLEG_VER}/faq.txt
157share/doc/allegro-4.4.3/grabber.txt 157share/doc/allegro-${ALLEG_VER}/grabber.txt
158share/doc/allegro-4.4.3/help.txt 158share/doc/allegro-${ALLEG_VER}/help.txt
159share/doc/allegro-4.4.3/license.txt 159share/doc/allegro-${ALLEG_VER}/license.txt
160share/doc/allegro-4.4.3/makedoc.txt 160share/doc/allegro-${ALLEG_VER}/makedoc.txt
161share/doc/allegro-4.4.3/mistakes.txt 161share/doc/allegro-${ALLEG_VER}/mistakes.txt
162share/doc/allegro-4.4.3/packfile.txt 162share/doc/allegro-${ALLEG_VER}/packfile.txt
163share/doc/allegro-4.4.3/readme.txt 163share/doc/allegro-${ALLEG_VER}/readme.txt
File Added: pkgsrc/devel/allegro/PLIST.alsa
@comment $NetBSD: PLIST.alsa,v 1.1 2020/01/20 21:32:59 nia Exp $
lib/allegro/${ALLEG_VER}/alleg-alsadigi.so
lib/allegro/${ALLEG_VER}/alleg-alsamidi.so
File Added: pkgsrc/devel/allegro/PLIST.jack
@comment $NetBSD: PLIST.jack,v 1.1 2020/01/20 21:32:59 nia Exp $
lib/allegro/${ALLEG_VER}/alleg-jack.so
cvs diff -r1.2 -r1.3 pkgsrc/devel/allegro/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/allegro/options.mk 2008/04/12 22:42:59 1.2
+++ pkgsrc/devel/allegro/options.mk 2020/01/20 21:32:59 1.3
@@ -1,14 +1,26 @@ @@ -1,14 +1,26 @@
1# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $ 1# $NetBSD: options.mk,v 1.3 2020/01/20 21:32:59 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.allegro 3PKG_OPTIONS_VAR= PKG_OPTIONS.allegro
4PKG_SUPPORTED_OPTIONS= esound 4PKG_SUPPORTED_OPTIONS= alsa jack
 5PKG_SUGGESTED_OPTIONS.Linux= alsa
5 6
6.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
7 8
8PLIST_VARS+= esound 9PLIST_SRC+= PLIST
9 10
10.if !empty(PKG_OPTIONS:Mesound) 11.if !empty(PKG_OPTIONS:Malsa)
11CONFIGURE_ARGS+= --enable-esddigi 12PLIST_SRC+= PLIST.alsa
12PLIST.esound= yes 13CFLAGS.NetBSD+= -DESTRPIPE=EPIPE
13.include "../../audio/esound/buildlink3.mk" 14CMAKE_ARGS+= -DWANT_ALSA=1
 15.include "../../audio/alsa-lib/buildlink3.mk"
 16.else
 17CMAKE_ARGS+= -DWANT_ALSA=0
 18.endif
 19
 20PLIST_SRC+= PLIST.jack
 21.if !empty(PKG_OPTIONS:Mjack)
 22CMAKE_ARGS+= -DWANT_JACK=1
 23.include "../../audio/jack/buildlink3.mk"
 24.else
 25CMAKE_ARGS+= -DWANT_JACK=0
14.endif 26.endif