From owner-svn-ports-branches@freebsd.org Sat Mar 21 11:01:46 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F22225E78E; Sat, 21 Mar 2020 11:01:46 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48kyQ22tvtz4f5s; Sat, 21 Mar 2020 11:01:46 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DAA6B885; Sat, 21 Mar 2020 11:01:46 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02LB1ktx049174; Sat, 21 Mar 2020 11:01:46 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02LB1j98049171; Sat, 21 Mar 2020 11:01:45 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202003211101.02LB1j98049171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sat, 21 Mar 2020 11:01:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528847 - branches/2020Q1/games/scummvm X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: branches/2020Q1/games/scummvm X-SVN-Commit-Revision: 528847 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Mar 2020 11:01:46 -0000 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@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