From a1b78dbd64a917240c120fb2f043b30237e9f75c Mon Sep 17 00:00:00 2001 From: phessler Date: Mon, 18 May 2009 05:59:23 +0000 Subject: [PATCH] Update to 0.21.2 * Added support for custom window sizes (by editing prefs file) * Fixed assertion failures when changing levels in net games * Restore the previously selected map when finishing a net game * Restore support for UTF-8 prefs / MML (while preserving compatibility with broken Rubicon MML) * Added a VSync checkbox in OpenGL Also, fix dependency on vorbis, so ogg music plays correctly. comments and OK by merdely@ --- games/alephone/alephone/Makefile | 12 ++++++----- games/alephone/alephone/distinfo | 10 ++++----- .../alephone/patches/patch-Makefile_in | 8 +++---- .../alephone/alephone/patches/patch-configure | 21 +++++++++++++++++++ 4 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 games/alephone/alephone/patches/patch-configure diff --git a/games/alephone/alephone/Makefile b/games/alephone/alephone/Makefile index 5d48c607821..3be6bd1c92c 100644 --- a/games/alephone/alephone/Makefile +++ b/games/alephone/alephone/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2008/09/10 17:21:48 martynas Exp $ +# $OpenBSD: Makefile,v 1.5 2009/05/18 05:59:23 phessler Exp $ DIST_SUBDIR ?= alephone COMMENT = open source game engine based on Marathon 2: Durandal -DISTNAME = AlephOne-20080707 -PKGNAME = alephone-0.20.1p2 +DISTNAME = AlephOne-20081226 +PKGNAME = alephone-0.21.2 + EXTRACT_SUFX = .tar.bz2 CATEGORIES = games x11 @@ -20,7 +21,7 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=marathon/} \ http://www.treellama.org/alephone/ -WANTLIB = GL GLU SDL c m pthread smpeg stdc++ z +WANTLIB = GL GLU SDL c m ogg pthread smpeg stdc++ z BUILD_DEPENDS = ::devel/automake/${AUTOMAKE_VER} \ ::devel/autoconf/${AUTOCONF_VER} LIB_DEPENDS = ::devel/boost \ @@ -30,7 +31,8 @@ LIB_DEPENDS = ::devel/boost \ smpeg.>=1.3::devel/smpeg \ mad::audio/libmad \ sndfile::audio/libsndfile \ - speexdsp,speex::audio/speex + speexdsp,speex::audio/speex \ + vorbis,vorbisfile::audio/libvorbis USE_X11 = Yes USE_BZIP2 = Yes diff --git a/games/alephone/alephone/distinfo b/games/alephone/alephone/distinfo index 8111d109191..33e6cbc68d7 100644 --- a/games/alephone/alephone/distinfo +++ b/games/alephone/alephone/distinfo @@ -1,5 +1,5 @@ -MD5 (alephone/AlephOne-20080707.tar.bz2) = VAI+uVsz8dvZlX1OHm/IWA== -RMD160 (alephone/AlephOne-20080707.tar.bz2) = WKi5IUeWc1Of5euBLkki3/UQ03o= -SHA1 (alephone/AlephOne-20080707.tar.bz2) = 92yiPUaOrJnOeBANjXgLjXjd9mY= -SHA256 (alephone/AlephOne-20080707.tar.bz2) = C+b8Kv/mmf8MOvdsbvH7we1YgwuP38e3cvMUkOLBLRg= -SIZE (alephone/AlephOne-20080707.tar.bz2) = 3024161 +MD5 (alephone/AlephOne-20081226.tar.bz2) = e9nljN+RHV2wGhHStGxdmA== +RMD160 (alephone/AlephOne-20081226.tar.bz2) = RmY5EioFB/oiiiQ8LmNoHDyjl+0= +SHA1 (alephone/AlephOne-20081226.tar.bz2) = KkDhB5yaFIl5+7Qx5k9jPYH67PA= +SHA256 (alephone/AlephOne-20081226.tar.bz2) = a3Ulk7yXUVvo7z3OGoPXAMa9/+obskSWwaW6f5NeFXY= +SIZE (alephone/AlephOne-20081226.tar.bz2) = 3002611 diff --git a/games/alephone/alephone/patches/patch-Makefile_in b/games/alephone/alephone/patches/patch-Makefile_in index 6f84216d1d7..ce631c2e60f 100644 --- a/games/alephone/alephone/patches/patch-Makefile_in +++ b/games/alephone/alephone/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2008/07/25 20:44:23 martynas Exp $ ---- Makefile.in.orig Tue Jul 8 03:13:41 2008 -+++ Makefile.in Fri Jul 25 22:24:20 2008 -@@ -189,7 +189,7 @@ AUTOMAKE_OPTIONS = 1.5 foreign +$OpenBSD: patch-Makefile_in,v 1.3 2009/05/18 05:59:23 phessler Exp $ +--- Makefile.in.orig Sat Dec 27 03:35:28 2008 ++++ Makefile.in Sat May 9 12:53:19 2009 +@@ -188,7 +188,7 @@ AUTOMAKE_OPTIONS = 1.5 foreign EXTRA_DIST = COPYING.SDL INSTALL.BeOS INSTALL.Unix INSTALL.Windows Makefile.BeOS \ docs/MML.html docs/Lua.html data/Fonts Resources/Windows/alephone.ico Resources/Windows/alephone.rc PBProjects/AlephOne-OSX10.4.xcodeproj/project.pbxproj PBProjects/English.lproj/InfoPlist.strings PBProjects/FilmIcon.icns PBProjects/ImagesIcon.icns PBProjects/MapIcon.icns PBProjects/MMLIcon.icns PBProjects/MusakIcon.icns PBProjects/PFIcon.icns PBProjects/PhysIcon.icns PBProjects/SaveIcon.icns PBProjects/ShapesIcon.icns PBProjects/SoundsIcon.icns PBProjects/Info-AlephOne_SDL.plist PBProjects/precompiled_headers.h PBProjects/SDLMain.h PBProjects/SDLMain.m PBProjects/AlephOne.icns Expat/xmltok/nametab.h PBProjects/config.h PBProjects/confpaths.h data/AlephSansMono-Bold.ttf data/AlephSansMonoLicense.txt docs/alephone.6 examples/lua/Cheats.lua diff --git a/games/alephone/alephone/patches/patch-configure b/games/alephone/alephone/patches/patch-configure new file mode 100644 index 00000000000..ab7dbab3ab0 --- /dev/null +++ b/games/alephone/alephone/patches/patch-configure @@ -0,0 +1,21 @@ +$OpenBSD: patch-configure,v 1.1 2009/05/18 05:59:23 phessler Exp $ +--- configure.orig Sat Dec 27 03:35:29 2008 ++++ configure Sat May 9 13:05:08 2009 +@@ -8184,7 +8184,7 @@ if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; t + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lvorbisfile $LIBS" ++LIBS="`pkg-config vorbisfile --libs` $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8241,7 +8241,7 @@ fi + echo "${ECHO_T}$ac_cv_lib_vorbisfile_ov_open" >&6; } + if test $ac_cv_lib_vorbisfile_ov_open = yes; then + +- LIBS="-lvorbisfile $LIBS" ++ LIBS="`pkg-config vorbisfile --libs` $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define HAVE_VORBISFILE 1