summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/alephone/README6
-rw-r--r--games/alephone/alephone.SlackBuild16
-rw-r--r--games/alephone/alephone.info8
-rw-r--r--games/alephone/alephone.pngbin34235 -> 0 bytes
-rw-r--r--games/alephone/doinst.sh6
-rw-r--r--games/alephone/ffmpeg_api.diff27
6 files changed, 50 insertions, 13 deletions
diff --git a/games/alephone/README b/games/alephone/README
index 34b1546210..c35b1801a2 100644
--- a/games/alephone/README
+++ b/games/alephone/README
@@ -12,3 +12,9 @@ the Marathon series is required to play. Install one or more of
marathon-data, marathon2-data, and/or marathon-infinite-data.
See the READMEs for the game data packages for more information.
+
+Although ffmpeg is listed as a dependency, it's possible to build
+without it by setting FFMPEG=no in the script's environment (which will
+disable in-game movie playback/recording). This option is provided as a
+desperation measure only, since ffmpeg's API is a moving target. Please
+contact the maintainer if you have ffmpeg-related build issues.
diff --git a/games/alephone/alephone.SlackBuild b/games/alephone/alephone.SlackBuild
index c6dbd0a476..a59807eb1b 100644
--- a/games/alephone/alephone.SlackBuild
+++ b/games/alephone/alephone.SlackBuild
@@ -7,7 +7,7 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
PRGNAM=alephone
-VERSION=${VERSION:-20120514}
+VERSION=${VERSION:-20140104}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -55,9 +55,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Patch came from ArchLinux AUR, this is the two ffmpeg patches catted
+# together.
+patch -p1 < $CWD/ffmpeg_api.diff
+
+[ "${FFMPEG:-yes}" = "no" ] && EXTRAOPT=--disable-ffmpeg
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS -fpermissive" \
./configure \
+ $EXTRAOPT \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -75,13 +82,12 @@ gzip -9 $PKG/usr/man/man?/*.?
# Instead, the game-data packages each get a .desktop.
# However, they all use the same icon, so install it here.
-# Icon taken from the windows alephone.exe
mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat Source_Files/Misc/$PRGNAM.xpm > $PKG/usr/share/pixmaps/$PRGNAM.xpm
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- ChangeLog AUTHORS COPYING README THANKS examples docs/*.html \
+# ChangeLog is 0 bytes in 20140104, ignore it
+cp -a AUTHORS COPYING README THANKS examples docs/*.html \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/alephone/alephone.info b/games/alephone/alephone.info
index def95fb5df..02f36ce31b 100644
--- a/games/alephone/alephone.info
+++ b/games/alephone/alephone.info
@@ -1,10 +1,10 @@
PRGNAM="alephone"
-VERSION="20120514"
+VERSION="20140104"
HOMEPAGE="http://marathon.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/marathon/Aleph%20One/2012-05-14/AlephOne-20120514.tar.bz2"
-MD5SUM="2a8183a3483b91a5e47eefe0920e77a8"
+DOWNLOAD="http://downloads.sourceforge.net/project/marathon/Aleph%20One/2014-01-04/AlephOne-20140104.tar.bz2"
+MD5SUM="5d7cad49eab566a8d6c1317a86055a7f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="lua speex zziplib"
+REQUIRES="lua speex zziplib ffmpeg"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"
diff --git a/games/alephone/alephone.png b/games/alephone/alephone.png
deleted file mode 100644
index 83e412c2ea..0000000000
--- a/games/alephone/alephone.png
+++ /dev/null
Binary files differ
diff --git a/games/alephone/doinst.sh b/games/alephone/doinst.sh
index 8542d1c18e..5fb28930db 100644
--- a/games/alephone/doinst.sh
+++ b/games/alephone/doinst.sh
@@ -1,5 +1,3 @@
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
- fi
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
diff --git a/games/alephone/ffmpeg_api.diff b/games/alephone/ffmpeg_api.diff
new file mode 100644
index 0000000000..3128e3d426
--- /dev/null
+++ b/games/alephone/ffmpeg_api.diff
@@ -0,0 +1,27 @@
+diff -rupN AlephOne-20140104/Source_Files/FFmpeg/SDL_ffmpeg.c AlephOne-20140104.new/Source_Files/FFmpeg/SDL_ffmpeg.c
+--- AlephOne-20140104/Source_Files/FFmpeg/SDL_ffmpeg.c 2013-07-05 02:33:29.000000000 +0200
++++ AlephOne-20140104.new/Source_Files/FFmpeg/SDL_ffmpeg.c 2014-03-16 01:53:19.327213212 +0100
+@@ -48,6 +48,11 @@ extern "C"
+ }
+ #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
+diff -rupN AlephOne-20140104/Source_Files/FFmpeg/Movie.cpp AlephOne-20140104.new/Source_Files/FFmpeg/Movie.cpp
+--- AlephOne-20140104/Source_Files/FFmpeg/Movie.cpp 2014-01-04 03:19:57.000000000 +0100
++++ AlephOne-20140104.new/Source_Files/FFmpeg/Movie.cpp 2014-03-16 01:43:32.030011019 +0100
+@@ -491,7 +491,7 @@ bool Movie::Setup()
+
+ // 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