View | Details | Raw Unified | Return to bug 190106 | Differences between
and this patch

Collapse All | Expand All

(-)alephone/Makefile (-43 / +26 lines)
Lines 1-11 Link Here
1
# Created by: Michael Alyn Miller <malyn@strangeGizmo.com>
1
# Created by: Michael Alyn Miller <malyn@strangeGizmo.com>
2
# $FreeBSD: head/games/alephone/Makefile 352933 2014-05-03 18:58:57Z tijl $
2
# $FreeBSD: games/alephone/Makefile 327730 2013-09-20 17:36:33Z bapt $
3
3
4
PORTNAME=	alephone
4
PORTNAME=	alephone
5
PORTVERSION=	20120514
5
PORTVERSION=	20140104
6
PORTREVISION=	2
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	SF/marathon/Aleph%20One/2012-05-14
7
MASTER_SITES=	SF/marathon/Aleph%20One/2014-01-04
9
DISTNAME=	AlephOne-${PORTVERSION}
8
DISTNAME=	AlephOne-${PORTVERSION}
10
9
11
MAINTAINER=	fiziologus@gmail.com
10
MAINTAINER=	fiziologus@gmail.com
Lines 13-69 Link Here
13
12
14
BUILD_DEPENDS+=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
13
BUILD_DEPENDS+=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
15
14
16
USES=		gmake pkgconfig tar:bzip2
15
USES=		pkgconfig gmake tar:bzip2
17
USE_SDL=	image net sdl sound
16
USE_SDL+=	image net sdl ttf
18
USE_GL=		yes
17
USE_GL=		yes
19
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
20
CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
19
CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
21
20
22
DATADIR=	${PREFIX}/share/AlephOne
21
DATADIR=	${PREFIX}/share/AlephOne
23
22
24
OPTIONS_DEFINE=	MAD OGG SPEEX SMPEG TTF ZZIP
23
OPTIONS_DEFINE=	MAD FMPEG OGG SPEEX SMPEG ZZIP
24
FMPEG_DESC=	Use ffmpeg for audio/video playback and film export
25
SMPEG_DESC=	Use SMPEG for movie playback
25
SMPEG_DESC=	Use SMPEG for movie playback
26
TTF_DESC=	Enable SDL_ttf font rendering
27
ZZIP_DESC=	Enable zziplib support
26
ZZIP_DESC=	Enable zziplib support
28
27
29
OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG TTF ZZIP
28
OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG ZZIP
30
29
31
.include <bsd.port.options.mk>
30
MAD_CONFIGURE_ENABLE=	mad
32
31
MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
33
.if ${PORT_OPTIONS:MMAD}
32
FMPEG_CONFIGURE_ENABLE=	ffmpeg
34
LIB_DEPEND+=	libmad.so:${PORTSDIR}/audio/libmad
33
FMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
35
.else
34
OGG_CONFIGURE_ENABLE=	vorbis
36
CONFIGURE_ARGS+=--disable-mad
35
OGG_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
37
.endif
36
SPEEX_CONFIGURE_ENABLE=	speex
37
SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
38
SMPEG_CONFIGURE_ENABLE=	smpeg
39
SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
40
ZZIP_CONFIGURE_ENABLE=	zzip
41
ZZIP_LIB_DEPENDS=	libzzip.so:${PORTSDIR}/devel/zziplib
38
42
39
.if ${PORT_OPTIONS:MOGG}
43
.include <bsd.port.options.mk>
40
LIB_DEPEND+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
41
.else
42
CONFIGURE_ARGS+=--disable-vorbis
43
.endif
44
45
.if ${PORT_OPTIONS:MSPEEX}
46
LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
47
.else
48
CONFIGURE_ARGS+=--disable-speex
49
.endif
50
51
.if ${PORT_OPTIONS:MSMPEG}
52
LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
53
.else
54
CONFIGURE_ARGS+=--disable-smpeg
55
.endif
56
57
.if ${PORT_OPTIONS:MTTF}
58
USE_SDL+=	ttf
59
.else
60
CONFIGURE_ARGS+=--disable-ttf
61
.endif
62
44
63
.if ${PORT_OPTIONS:MZZIP}
45
.if ${PORT_OPTIONS:MFMPEG}
64
LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib
46
EXTRA_PATCHES=		${FILESDIR}/extra-patch-ffmpeg
65
.else
66
CONFIGURE_ARGS+=--disable-zzip
67
.endif
47
.endif
68
48
69
post-install:
49
post-install:
Lines 72-76 Link Here
72
	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
