update to 1.4.1 and stop the configure script from adding -pedantic

to CXXFLAGS as this hard errored on the long long in ogg headers
resulting in a binary with no vorbis/flac support.
This commit is contained in:
jsg 2012-02-17 06:59:40 +00:00
parent 08f123b336
commit 7a3bf77ddf
3 changed files with 33 additions and 11 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.48 2011/11/12 12:59:58 jsg Exp $
# $OpenBSD: Makefile,v 1.49 2012/02/17 06:59:40 jsg Exp $
BROKEN-hppa= gcc bug
COMMENT= graphical adventure game interpreter
DISTNAME= scummvm-1.4.0
DISTNAME= scummvm-1.4.1
CATEGORIES= games x11 emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}

View File

@ -1,5 +1,5 @@
MD5 (scummvm-1.4.0.tar.gz) = 6WK3pI6trST5IwEIsRxecg==
RMD160 (scummvm-1.4.0.tar.gz) = oaEFxz1WONW0/raVWhqN56afOgM=
SHA1 (scummvm-1.4.0.tar.gz) = rHPoUmdpVxsQRjGvUmiFzxI3ECo=
SHA256 (scummvm-1.4.0.tar.gz) = MYrFoNDN9KUGrz0bpfmotA3fZxxOsfQzGUw4ZdLmxyk=
SIZE (scummvm-1.4.0.tar.gz) = 18007911
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

View File

@ -1,7 +1,29 @@
$OpenBSD: patch-configure,v 1.8 2011/11/12 12:59:58 jsg Exp $
--- configure.orig Fri Nov 4 05:06:06 2011
+++ configure Fri Nov 11 15:35:24 2011
@@ -3048,9 +3048,11 @@ EOF
$OpenBSD: patch-configure,v 1.9 2012/02/17 06:59:41 jsg Exp $
--- configure.orig Sun Jan 15 20:08:27 2012
+++ configure Fri Feb 17 13:18:29 2012
@@ -1613,21 +1613,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;
-# By default, we add -pedantic to the CXXFLAGS to catch some potentially
-# non-portable constructs, like use of GNU extensions.
-# 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)
- ;;
-*)
- # ICC does not support pedantic, while GCC and clang do.
- if test "$have_icc" = no ; then
- CXXFLAGS="$CXXFLAGS -pedantic"
- fi
- ;;
-esac
-
# 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 +3061,11 @@ EOF
fi
if test "$_flac" = yes ; then
if test "$_vorbis" = yes ; then