update to 1.5.0
sndio midi backend now included upstream
This commit is contained in:
jsg
parent
3c826ae842
commit
065024f269
@ -1,8 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.52 2012/05/22 18:39:42 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.53 2012/08/04 15:58:37 jsg Exp $
|
||||
|
||||
COMMENT= graphical adventure game interpreter
|
||||
DISTNAME= scummvm-1.4.1
|
||||
REVISION= 2
|
||||
DISTNAME= scummvm-1.5.0
|
||||
CATEGORIES= games x11 emulators
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
|
||||
|
||||
@ -66,7 +65,4 @@ do-install:
|
||||
${PREFIX}/share/applications
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
|
||||
|
||||
post-patch:
|
||||
@cp ${FILESDIR}/sndio.cpp ${WRKSRC}/backends/midi
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
MD5 (scummvm-1.4.1.tar.gz) = FUZpHxruga0pzhLPq1CMyw==
|
||||
RMD160 (scummvm-1.4.1.tar.gz) = eR31qcHZFHvp51ZyOezx4slQBQM=
|
||||
SHA1 (scummvm-1.4.1.tar.gz) = y7Vi7C5w3+eNH/mu3U13L0lR1m4=
|
||||
SHA256 (scummvm-1.4.1.tar.gz) = zoRGsm7pcT6Z80vj81YJ6jVZVTUWzUdlFkZu7Ebvkbk=
|
||||
SIZE (scummvm-1.4.1.tar.gz) = 18126204
|
||||
SHA256 (scummvm-1.5.0.tar.gz) = kvCmoy/tltvlAc/fMouZw2x4xgWpbCem/pEIckyXeFY=
|
||||
SIZE (scummvm-1.5.0.tar.gz) = 19760347
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_common,v 1.6 2011/11/12 12:59:58 jsg Exp $
|
||||
--- Makefile.common.orig Wed Jul 27 23:40:23 2011
|
||||
+++ Makefile.common Fri Nov 11 15:35:24 2011
|
||||
@@ -159,29 +159,6 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
|
||||
$OpenBSD: patch-Makefile_common,v 1.7 2012/08/04 15:58:37 jsg Exp $
|
||||
--- Makefile.common.orig Thu May 31 20:39:11 2012
|
||||
+++ Makefile.common Tue Jul 31 12:41:37 2012
|
||||
@@ -160,29 +160,6 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
|
||||
VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
|
||||
VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
|
||||
|
||||
|
||||
@ -1,36 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.10 2012/04/19 07:43:47 ratchov Exp $
|
||||
--- configure.orig Sun Jan 15 10:08:27 2012
|
||||
+++ configure Wed Apr 11 19:02:04 2012
|
||||
@@ -134,6 +134,7 @@ _flac=auto
|
||||
_mad=auto
|
||||
_alsa=auto
|
||||
_seq_midi=auto
|
||||
+_sndio=auto
|
||||
_timidity=auto
|
||||
_zlib=auto
|
||||
_sparkle=auto
|
||||
@@ -879,6 +880,8 @@ for ac_option in $@; do
|
||||
--disable-alsa) _alsa=no ;;
|
||||
--enable-seq-midi) _seq_midi=yes ;;
|
||||
--disable-seq-midi) _seq_midi=no ;;
|
||||
+ --enable-sndio) _sndio=yes ;;
|
||||
+ --disable-sndio) _sndio=no ;;
|
||||
--enable-timidity) _timidity=yes ;;
|
||||
--disable-timidity) _timidity=no ;;
|
||||
--enable-vorbis) _vorbis=yes ;;
|
||||
@@ -937,6 +940,11 @@ for ac_option in $@; do
|
||||
ALSA_CFLAGS="-I$arg/include"
|
||||
ALSA_LIBS="-L$arg/lib"
|
||||
;;
|
||||
+ --with-sndio-prefix=*)
|
||||
+ arg=`echo $ac_option | cut -d '=' -f 2`
|
||||
+ SNDIO_CFLAGS="-I$arg/include"
|
||||
+ SNDIO_LIBS="-L$arg/lib"
|
||||
+ ;;
|
||||
--with-ogg-prefix=*)
|
||||
arg=`echo $ac_option | cut -d '=' -f 2`
|
||||
OGG_CFLAGS="-I$arg/include"
|
||||
@@ -1613,21 +1621,6 @@ elif test "$have_icc" = yes ; then
|
||||
$OpenBSD: patch-configure,v 1.11 2012/08/04 15:58:37 jsg Exp $
|
||||
--- configure.orig Tue Jul 31 12:42:27 2012
|
||||
+++ configure Tue Jul 31 12:43:45 2012
|
||||
@@ -1632,21 +1632,6 @@ elif test "$have_icc" = yes ; then
|
||||
add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
|
||||
fi;
|
||||
|
||||
@ -39,7 +10,7 @@ $OpenBSD: patch-configure,v 1.10 2012/04/19 07:43:47 ratchov Exp $
|
||||
-# However, some platforms use GNU extensions in system header files, so
|
||||
-# for these we must not use -pedantic.
|
||||
-case $_host_os in
|
||||
-android | gamecube | psp | wii)
|
||||
-android | gamecube | psp | wii | webos)
|
||||
- ;;
|
||||
-*)
|
||||
- # ICC does not support pedantic, while GCC and clang do.
|
||||
@ -52,42 +23,15 @@ $OpenBSD: patch-configure,v 1.10 2012/04/19 07:43:47 ratchov Exp $
|
||||
# If possible, we want to use -Wglobal-constructors
|
||||
# However, not all compilers support that, so check whether the active one does.
|
||||
echocheck "whether -Wglobal-constructors work"
|
||||
@@ -3076,9 +3069,11 @@ EOF
|
||||
@@ -3141,9 +3126,9 @@ EOF
|
||||
fi
|
||||
if test "$_flac" = yes ; then
|
||||
if test "$_vorbis" = yes ; then
|
||||
- LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
|
||||
+ # LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
|
||||
+ LIBS="$LIBS `pkg-config --libs flac` -logg"
|
||||
else
|
||||
- LIBS="$LIBS $FLAC_LIBS -lFLAC"
|
||||
+ # LIBS="$LIBS $FLAC_LIBS -lFLAC"
|
||||
+ LIBS="$LIBS `pkg-config --libs flac`"
|
||||
fi
|
||||
INCLUDES="$INCLUDES $FLAC_CFLAGS"
|
||||
fi
|
||||
@@ -3205,6 +3200,24 @@ if test "$_seq_midi" = auto ; then
|
||||
fi
|
||||
define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI'
|
||||
echo "$_seq_midi"
|
||||
+
|
||||
+#
|
||||
+# Check for sndio
|
||||
+#
|
||||
+echocheck "sndio"
|
||||
+if test "$_sndio" = auto ; then
|
||||
+ cat > $TMPC << EOF
|
||||
+#include <sndio.h>
|
||||
+int main(void) { struct sio_par par; sio_init(&par); return 0; }
|
||||
+EOF
|
||||
+ cc_check $SNDIO_CFLAGS $SNDIO_LIBS -lsndio && _sndio=yes
|
||||
+fi
|
||||
+if test "$_sndio" = yes ; then
|
||||
+ LIBS="$LIBS $SNDIO_LIBS -lsndio"
|
||||
+ INCLUDES="$INCLUDES $SNDIO_CFLAGS"
|
||||
+fi
|
||||
+define_in_config_h_if_yes "$_sndio" 'USE_SNDIO'
|
||||
+echo "$_sndio"
|
||||
|
||||
#
|
||||
# Check for TiMidity(++)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user