52
	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
73
	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
53
	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
74
.endif
54
.endif
55
	@${ECHO_CMD}
56
	@${CAT} ${PKGMESSAGE}
57
	@${ECHO_CMD}
75
58
76
.include <bsd.port.mk>
59
.include <bsd.port.mk>
(-)alephone/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (AlephOne-20120514.tar.bz2) = 6a7797af74cf3fae7f5505e64ffe57c56f7331521cb569bcc8b7d7041cb3718b
1
SHA256 (AlephOne-20140104.tar.bz2) = 7f7d35c1d99cddd7cd0b47d3e4b84311373b04c60402ce86e9d85c36dfbaabcd
2
SIZE (AlephOne-20120514.tar.bz2) = 4716348
2
SIZE (AlephOne-20140104.tar.bz2) = 4919455
(-)alephone/files/extra-patch-ffmpeg (+25 lines)
Line 0 Link Here
1
--- Source_Files/FFmpeg/SDL_ffmpeg.c.orig	2013-07-05 04:33:29.000000000 +0400
2
+++ Source_Files/FFmpeg/SDL_ffmpeg.c	2014-05-17 23:43:56.000000000 +0400
3
@@ -48,6 +48,11 @@
4
 }
5
 #endif
6
 
7
+/* set magic number for 1 second of 48khz 32bit audio (removed from upstream) */
8
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
9
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
10
+#endif
11
+
12
 #include "SDL_ffmpeg.h"
13
 
14
 #ifdef MSVC
15
--- Source_Files/FFmpeg/Movie.cpp.orig	2014-01-04 06:19:57.000000000 +0400
16
+++ Source_Files/FFmpeg/Movie.cpp	2014-05-17 23:48:13.000000000 +0400
17
@@ -491,7 +491,7 @@
18
         
19
         // tuning options
20
         int aq = graphics_preferences->movie_export_audio_quality;
21
-        audio_stream->codec->global_quality = audio_stream->quality = FF_QP2LAMBDA * (aq / 10);
22
+        audio_stream->codec->global_quality = FF_QP2LAMBDA * (aq / 10);
23
         audio_stream->codec->flags |= CODEC_FLAG_QSCALE;
24
         
25
         // find correct sample format
