From nobody Tue Feb 20 20:56:31 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TfWsq3Q0Qz59b8J; Tue, 20 Feb 2024 20:56:31 +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 4TfWsq2wFpz4lkH; Tue, 20 Feb 2024 20:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708462591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJKkN+zdBZ0/pyxO+5e3TFjwukO61KS8hN8qEpVC5vU=; b=msUs9zQvl+5bUHX8QvZQ1u4mryzaknpEOGB/RdWBm3KpZwEQWnCwX19c0hTPHEBELDSsFC +d17f8757ovy+2tKY8beGAHgBWYDSDzzq6ehCkkyTLTox4NSiKy9P30RBdxWWqUPyT6D26 Wfce2znu0/PWar5LoqPeUsPfHiskFOP9rjX6NiF1b643H1Gg1uA4vBKgPlgNSs8VMg6r9z Q7AOldJNh44aQAmEUtlrD3cmZVIuegnmU6rLBMJh9JnNGq5ErcseEs0/uqH3wmbkSR+f1b PIAFBygwpdJtO9uFe5NijUXX/LaZYQZ5Y5ysc2xUN/jBhXxmJX9baIwPVKn7Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708462591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJKkN+zdBZ0/pyxO+5e3TFjwukO61KS8hN8qEpVC5vU=; b=xWO4lUcD4OPlAlnoLyvJop3CO1Vl903bcYLRJWicXKiYcXRsYRBlk7/PoamfIWJAxoKcgR GsFjKg/6NqFOdLAfIq9yqV5fT7gVR9pYaz72M+0Pbx/mMOg0x9PIy9v+gnva96D7neGUr+ r0mWHeFm2HoVQDfkWcBm1Uoqyzg5LqfJaclV9OVFAOirdt1PGQfqDOAbvtY3GcwWEW9gcA 3GUE1FSTWcyU4sB8iTgNQZrSr4QRRFRpLlFafKptyIMpMfyIZ0mqiSTuUp/VZqHokhr5bo ZQTIK7IuQf7WcrkpR3C9H6BU28TAViw4UZMlZlZstv/LBZA9ZyzlVeCwGc9Zyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708462591; a=rsa-sha256; cv=none; b=CmiaWgRZxx7+kKYksOrTPkt6wK2Mgx28+ua48xv4JCL765Sq+DRH0EWSitTCrwlIaVTMo7 OJ6a/R1NP74yFJbhIi+0yrn06M73Dh42kgQEA1Ey7QBtwD6bc+2E61ZoGwNzxvgMFISkac xe1oCoqMz9sFoC8ekcjLR8uh6hjAFOC5/edTTG/ar9Tx0taCHZm95kbRf8mmO3c1qDaRmE LCBkMei+nzPDJsQ6bvLcFAhGvj3M/GF27EOJ3AteKstlxDywg0Bdk3CIGYFK1ZJcx0u0XR tm/ERgrVQnSOb3dcd/EFXOz3o64lNHERE9KUnoMsALG7QuKwzEnPXkRqpHF6wQ== 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 4TfWsq1w1lzZF9; Tue, 20 Feb 2024 20:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KKuVIl044360; Tue, 20 Feb 2024 20:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KKuVP7044357; Tue, 20 Feb 2024 20:56:31 GMT (envelope-from git) Date: Tue, 20 Feb 2024 20:56:31 GMT Message-Id: <202402202056.41KKuVP7044357@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: cfbb908ce243 - main - games/gemrb: fix crash and improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfbb908ce243d1bd9e2aedea968e330a214b1d21 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfbb908ce243d1bd9e2aedea968e330a214b1d21 commit cfbb908ce243d1bd9e2aedea968e330a214b1d21 Author: bsdcode AuthorDate: 2024-02-20 11:54:28 +0000 Commit: Piotr Kubaj CommitDate: 2024-02-20 20:56:07 +0000 games/gemrb: fix crash and improve port - use GCC (https://github.com/gemrb/gemrb/issues/1786) - add optional OpenGL and SDL2_mixer support - add disabled pixelscaling to screensize option - change GemRB.cfg into a proper conffile (remove from pkg-plist and annotate GemRB.cfg.sample with @sample) - fix and modernize pkg-message - use distfiles form GitHub instead of SourceForge - make PNG, OGG, TTF and OpenAL support optional - make optional demo assets also optional in the port - use compiler:c++11-lang - remove gnome and localbase uses - remove DOC_DIR and MAN_DIR from CMAKE_ARGS - set CMake options explicitly - use CMake options helpers for boolean options - organize options into AUDIO, RESOURCE and VIDEO groups git rm games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt git add games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt --- games/gemrb/Makefile | 91 +++++++++++++++++----- games/gemrb/distinfo | 8 +- ...patch-gemrb_plugins_TTFImporter_CMakeLists.txt} | 0 games/gemrb/files/pkg-message.in | 24 ++++-- games/gemrb/pkg-plist | 16 ++-- 5 files changed, 100 insertions(+), 39 deletions(-) diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile index 14d06b5e9359..e78c7b2ec233 100644 --- a/games/gemrb/Makefile +++ b/games/gemrb/Makefile @@ -1,8 +1,8 @@ -PORTNAME= gemrb -PORTVERSION= 0.9.2 -CATEGORIES= games emulators -MASTER_SITES= SF/${PORTNAME}/Releases/${PORTVERSION} -DISTNAME= ${PORTNAME}-${PORTVERSION}-sources +PORTNAME= gemrb +DISTVERSIONPREFIX= v +DISTVERSION= 0.9.2 +PORTREVISION= 1 +CATEGORIES= games emulators MAINTAINER= pkubaj@FreeBSD.org COMMENT= GemRB (Game engine made with preRendered Background) @@ -11,27 +11,76 @@ WWW= https://www.gemrb.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png \ - libvorbis.so:audio/libvorbis \ - libfreetype.so:print/freetype2 - -USES= cmake compiler:c11 gnome iconv localbase openal:al,alut \ - python sdl shebangfix +USES= cmake compiler:c++11-lang iconv python sdl shebangfix SHEBANG_FILES= admin/extend2da.py -USE_SDL= sdl2 +USE_GCC= yes # https://github.com/gemrb/gemrb/issues/1786 +USE_GITHUB= yes USE_LDCONFIG= yes +USE_SDL= sdl2 + +CMAKE_ARGS= -DCMAKE_BUILD_TYPE=Release \ + -DHAVE_LDEXPF=1 \ + -DLAYOUT=fhs \ + -DPYTHON_VERSION=Auto \ + -DSANITIZE=None \ + -DSDL_BACKEND=SDL2 +CMAKE_OFF= DISABLE_WERROR \ + INSOURCEBUILD \ + STATIC_LINK \ + USE_LIBVLC \ + USE_SDL_CONTROLLER_API + +SUB_FILES= pkg-message + +OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT= DEMO FREETYPE OPENAL OPENGL PNG SDLMIXER VORBIS + +OPTIONS_GROUP= AUDIO RESOURCE VIDEO +OPTIONS_GROUP_AUDIO= OPENAL SDLMIXER +OPTIONS_GROUP_RESOURCE= DEMO FREETYPE PNG VORBIS +OPTIONS_GROUP_VIDEO= OPENGL RESIND + +OPTIONS_SUB= yes -OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes +DEMO_DESC= Optional demo assets +DEMO_GH_ACCOUNT= gemrb:demo +DEMO_GH_PROJECT= gemrb-assets:demo +DEMO_GH_TAGNAME= 5b5dcde:demo -CMAKE_ARGS= -DDOC_DIR="${DOCSDIR}" \ - -DMAN_DIR="${PREFIX}/share/man/man6/" \ - -DSDL_BACKEND=SDL2 \ - -DUSE_OPENAL=ON \ - -DUSE_LIBVLC=OFF \ - -DHAVE_LDEXPF=1 +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt +FREETYPE_CMAKE_BOOL= USE_FREETYPE + +OPENAL_USES= openal:al,alut +OPENAL_CMAKE_BOOL= USE_OPENAL + +OPENGL_USES= gl +OPENGL_USE= gl=egl +OPENGL_CMAKE_ON= -DOPENGL_BACKEND=OpenGL +OPENGL_CMAKE_OFF= -DOPENGL_BACKEND=None + +PNG_LIB_DEPENDS= libpng.so:graphics/png +PNG_CMAKE_BOOL= USE_PNG + +RESIND_DESC= Scale to screensize with pixelscaling +RESIND_CMAKE_BOOL= SDL_RESOLUTION_INDEPENDANCE + +SDLMIXER_DESC= Audio support via SDL_mixer +SDLMIXER_USE= sdl=mixer2 +SDLMIXER_CMAKE_BOOL= USE_SDLMIXER + +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis +VORBIS_CMAKE_BOOL= USE_VORBIS PLIST_SUB= PORTVERSION=${PORTVERSION} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +post-extract-DEMO-on: + ${MKDIR} ${WRKSRC}/demo/music/mx0100 + ${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/whispers-seamless.ogg ${WRKSRC}/demo/music/mx0100/mx0100a.ogg + ${MKDIR} ${WRKSRC}/demo/music/theme + ${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/themea.ogg ${WRKSRC}/demo/music/theme + +post-install: + ${RM} ${STAGEDIR}${ETCDIR}/GemRB.cfg .include diff --git a/games/gemrb/distinfo b/games/gemrb/distinfo index 0ae3e5741971..a80d2e1ab4dc 100644 --- a/games/gemrb/distinfo +++ b/games/gemrb/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1705483350 -SHA256 (gemrb-0.9.2-sources.tar.gz) = 5206d7e3fee45d21030caac92bc799b12ec011f90e59d7408c4b0eb4a8330d40 -SIZE (gemrb-0.9.2-sources.tar.gz) = 16123769 +TIMESTAMP = 1708291230 +SHA256 (gemrb-gemrb-v0.9.2_GH0.tar.gz) = ea614c067483606dab680ab18cd50527f56803bd46e0888e3c786eec05d3bb7d +SIZE (gemrb-gemrb-v0.9.2_GH0.tar.gz) = 14327547 +SHA256 (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 3e180e3ae063651bfabaab5795a946183212fd451986e3f4cac9203278283d23 +SIZE (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 11161448 diff --git a/games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt b/games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt similarity index 100% rename from games/gemrb/files/patch-gemrb_plugins_TTFImporter_CMakeLists.txt rename to games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt diff --git a/games/gemrb/files/pkg-message.in b/games/gemrb/files/pkg-message.in index c58d42d857b1..26668d0faccb 100644 --- a/games/gemrb/files/pkg-message.in +++ b/games/gemrb/files/pkg-message.in @@ -1,14 +1,24 @@ [ { type: install message: <