From owner-dev-commits-ports-main@freebsd.org Thu Aug 5 09:57:46 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 5C410660F07; Thu, 5 Aug 2021 09:57:46 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GgPDV2BTxz4qD6; Thu, 5 Aug 2021 09:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 332CF183E5; Thu, 5 Aug 2021 09:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1759vklo046836; Thu, 5 Aug 2021 09:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1759vkgK046835; Thu, 5 Aug 2021 09:57:46 GMT (envelope-from git) Date: Thu, 5 Aug 2021 09:57:46 GMT Message-Id: <202108050957.1759vkgK046835@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: f23c268967bf - main - games/scummvm: Add new options, fix QA warnings MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f23c268967bf67b77181efe321228a613632ae0e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2021 09:57:46 -0000 The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=f23c268967bf67b77181efe321228a613632ae0e commit f23c268967bf67b77181efe321228a613632ae0e Author: Kai Knoblich AuthorDate: 2021-08-05 09:41:05 +0000 Commit: Kai Knoblich CommitDate: 2021-08-05 09:50:26 +0000 games/scummvm: Add new options, fix QA warnings * Introduce a TTS option to avoid possible QA stage warnings with build environments that have already libspeechd.so because the configure script automatically adds it as an additional dependency in that case. Set the option as non-default because it's only used by a small set of engines and pulls in quite a few dependencies. * The same as above also applies for enviroments that have GTK3 installed. Disable the support for GTK3 for now, as it only affects the dialogs in the options menu and it does not cause any major changes, but also requires a lot of additional dependencies. * Add another option, XENGINES, that also enables experimental engines. * Bump PORTREVISION to force a rebuild due changed dependencies. PR: 255217 Reported by: Gian-Simon Purkert --- games/scummvm/Makefile | 13 ++++++++++++- games/scummvm/pkg-plist | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index a18e82ae9d99..7f39c4395b6d 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -2,6 +2,7 @@ PORTNAME= scummvm PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= games emulators MASTER_SITES= https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/ @@ -24,6 +25,7 @@ INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-alsa \ --disable-debug \ + --disable-gtk \ --disable-nasm \ --disable-tremor \ --enable-verbose-build \ @@ -33,12 +35,14 @@ CONFIGURE_ARGS= --disable-alsa \ LDFLAGS+= -lpthread -OPTIONS_DEFINE= A52 CURL DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS +OPTIONS_DEFINE= A52 CURL DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO TTS VORBIS XENGINES OPTIONS_DEFAULT= A52 MP3 MT32EMU PNG VORBIS OPTIONS_SUB= yes CURL_DESC= Enable ScummVM cloud storage backend MT32EMU_DESC= MT-32 emulator +TTS_DESC= Text-to-Speech support +XENGINES_DESC= Experimental/Unstable engine support A52_LIB_DEPENDS= liba52.so:audio/liba52 A52_CONFIGURE_ON= --with-a52-prefix=${LOCALBASE} @@ -77,6 +81,13 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ON= --with-sndio-prefix=${LOCALBASE} SNDIO_CONFIGURE_OFF= --disable-sndio +TTS_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher +TTS_CONFIGURE_ON= --enable-tts +TTS_CONFIGURE_OFF= --disable-tts + +XENGINES_CONFIGURE_ON= --enable-all-engines +XENGINES_CONFIGURE_OFF= --disable-all-unstable-engines + .include .if ${ARCH} == armv6 || ${ARCH} == armv7 diff --git a/games/scummvm/pkg-plist b/games/scummvm/pkg-plist index a4a7016728bc..b64a3ebb8dbd 100644 --- a/games/scummvm/pkg-plist +++ b/games/scummvm/pkg-plist @@ -15,12 +15,14 @@ share/man/man6/scummvm.6.gz share/metainfo/scummvm.appdata.xml share/pixmaps/scummvm.xpm %%DATADIR%%/access.dat +%%XENGINES%%%%DATADIR%%/cryo.dat %%DATADIR%%/cryomni3d.dat %%DATADIR%%/drascula.dat %%DATADIR%%/fonts.dat %%DATADIR%%/hugo.dat %%DATADIR%%/kyra.dat %%DATADIR%%/lure.dat +%%XENGINES%%%%DATADIR%%/macventure.dat %%DATADIR%%/mort.dat %%DATADIR%%/neverhood.dat %%DATADIR%%/pred.dic