From owner-dev-commits-ports-all@freebsd.org Tue Apr 13 11:23:50 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 AD72D5DC62A; Tue, 13 Apr 2021 11:23:50 +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 4FKNXQ4WrLz4bBS; Tue, 13 Apr 2021 11:23:50 +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 8E2141AED; Tue, 13 Apr 2021 11:23:50 +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 13DBNoCp072406; Tue, 13 Apr 2021 11:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13DBNosA072405; Tue, 13 Apr 2021 11:23:50 GMT (envelope-from git) Date: Tue, 13 Apr 2021 11:23:50 GMT Message-Id: <202104131123.13DBNosA072405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 91f15977cec6 - main - games/exult: fixup after aae00cbee1cef8d51abff5de932f7cf64c62dc87 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91f15977cec6282962f2fd6599799b16949e8c21 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 11:23:50 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=91f15977cec6282962f2fd6599799b16949e8c21 commit 91f15977cec6282962f2fd6599799b16949e8c21 Author: Fernando Apesteguía AuthorDate: 2021-04-13 11:15:11 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-13 11:19:35 +0000 games/exult: fixup after aae00cbee1cef8d51abff5de932f7cf64c62dc87 Apparently, I did not pick up the very last patch in the PR. This additional commit adds the remaining bits discussed in the PR: * Convert to DISTVERSION * Use c++17 * Add missing glib dependency * Make ALSA optional * Reorder some variables PR: 254801 Reported by: gspurki@gmail.com --- games/exult/Makefile | 61 +++++++++++++++++++++++++++++++-------------------- games/exult/distinfo | 6 ++--- games/exult/pkg-descr | 13 +++++++---- games/exult/pkg-plist | 32 +++++++++++++++------------ 4 files changed, 67 insertions(+), 45 deletions(-) diff --git a/games/exult/Makefile b/games/exult/Makefile index 29b4f1333a42..5124e4159b44 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -1,52 +1,65 @@ # Created by: Igor Pokrovsky PORTNAME= exult -PORTVERSION= 1.7.0.20210405 +DISTVERSIONPREFIX= v +DISTVERSION= 1.7.0.20210410 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= ports@FreeBSD.org -COMMENT= Ultima VII engine +COMMENT= Engine for Ultima VII (BG, FOV, SI, SS) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libvorbis.so:audio/libvorbis \ - libpng.so:graphics/png \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ libogg.so:audio/libogg \ - libfreetype.so:print/freetype2 + libpng.so:graphics/png \ + libvorbis.so:audio/libvorbis -USES= autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig \ - xorg sdl +USES= autoreconf compiler:c++17-lang gmake libtool localbase \ + pkgconfig sdl xorg USE_GITHUB= yes -GH_TAGNAME= 6150ae4 +GH_TAGNAME= snapshot-${DISTVERSIONPREFIX}${DISTVERSION} +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 +USE_SDL= mixer2 sdl2 +USE_XORG= xext x11 -USE_CXXSTD= c++17 -USE_XORG= x11 xext -USE_SDL= mixer2 -USE_GNOME= gtk30 cairo gdkpixbuf2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-alsa --with-sdl=sdl2 \ + +CONFIGURE_ARGS= --disable-static \ + --enable-shared \ --with-icondir=${PREFIX}/share/pixmaps + SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS FLUIDSYNTH GIMP STUDIO THUMBNAILER +OPTIONS_DEFINE= ALSA DOCS DEBUG FLUIDSYNTH GIMP STUDIO THUMBNAILER OPTIONS_DEFAULT= STUDIO OPTIONS_SUB= yes -FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -FLUIDSYNTH_CONFIGURE_ENABLE= fluidsynth GIMP_DESC= GIMP plugin support -GIMP_LIB_DEPENDS= libgimp-2.0.so:graphics/gimp-app -GIMP_CONFIGURE_ENABLE= gimp-plugin - STUDIO_DESC= Install Exult Studio -STUDIO_CONFIGURE_ENABLE= exult-studio exult-studio-support -STUDIO_USES= gnome -STUDIO_USE= gnome=libglade2 THUMBNAILER_DESC= Gnome SHP thumbnailer support -THUMBNAILER_USES= gnome shared-mime-info -THUMBNAILER_USE= gnome=libgnomeui + +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_CONFIGURE_ENABLE= alsa + +DEBUG_CONFIGURE_OFF= --with-debug=no +DEBUG_CONFIGURE_ON= --with-debug=full --with-optimization=none + +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth +FLUIDSYNTH_CONFIGURE_ENABLE= fluidsynth + +GIMP_LIB_DEPENDS= libgimp-2.0.so:graphics/gimp-app +GIMP_CONFIGURE_ENABLE= gimp-plugin + +STUDIO_CONFIGURE_ENABLE= exult-studio exult-studio-support +STUDIO_USES= gnome +STUDIO_USE= gnome=libglade2 + +THUMBNAILER_USES= gnome shared-mime-info +THUMBNAILER_USE= gnome=libgnomeui THUMBNAILER_CONFIGURE_ENABLE= gnome-shp-thumbnailer post-install-DOCS-on: diff --git a/games/exult/distinfo b/games/exult/distinfo index ee5a52407a5e..d190b1fbd8bb 100644 --- a/games/exult/distinfo +++ b/games/exult/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617640860 -SHA256 (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) = d124a8bc548d62dfbe034496d186b87aea4f29063febe28d92d7cf7be7148bd4 -SIZE (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) = 18460223 +TIMESTAMP = 1618045616 +SHA256 (exult-exult-v1.7.0.20210410-snapshot-v1.7.0.20210410_GH0.tar.gz) = ecbb5d40d374bec02d1c2d1b7c678519d8307d0ee9d0b000442ba6394fba84b2 +SIZE (exult-exult-v1.7.0.20210410-snapshot-v1.7.0.20210410_GH0.tar.gz) = 18460612 diff --git a/games/exult/pkg-descr b/games/exult/pkg-descr index 13374afc307b..636aec50a461 100644 --- a/games/exult/pkg-descr +++ b/games/exult/pkg-descr @@ -1,6 +1,11 @@ -Exult is an engine built for running Ultima VII usecode. With Exult -you can play both "The Black Gate" and "Serpent Isle" parts of the game. -However, the original ORIGIN's Ultima VII data is required as Exult is -just the engine. Refer to README file for details. +Exult is an open source engine for playing Ultima VII on a variety of +modern operating systems and environments. The Black Gate (including +Forge of Virtue) and Serpent Isle (plus Silver Seed) are both playable +to the end. Some differences to the original games exist; see sections +5. of the FAQ. + +While it is possible to use the engine for other games, no such game has +been written yet. Therefore, Exult is useless unless you own a copy of one +of the Ultima VIIs. WWW: http://exult.info diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist index 5cecac851f81..ae81cbb15567 100644 --- a/games/exult/pkg-plist +++ b/games/exult/pkg-plist @@ -1,7 +1,8 @@ bin/cmanip bin/expack bin/exult -bin/exult_studio +%%STUDIO%%bin/exult_studio +%%THUMBNAILER%%bin/gnome_shp_thumbnailer bin/ipack bin/mklink bin/rip @@ -19,6 +20,7 @@ man/man1/splitshp.1.gz man/man1/textpack.1.gz man/man1/ucc.1.gz man/man6/exult.6.gz +%%GIMP%%libexec/gimp/2.2/plug-ins/u7shp share/applications/exult.desktop %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/NEWS @@ -46,22 +48,22 @@ share/applications/exult.desktop %%PORTDOCS%%%%DOCSDIR%%/images/studio10.png %%PORTDOCS%%%%DOCSDIR%%/images/studiobgiregs.png %%PORTDOCS%%%%DOCSDIR%%/images/studiosiiregs.png -%%DATADIR%%/estudio/new/avatar_data.txt -%%DATADIR%%/estudio/new/blends.dat -%%DATADIR%%/estudio/new/combos.flx -%%DATADIR%%/estudio/new/faces.vga -%%DATADIR%%/estudio/new/fonts.vga -%%DATADIR%%/estudio/new/gumps.vga -%%DATADIR%%/estudio/new/palettes.flx -%%DATADIR%%/estudio/new/paperdol.vga -%%DATADIR%%/estudio/new/pointers.shp -%%DATADIR%%/estudio/new/shapes.vga -%%DATADIR%%/estudio/new/sprites.vga -%%DATADIR%%/estudio/new/text.flx +%%STUDIO%%%%DATADIR%%/estudio/new/avatar_data.txt +%%STUDIO%%%%DATADIR%%/estudio/new/blends.dat +%%STUDIO%%%%DATADIR%%/estudio/new/combos.flx +%%STUDIO%%%%DATADIR%%/estudio/new/faces.vga +%%STUDIO%%%%DATADIR%%/estudio/new/fonts.vga +%%STUDIO%%%%DATADIR%%/estudio/new/gumps.vga +%%STUDIO%%%%DATADIR%%/estudio/new/palettes.flx +%%STUDIO%%%%DATADIR%%/estudio/new/paperdol.vga +%%STUDIO%%%%DATADIR%%/estudio/new/pointers.shp +%%STUDIO%%%%DATADIR%%/estudio/new/shapes.vga +%%STUDIO%%%%DATADIR%%/estudio/new/sprites.vga +%%STUDIO%%%%DATADIR%%/estudio/new/text.flx %%DATADIR%%/exult.flx %%DATADIR%%/exult_bg.flx %%DATADIR%%/exult_si.flx -%%DATADIR%%/exult_studio.glade +%%STUDIO%%%%DATADIR%%/exult_studio.glade %%DATADIR%%/exultmsg.txt %%DATADIR%%/midisfx.flx %%DATADIR%%/u7bgintrinsics.data @@ -69,4 +71,6 @@ share/applications/exult.desktop %%DATADIR%%/u7opcodes.data %%DATADIR%%/u7sibetaintrinsics.data %%DATADIR%%/u7siintrinsics.data +%%THUMBNAILER%%share/mime/packages/x-shapefile.xml +%%THUMBNAILER%%share/thumbnailers/gnome_u7shapes.thumbnailer share/pixmaps/exult.png