svn commit: r528847 - branches/2020Q1/games/scummvm

[Kai Knoblich]

Author: kai
Date: Sat Mar 21 11:01:45 2020
New Revision: 528847
URL: https://svnweb.freebsd.org/changeset/ports/528847

Log:
  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

Modified:
  branches/2020Q1/games/scummvm/Makefile
  branches/2020Q1/games/scummvm/distinfo
  branches/2020Q1/games/scummvm/pkg-plist
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/games/scummvm/Makefile
==============================================================================
--- branches/2020Q1/games/scummvm/Makefile	Sat Mar 21 10:48:32 2020	(r528846)
+++ branches/2020Q1/games/scummvm/Makefile	Sat Mar 21 11:01:45 2020	(r528847)
@@ -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 at 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}

Modified: branches/2020Q1/games/scummvm/distinfo
==============================================================================
--- branches/2020Q1/games/scummvm/distinfo	Sat Mar 21 10:48:32 2020	(r528846)
+++ branches/2020Q1/games/scummvm/distinfo	Sat Mar 21 11:01:45 2020	(r528847)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1570886158
-SHA256 (scummvm-2.1.0.tar.xz) = 6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727
-SIZE (scummvm-2.1.0.tar.xz) = 27188916
+TIMESTAMP = 1581614684
+SHA256 (scummvm-2.1.1.tar.xz) = 5753769356f3396fde1e614b40496c61392a2903c53ca436b721dde58353dca8
+SIZE (scummvm-2.1.1.tar.xz) = 27291080
+SHA256 (8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) = dc625481aa58fb87a659d33e10c11a86f085b72bf754b43f4c538ceab72f02a9
+SIZE (8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) = 977
+SHA256 (68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch) = 847caba0fd2fedc3bd365a6306539a9665b84f3b0653b771a294415f5450d25b
+SIZE (68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch) = 1889

Modified: branches/2020Q1/games/scummvm/pkg-plist
==============================================================================
--- branches/2020Q1/games/scummvm/pkg-plist	Sat Mar 21 10:48:32 2020	(r528846)
+++ branches/2020Q1/games/scummvm/pkg-plist	Sat Mar 21 11:01:45 2020	(r528847)
@@ -30,7 +30,7 @@ share/pixmaps/scummvm.xpm
 %%DATADIR%%/sky.cpt
 %%DATADIR%%/supernova.dat
 %%DATADIR%%/teenagent.dat
-%%DATADIR%%/titanic.dat
+%%MP3%%%%DATADIR%%/titanic.dat
 %%DATADIR%%/tony.dat
 %%DATADIR%%/toon.dat
 %%DATADIR%%/translations.dat