diff options
author | Kai Knoblich <kai@FreeBSD.org> | 2020-03-21 11:01:45 +0000 |
---|---|---|
committer | Kai Knoblich <kai@FreeBSD.org> | 2020-03-21 11:01:45 +0000 |
commit | 4d9aad2f7115d3408fa42ec16a88785343a97261 (patch) | |
tree | bd1bcdad884f90188568207d38084213e7144c78 /games/scummvm/Makefile | |
parent | 3aa897e00825b476e1cc1b59e0290fe4f2354fd6 (diff) | |
download | ports-4d9aad2f7115d3408fa42ec16a88785343a97261.tar.gz ports-4d9aad2f7115d3408fa42ec16a88785343a97261.zip |
MFH: r524970 r528846
games/scummvm: Unbreak build with FLUIDSYNTH=on
games/scummvm: Update to 2.1.1
Clean-up some stage QA warnings/issues while I'm here:
* Fix pkg-plist issues if the MP3 option is set to off.
* Add "iconv" to USES as scummvm is linked against libiconv.so.
* Also add "--disable-ogg" to VORBIS_CONFIGURE_OFF if the VORBIS option is
set to off. Otherwise scummvm is linked against "libogg.so" which is a
dependency of the VORBIS option but "libogg.so" is already pulled in via
the non-conditional "libtheoradec.so".
Changelog:
https://www.scummvm.org/news/20200131/
PR: 244272
Approved by: maintainer timeout (4+ weeks)
Approved by: ports-secteam build/bugfix blanket
Notes
Notes:
svn path=/branches/2020Q1/; revision=528847
Diffstat (limited to 'games/scummvm/Makefile')
-rw-r--r-- | games/scummvm/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index c6ca13142c51..0c79e8e32fdf 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -2,10 +2,14 @@ # $FreeBSD$ PORTNAME= scummvm -PORTVERSION= 2.1.0 +PORTVERSION= 2.1.1 CATEGORIES= games emulators MASTER_SITES= http://www.scummvm.org/frs/scummvm/${PORTVERSION}/ +PATCH_SITES= https://github.com/scummvm/scummvm/commit/ +PATCHFILES= 8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch:-p1 \ + 68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch:-p1 + MAINTAINER= lme@FreeBSD.org COMMENT= Interpreter for several adventure games @@ -17,7 +21,7 @@ LIB_DEPENDS= libfaad.so:audio/faad \ libmpeg2.so:multimedia/libmpeg2 \ libtheoradec.so:multimedia/libtheora -USES= gmake gnome jpeg sdl tar:xz +USES= gmake gnome iconv jpeg sdl tar:xz HAS_CONFIGURE= yes USE_SDL= sdl2 INSTALLS_ICONS= yes @@ -35,6 +39,7 @@ LDFLAGS+= -lpthread OPTIONS_DEFINE= DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS OPTIONS_DEFAULT= MP3 MT32EMU PNG VORBIS +OPTIONS_SUB= yes MT32EMU_DESC= MT-32 emulator @@ -42,7 +47,8 @@ VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis VORBIS_CONFIGURE_ON= --with-ogg-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} -VORBIS_CONFIGURE_OFF= --disable-vorbis +VORBIS_CONFIGURE_OFF= --disable-vorbis \ + --disable-ogg MP3_LIB_DEPENDS= libmad.so:audio/libmad MP3_CONFIGURE_ON= --with-mad-prefix=${LOCALBASE} |