(-)alephone/files/patch-Source_Files-Lua-lua_templates.h (-11 lines)
Lines 1-11 Link Here
1
--- Source_Files/Lua/lua_templates.h.orig	2012-04-21 17:57:45.000000000 +0400
2
+++ Source_Files/Lua/lua_templates.h	2012-04-21 17:58:22.000000000 +0400
3
@@ -496,7 +496,7 @@
4
 	static index_t ToIndex(lua_State *L, int index) {
5
 		index_t to;
6
 		if(lua_isnil(L, index)) return -1;
7
-		else if(_lookup(L, index, to)) return to;
8
+		else if(L_Enum<name, index_t>::_lookup(L, index, to)) return to;
9
 		else {
10
 			std::string error;
11
 			if(lua_isnumber(L, index) || lua_isstring(L, index))
(-)alephone/pkg-message (-12 / +3 lines)
Lines 4-21 Link Here
4
4
5
This package does not include any Aleph One data files. To obtain the original
5
This package does not include any Aleph One data files. To obtain the original
6
ones use the "games/alephone-data" port. The "games/alephone-scenarios" port
6
ones use the "games/alephone-data" port. The "games/alephone-scenarios" port
7
contains more (unofficial) scenarios. In addition, you can search for data
7
contains more (unofficial) scenarios. In addition, you can search for game
8
files here:
8
stuff here:
9
9
10
* http://archives.bungie.org/
10
* http://www.simplici7y.com
11
12
* http://fileball.net/marathon/
13
14
* http://orbitalarm.bungie.org/downloads/alephone.html
15
16
* http://marathon.bungie.org/scenarionews/
17
18
Aleph One works best with OpenGL. If you do not have an OpenGL card and the
19
game is sluggish, try using the "-g" option to disable OpenGL.
20
11
21
==============================================================================
12
==============================================================================
(-)alephone/pkg-plist (-45 / +44 lines)
Lines 1-57 Link Here
1
bin/alephone
1
bin/alephone
2
man/man6/alephone.6.gz
2
man/man6/alephone.6.gz
3
%%DATADIR%%/Fonts
4
%%DATADIR%%/MML/Interface_Rects.mml
3
%%DATADIR%%/MML/Interface_Rects.mml
5
%%DATADIR%%/MML/Transparent_Liquids.mml
4
%%DATADIR%%/MML/Transparent_Liquids.mml
6
%%DATADIR%%/MML/Transparent_Sprites.mml
5
%%DATADIR%%/MML/Transparent_Sprites.mml
7
%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-Bold.ttf
6
%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-Bold.ttf
8
%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldBold.ttf
7
%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-BoldBold.ttf
9
%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldOblique.ttf
8
%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-BoldOblique.ttf
10
%%DATADIR%%/Themes/Default/LICENSE-DejaVu
9
%%DATADIR%%/Plugins/Default_Theme/LICENSE-DejaVu
11
%%DATADIR%%/Themes/Default/SquarishSansCT.README
10
%%DATADIR%%/Plugins/Default_Theme/Plugin.xml
12
%%DATADIR%%/Themes/Default/Squarish_Sans_CT_Medium.ttf
11
%%DATADIR%%/Plugins/Default_Theme/SquarishSansCT.README
13
%%DATADIR%%/Themes/Default/button_c.bmp
12
%%DATADIR%%/Plugins/Default_Theme/Squarish_Sans_CT_Medium.ttf
14
%%DATADIR%%/Themes/Default/button_c_p.bmp
13
%%DATADIR%%/Plugins/Default_Theme/button_c.bmp
15
%%DATADIR%%/Themes/Default/button_l.bmp
14
%%DATADIR%%/Plugins/Default_Theme/button_c_p.bmp
16
%%DATADIR%%/Themes/Default/button_l_p.bmp
15
%%DATADIR%%/Plugins/Default_Theme/button_l.bmp
17
%%DATADIR%%/Themes/Default/button_r.bmp
16
%%DATADIR%%/Plugins/Default_Theme/button_l_p.bmp
18
%%DATADIR%%/Themes/Default/button_r_p.bmp
17
%%DATADIR%%/Plugins/Default_Theme/button_r.bmp
19
%%DATADIR%%/Themes/Default/frame_b.bmp
18
%%DATADIR%%/Plugins/Default_Theme/button_r_p.bmp
20
%%DATADIR%%/Themes/Default/frame_bl.bmp
19
%%DATADIR%%/Plugins/Default_Theme/frame_b.bmp
21
%%DATADIR%%/Themes/Default/frame_br.bmp
20
%%DATADIR%%/Plugins/Default_Theme/frame_bl.bmp
22
%%DATADIR%%/Themes/Default/frame_l.bmp
21
%%DATADIR%%/Plugins/Default_Theme/frame_br.bmp
23
%%DATADIR%%/Themes/Default/frame_r.bmp
22
%%DATADIR%%/Plugins/Default_Theme/frame_l.bmp
24
%%DATADIR%%/Themes/Default/frame_t.bmp
23
%%DATADIR%%/Plugins/Default_Theme/frame_r.bmp
25
%%DATADIR%%/Themes/Default/frame_tl.bmp
24
%%DATADIR%%/Plugins/Default_Theme/frame_t.bmp
26
%%DATADIR%%/Themes/Default/frame_tr.bmp
25
%%DATADIR%%/Plugins/Default_Theme/frame_tl.bmp
27
%%DATADIR%%/Themes/Default/list_b.bmp
26
%%DATADIR%%/Plugins/Default_Theme/frame_tr.bmp
28
%%DATADIR%%/Themes/Default/list_bl.bmp
27
%%DATADIR%%/Plugins/Default_Theme/list_b.bmp
29
%%DATADIR%%/Themes/Default/list_br.bmp
28
%%DATADIR%%/Plugins/Default_Theme/list_bl.bmp
30
%%DATADIR%%/Themes/Default/list_l.bmp
29
%%DATADIR%%/Plugins/Default_Theme/list_br.bmp
31
%%DATADIR%%/Themes/Default/list_r.bmp
30
%%DATADIR%%/Plugins/Default_Theme/list_l.bmp
32
%%DATADIR%%/Themes/Default/list_t.bmp
31
%%DATADIR%%/Plugins/Default_Theme/list_r.bmp
33
%%DATADIR%%/Themes/Default/list_tl.bmp
32
%%DATADIR%%/Plugins/Default_Theme/list_t.bmp
34
%%DATADIR%%/Themes/Default/list_tr.bmp
33
%%DATADIR%%/Plugins/Default_Theme/list_tl.bmp
35
%%DATADIR%%/Themes/Default/resources
34
%%DATADIR%%/Plugins/Default_Theme/list_tr.bmp
36
%%DATADIR%%/Themes/Default/slider.bmp
35
%%DATADIR%%/Plugins/Default_Theme/slider.bmp
37
%%DATADIR%%/Themes/Default/slider_c.bmp
36
%%DATADIR%%/Plugins/Default_Theme/slider_c.bmp
38
%%DATADIR%%/Themes/Default/slider_l.bmp
37
%%DATADIR%%/Plugins/Default_Theme/slider_l.bmp
39
%%DATADIR%%/Themes/Default/slider_r.bmp
38
%%DATADIR%%/Plugins/Default_Theme/slider_r.bmp
40
%%DATADIR%%/Themes/Default/theme2.mml
39
%%DATADIR%%/Plugins/Default_Theme/theme2.mml
41
%%DATADIR%%/Themes/Default/thumb_b.bmp
40
%%DATADIR%%/Plugins/Default_Theme/thumb_b.bmp
42
%%DATADIR%%/Themes/Default/thumb_bc.bmp
41
%%DATADIR%%/Plugins/Default_Theme/thumb_bc.bmp
43
%%DATADIR%%/Themes/Default/thumb_c.bmp
42
%%DATADIR%%/Plugins/Default_Theme/thumb_c.bmp
44
%%DATADIR%%/Themes/Default/thumb_t.bmp
43
%%DATADIR%%/Plugins/Default_Theme/thumb_t.bmp
45
%%DATADIR%%/Themes/Default/thumb_tc.bmp
44
%%DATADIR%%/Plugins/Default_Theme/thumb_tc.bmp
46
%%DATADIR%%/Themes/Default/tiny_button_c.bmp
45
%%DATADIR%%/Plugins/Default_Theme/tiny_button_c.bmp
47
%%DATADIR%%/Themes/Default/tiny_button_l.bmp
46
%%DATADIR%%/Plugins/Default_Theme/tiny_button_l.bmp
48
%%DATADIR%%/Themes/Default/tiny_button_r.bmp
47
%%DATADIR%%/Plugins/Default_Theme/tiny_button_r.bmp
49
%%PORTDOCS%%%%DOCSDIR%%/Lua.html
48
%%PORTDOCS%%%%DOCSDIR%%/Lua.html
50
%%PORTDOCS%%%%DOCSDIR%%/Lua_HUD.html
49
%%PORTDOCS%%%%DOCSDIR%%/Lua_HUD.html
51
%%PORTDOCS%%%%DOCSDIR%%/MML.html
50
%%PORTDOCS%%%%DOCSDIR%%/MML.html
52
%%PORTDOCS%%%%DOCSDIR%%/README
51
%%PORTDOCS%%%%DOCSDIR%%/README
53
%%PORTDOCS%%@dirrm %%DOCSDIR%%
52
%%PORTDOCS%%@dirrm %%DOCSDIR%%
54
@dirrm %%DATADIR%%/Themes/Default
53
@dirrm %%DATADIR%%/Plugins/Default_Theme
55
@dirrm %%DATADIR%%/Themes
54
@dirrm %%DATADIR%%/Plugins
56
@dirrm %%DATADIR%%/MML
55
@dirrm %%DATADIR%%/MML
57
@dirrmtry %%DATADIR%%
56
@dirrmtry %%DATADIR%%

Return to bug 190106