Date: Thu, 22 May 2014 12:46:30 GMT
From: Green Dog <fiziologus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: ports/190106: {UPD] games/alephone to 20140104
Message-ID: <201405221246.s4MCkU4e045920@cgiserv.freebsd.org>
Resent-Message-ID: <201405221250.s4MCo2fF076185@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190106
>Category: ports
>Synopsis: {UPD] games/alephone to 20140104
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 22 12:50:02 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Green Dog
>Release:
>Organization:
>Environment:
>Description:
[games/alephone]
Update to 20140104 (1.1)
Staging
Adding patch from slackbuilds.org/cgit/slackbuilds/commit/?id=d8a260e29 (fixing build with ffmpeg support)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN alephone.orig/Makefile alephone/Makefile
--- alephone.orig/Makefile 2014-05-03 22:58:57.000000000 +0400
+++ alephone/Makefile 2014-05-22 16:28:58.000000000 +0400
@@ -1,11 +1,10 @@
# Created by: Michael Alyn Miller <malyn@strangeGizmo.com>
-# $FreeBSD: head/games/alephone/Makefile 352933 2014-05-03 18:58:57Z tijl $
+# $FreeBSD: games/alephone/Makefile 327730 2013-09-20 17:36:33Z bapt $
PORTNAME= alephone
-PORTVERSION= 20120514
-PORTREVISION= 2
+PORTVERSION= 20140104
CATEGORIES= games
-MASTER_SITES= SF/marathon/Aleph%20One/2012-05-14
+MASTER_SITES= SF/marathon/Aleph%20One/2014-01-04
DISTNAME= AlephOne-${PORTVERSION}
MAINTAINER= fiziologus@gmail.com
@@ -13,57 +12,38 @@
BUILD_DEPENDS+= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
-USES= gmake pkgconfig tar:bzip2
-USE_SDL= image net sdl sound
+USES= pkgconfig gmake tar:bzip2
+USE_SDL+= image net sdl ttf
USE_GL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
DATADIR= ${PREFIX}/share/AlephOne
-OPTIONS_DEFINE= MAD OGG SPEEX SMPEG TTF ZZIP
+OPTIONS_DEFINE= MAD FMPEG OGG SPEEX SMPEG ZZIP
+FMPEG_DESC= Use ffmpeg for audio/video playback and film export
SMPEG_DESC= Use SMPEG for movie playback
-TTF_DESC= Enable SDL_ttf font rendering
ZZIP_DESC= Enable zziplib support
-OPTIONS_DEFAULT= MAD OGG SPEEX SMPEG TTF ZZIP
+OPTIONS_DEFAULT= MAD OGG SPEEX SMPEG ZZIP
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPEND+= libmad.so:${PORTSDIR}/audio/libmad
-.else
-CONFIGURE_ARGS+=--disable-mad
-.endif
+MAD_CONFIGURE_ENABLE= mad
+MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad
+FMPEG_CONFIGURE_ENABLE= ffmpeg
+FMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+OGG_CONFIGURE_ENABLE= vorbis
+OGG_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+SPEEX_CONFIGURE_ENABLE= speex
+SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
+SMPEG_CONFIGURE_ENABLE= smpeg
+SMPEG_LIB_DEPENDS= libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+ZZIP_CONFIGURE_ENABLE= zzip
+ZZIP_LIB_DEPENDS= libzzip.so:${PORTSDIR}/devel/zziplib
-.if ${PORT_OPTIONS:MOGG}
-LIB_DEPEND+= libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-.endif
-
-.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex
-.else
-CONFIGURE_ARGS+=--disable-speex
-.endif
-
-.if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+= libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-.else
-CONFIGURE_ARGS+=--disable-smpeg
-.endif
-
-.if ${PORT_OPTIONS:MTTF}
-USE_SDL+= ttf
-.else
-CONFIGURE_ARGS+=--disable-ttf
-.endif
+.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MZZIP}
-LIB_DEPENDS+= libzzip.so:${PORTSDIR}/devel/zziplib
-.else
-CONFIGURE_ARGS+=--disable-zzip
+.if ${PORT_OPTIONS:MFMPEG}
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-ffmpeg
.endif
post-install:
@@ -72,5 +52,8 @@
cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
.endif
+ @${ECHO_CMD}
+ @${CAT} ${PKGMESSAGE}
+ @${ECHO_CMD}
.include <bsd.port.mk>
diff -ruN alephone.orig/distinfo alephone/distinfo
--- alephone.orig/distinfo 2014-01-22 19:30:13.000000000 +0400
+++ alephone/distinfo 2014-05-22 16:28:58.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (AlephOne-20120514.tar.bz2) = 6a7797af74cf3fae7f5505e64ffe57c56f7331521cb569bcc8b7d7041cb3718b
-SIZE (AlephOne-20120514.tar.bz2) = 4716348
+SHA256 (AlephOne-20140104.tar.bz2) = 7f7d35c1d99cddd7cd0b47d3e4b84311373b04c60402ce86e9d85c36dfbaabcd
+SIZE (AlephOne-20140104.tar.bz2) = 4919455
diff -ruN alephone.orig/files/extra-patch-ffmpeg alephone/files/extra-patch-ffmpeg
--- alephone.orig/files/extra-patch-ffmpeg 1970-01-01 03:00:00.000000000 +0300
+++ alephone/files/extra-patch-ffmpeg 2014-05-22 16:28:58.000000000 +0400
@@ -0,0 +1,25 @@
+--- Source_Files/FFmpeg/SDL_ffmpeg.c.orig 2013-07-05 04:33:29.000000000 +0400
++++ Source_Files/FFmpeg/SDL_ffmpeg.c 2014-05-17 23:43:56.000000000 +0400
+@@ -48,6 +48,11 @@
+ }
+ #endif
+
++/* set magic number for 1 second of 48khz 32bit audio (removed from upstream) */
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++#endif
++
+ #include "SDL_ffmpeg.h"
+
+ #ifdef MSVC
+--- Source_Files/FFmpeg/Movie.cpp.orig 2014-01-04 06:19:57.000000000 +0400
++++ Source_Files/FFmpeg/Movie.cpp 2014-05-17 23:48:13.000000000 +0400
+@@ -491,7 +491,7 @@
+
+ // tuning options
+ int aq = graphics_preferences->movie_export_audio_quality;
+- audio_stream->codec->global_quality = audio_stream->quality = FF_QP2LAMBDA * (aq / 10);
++ audio_stream->codec->global_quality = FF_QP2LAMBDA * (aq / 10);
+ audio_stream->codec->flags |= CODEC_FLAG_QSCALE;
+
+ // find correct sample format
diff -ruN alephone.orig/files/patch-Source_Files-Lua-lua_templates.h alephone/files/patch-Source_Files-Lua-lua_templates.h
--- alephone.orig/files/patch-Source_Files-Lua-lua_templates.h 2013-02-01 19:04:00.000000000 +0400
+++ alephone/files/patch-Source_Files-Lua-lua_templates.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- Source_Files/Lua/lua_templates.h.orig 2012-04-21 17:57:45.000000000 +0400
-+++ Source_Files/Lua/lua_templates.h 2012-04-21 17:58:22.000000000 +0400
-@@ -496,7 +496,7 @@
- static index_t ToIndex(lua_State *L, int index) {
- index_t to;
- if(lua_isnil(L, index)) return -1;
-- else if(_lookup(L, index, to)) return to;
-+ else if(L_Enum<name, index_t>::_lookup(L, index, to)) return to;
- else {
- std::string error;
- if(lua_isnumber(L, index) || lua_isstring(L, index))
diff -ruN alephone.orig/pkg-message alephone/pkg-message
--- alephone.orig/pkg-message 2014-01-22 19:52:06.000000000 +0400
+++ alephone/pkg-message 2014-05-22 16:28:58.000000000 +0400
@@ -4,18 +4,9 @@
This package does not include any Aleph One data files. To obtain the original
ones use the "games/alephone-data" port. The "games/alephone-scenarios" port
-contains more (unofficial) scenarios. In addition, you can search for data
-files here:
+contains more (unofficial) scenarios. In addition, you can search for game
+stuff here:
-* http://archives.bungie.org/
-
-* http://fileball.net/marathon/
-
-* http://orbitalarm.bungie.org/downloads/alephone.html
-
-* http://marathon.bungie.org/scenarionews/
-
-Aleph One works best with OpenGL. If you do not have an OpenGL card and the
-game is sluggish, try using the "-g" option to disable OpenGL.
+* http://www.simplici7y.com
==============================================================================
diff -ruN alephone.orig/pkg-plist alephone/pkg-plist
--- alephone.orig/pkg-plist 2014-05-03 22:58:57.000000000 +0400
+++ alephone/pkg-plist 2014-05-22 16:28:58.000000000 +0400
@@ -1,57 +1,56 @@
bin/alephone
man/man6/alephone.6.gz
-%%DATADIR%%/Fonts
%%DATADIR%%/MML/Interface_Rects.mml
%%DATADIR%%/MML/Transparent_Liquids.mml
%%DATADIR%%/MML/Transparent_Sprites.mml
-%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-Bold.ttf
-%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldBold.ttf
-%%DATADIR%%/Themes/Default/DejaVuLGCSansCondensed-BoldOblique.ttf
-%%DATADIR%%/Themes/Default/LICENSE-DejaVu
-%%DATADIR%%/Themes/Default/SquarishSansCT.README
-%%DATADIR%%/Themes/Default/Squarish_Sans_CT_Medium.ttf
-%%DATADIR%%/Themes/Default/button_c.bmp
-%%DATADIR%%/Themes/Default/button_c_p.bmp
-%%DATADIR%%/Themes/Default/button_l.bmp
-%%DATADIR%%/Themes/Default/button_l_p.bmp
-%%DATADIR%%/Themes/Default/button_r.bmp
-%%DATADIR%%/Themes/Default/button_r_p.bmp
-%%DATADIR%%/Themes/Default/frame_b.bmp
-%%DATADIR%%/Themes/Default/frame_bl.bmp
-%%DATADIR%%/Themes/Default/frame_br.bmp
-%%DATADIR%%/Themes/Default/frame_l.bmp
-%%DATADIR%%/Themes/Default/frame_r.bmp
-%%DATADIR%%/Themes/Default/frame_t.bmp
-%%DATADIR%%/Themes/Default/frame_tl.bmp
-%%DATADIR%%/Themes/Default/frame_tr.bmp
-%%DATADIR%%/Themes/Default/list_b.bmp
-%%DATADIR%%/Themes/Default/list_bl.bmp
-%%DATADIR%%/Themes/Default/list_br.bmp
-%%DATADIR%%/Themes/Default/list_l.bmp
-%%DATADIR%%/Themes/Default/list_r.bmp
-%%DATADIR%%/Themes/Default/list_t.bmp
-%%DATADIR%%/Themes/Default/list_tl.bmp
-%%DATADIR%%/Themes/Default/list_tr.bmp
-%%DATADIR%%/Themes/Default/resources
-%%DATADIR%%/Themes/Default/slider.bmp
-%%DATADIR%%/Themes/Default/slider_c.bmp
-%%DATADIR%%/Themes/Default/slider_l.bmp
-%%DATADIR%%/Themes/Default/slider_r.bmp
-%%DATADIR%%/Themes/Default/theme2.mml
-%%DATADIR%%/Themes/Default/thumb_b.bmp
-%%DATADIR%%/Themes/Default/thumb_bc.bmp
-%%DATADIR%%/Themes/Default/thumb_c.bmp
-%%DATADIR%%/Themes/Default/thumb_t.bmp
-%%DATADIR%%/Themes/Default/thumb_tc.bmp
-%%DATADIR%%/Themes/Default/tiny_button_c.bmp
-%%DATADIR%%/Themes/Default/tiny_button_l.bmp
-%%DATADIR%%/Themes/Default/tiny_button_r.bmp
+%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-Bold.ttf
+%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-BoldBold.ttf
+%%DATADIR%%/Plugins/Default_Theme/DejaVuLGCSansCondensed-BoldOblique.ttf
+%%DATADIR%%/Plugins/Default_Theme/LICENSE-DejaVu
+%%DATADIR%%/Plugins/Default_Theme/Plugin.xml
+%%DATADIR%%/Plugins/Default_Theme/SquarishSansCT.README
+%%DATADIR%%/Plugins/Default_Theme/Squarish_Sans_CT_Medium.ttf
+%%DATADIR%%/Plugins/Default_Theme/button_c.bmp
+%%DATADIR%%/Plugins/Default_Theme/button_c_p.bmp
+%%DATADIR%%/Plugins/Default_Theme/button_l.bmp
+%%DATADIR%%/Plugins/Default_Theme/button_l_p.bmp
+%%DATADIR%%/Plugins/Default_Theme/button_r.bmp
+%%DATADIR%%/Plugins/Default_Theme/button_r_p.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_b.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_bl.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_br.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_l.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_r.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_t.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_tl.bmp
+%%DATADIR%%/Plugins/Default_Theme/frame_tr.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_b.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_bl.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_br.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_l.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_r.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_t.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_tl.bmp
+%%DATADIR%%/Plugins/Default_Theme/list_tr.bmp
+%%DATADIR%%/Plugins/Default_Theme/slider.bmp
+%%DATADIR%%/Plugins/Default_Theme/slider_c.bmp
+%%DATADIR%%/Plugins/Default_Theme/slider_l.bmp
+%%DATADIR%%/Plugins/Default_Theme/slider_r.bmp
+%%DATADIR%%/Plugins/Default_Theme/theme2.mml
+%%DATADIR%%/Plugins/Default_Theme/thumb_b.bmp
+%%DATADIR%%/Plugins/Default_Theme/thumb_bc.bmp
+%%DATADIR%%/Plugins/Default_Theme/thumb_c.bmp
+%%DATADIR%%/Plugins/Default_Theme/thumb_t.bmp
+%%DATADIR%%/Plugins/Default_Theme/thumb_tc.bmp
+%%DATADIR%%/Plugins/Default_Theme/tiny_button_c.bmp
+%%DATADIR%%/Plugins/Default_Theme/tiny_button_l.bmp
+%%DATADIR%%/Plugins/Default_Theme/tiny_button_r.bmp
%%PORTDOCS%%%%DOCSDIR%%/Lua.html
%%PORTDOCS%%%%DOCSDIR%%/Lua_HUD.html
%%PORTDOCS%%%%DOCSDIR%%/MML.html
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/Themes/Default
-@dirrm %%DATADIR%%/Themes
+@dirrm %%DATADIR%%/Plugins/Default_Theme
+@dirrm %%DATADIR%%/Plugins
@dirrm %%DATADIR%%/MML
@dirrmtry %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405221246.s4MCkU4e045920>