From nobody Thu Jan 13 15:32:10 2022 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 61496194C317; Thu, 13 Jan 2022 15:32:10 +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 4JZT222FY1z3MsM; Thu, 13 Jan 2022 15:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642087930; 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=t57i3g2OdvKSQRzv1H+ibJKjzeqvyfhZHQ9UN+GQPCk=; b=KQ0PXTMXlilGTx1KUo7RMXPR52NjWNl/WKXWK6qELpJTaVnAq3TAAUJULKaKxi4OrAbS8a WlTq14cyQ3Y+cH+nLbN05lU4vbhoJGhl59HVmdEMq79NVMP9hkSRVRBnoFloEYWNgiiW2I FDLpm1ABDqsriZAgDCwZSTUN8by8KUime8DJ8V/2RPLr8ie4Oa4VdniJoxFZcsuD50QhYU NrKIerLBFg34dtZRCKwNwbNd51raS0LMAIRm2rqzolg48D+BGyQkh2WUqIUaOyzqtEmlS6 P3gKpQPXAlYcHIAbFw652lGsHNK/eFy01b940toKvEhBYVUPveK+ifgeHVcMyQ== 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 2DB7722B6E; Thu, 13 Jan 2022 15:32:10 +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 20DFWAGS061976; Thu, 13 Jan 2022 15:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20DFWALL061975; Thu, 13 Jan 2022 15:32:10 GMT (envelope-from git) Date: Thu, 13 Jan 2022 15:32:10 GMT Message-Id: <202201131532.20DFWALL061975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 484170b79708 - main - games/vvvvvv: update to 2.3.6 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 484170b797087d53205f432c055fc1790ad53bf3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642087930; 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=t57i3g2OdvKSQRzv1H+ibJKjzeqvyfhZHQ9UN+GQPCk=; b=wYuf6jKYwRKQ1AEibQ+IpRgB5sgp6ZQ0lOQN448MlbUq/NnyXs9e0Y7nGc41Bt3S4dL/MX YKTBeG+BTdr1YmR2pNc8YgKZlxgsQC6y4/kA9lty6LZfcZOnL1LAyVErG158JJgLq8sI/3 OUUjtiFD86NG2cHlFjLynjmIvG28JKpgLtAop/NjBRk82+aLCx+1NGiZzbhR+EsUw0GSis BBDwVkNwtQsosWNth3kd0F4mJWupxksyystHeRoUsOilJavW4CCz87+REnJMh1xEFP78zk 7oSjV63o1pQ/SV1cmsAhNHCIpkawUwXqNSQc4IxJCyuFBD4pvaI/DVv3zI3xSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642087930; a=rsa-sha256; cv=none; b=ZOLzjG/etHdKcnv0AbAe41izU843CJoLy3mbH3PVNsrAvhM/frG6bCJMq1B1r6IiFQEsTH ZPN34ur2JLxMWK4cxTNN67UC1a5GKHr4zvlUygk62QYmXIHEhA7g9g15tEZEsnS63HvBYc 3d39OFKRNTGTd/LiwK5uI1K2NqI1FUkazgU/OwNZGODECw/pHb+v622242XebZmSlJUX6N 14uTGKKjERSw8wcifFsG4FlihQLpfEY7apqOchzpPKqZ9WT3FFElnSyBkqJN5R3mPQK5S1 J+FqfOKGliHrk/LG6W0vZ6AGi1eXBbfS/KNKWhNMW3Huzs48rV7CbStLy/Dx/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=484170b797087d53205f432c055fc1790ad53bf3 commit 484170b797087d53205f432c055fc1790ad53bf3 Author: Robert Clausecker AuthorDate: 2021-12-28 10:15:39 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-13 15:31:41 +0000 games/vvvvvv: update to 2.3.6 The game now comes in two flavours: The commercial flavour is the regular game and requires the user to supply his or her own copy of the data.zip file. The makeandplay flavour is a free version of the game which doesn't have come with the original levels, but ships player levels and allows you to build your own. PR: 260749 --- games/vvvvvv/Makefile | 52 ++++++++++++++++++------ games/vvvvvv/distinfo | 8 ++-- games/vvvvvv/files/patch-CMakeLists.txt | 11 +++++ games/vvvvvv/files/patch-src_FileSystemUtils.cpp | 40 ++++++++++++------ games/vvvvvv/files/patch-src_main.cpp | 11 +++++ games/vvvvvv/files/pkg-message.in | 12 ++++++ games/vvvvvv/pkg-descr | 9 +++- games/vvvvvv/pkg-message | 9 ---- 8 files changed, 112 insertions(+), 40 deletions(-) diff --git a/games/vvvvvv/Makefile b/games/vvvvvv/Makefile index 3b6730410585..d9fb4e25c4b3 100644 --- a/games/vvvvvv/Makefile +++ b/games/vvvvvv/Makefile @@ -1,33 +1,59 @@ # Created by: Emmanuel Vadot PORTNAME= VVVVVV -PORTVERSION= v2.2 +DISTVERSION= 2.3.6 CATEGORIES= games +.if ${FLAVOR:U} == makeandplay +# The data file may only be distributed if the MAKEANDPLAY define is set. +# See https://github.com/TerryCavanagh/VVVVVV/blob/master/License%20exceptions.md +MASTER_SITES= https://thelettervsixtim.es/makeandplay/data.zip?dummy=/:datafile +DISTFILES= VVVVVV-data-${DISTVERSION}.zip:datafile +EXTRACT_ONLY= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSION}_GH0.tar.gz +.endif MAINTAINER= manu@FreeBSD.org COMMENT= 2D Platformer game -LICENSE= UNKNOWN -LICENSE_NAME= unknown -LICENSE_FILE= ${WRKSRC}/../LICENSE.md -LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept +LICENSE= VVVVVV BSD3CLAUSE +LICENSE_COMB= multi +LICENSE_NAME_VVVVVV= VVVVVV Source Code License v1.0 +LICENSE_FILE_VVVVVV= ${WRKSRC}/../LICENSE.md +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/../third_party/lodepng/LICENSE.txt +LICENSE_PERMS_VVVVVV= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept -ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le +.if defined(NO_LICENSES_INSTALL) +IGNORE= license requires that the license be shipped +.endif + +BUILD_DEPENDS= utf8cpp>0:devel/utf8cpp +LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 \ + libphysfs.so:devel/physfs + +FLAVORS= commercial makeandplay +makeandplay_PKGNAMESUFFIX= -makeandplay USES= sdl cmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= TerryCavanagh GH_PROJECT= ${PORTNAME} -GH_TAGNAME= cb3640e5 - -WRKSRC_SUBDIR= desktop_version - USE_SDL= sdl2 mixer2 -PLIST_FILES= bin/vvvvvv +CFLAGS+= -DASSETSPATH='\"${DATADIR}/data.zip\"' +CMAKE_OFF= BUNDLE_DEPENDENCIES +.if ${FLAVOR:U} == makeandplay +CMAKE_ON= MAKEANDPLAY +.endif + +WRKSRC_SUBDIR= desktop_version +PLIST_FILES= bin/VVVVVV${PKGNAMESUFFIX} \ + ${"${FLAVOR}"=="makeandplay:?${DATADIR_REL}/data.zip:} +SUB_FILES= pkg-message do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/.build/vvvvvv.x86_64 ${STAGEDIR}${PREFIX}/bin/vvvvvv - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vvvvvv + ${INSTALL_PROGRAM} ${WRKDIR}/.build/VVVVVV ${STAGEDIR}${PREFIX}/bin/VVVVVV${PKGNAMESUFFIX} +.if ${FLAVOR:U} == makeandplay + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${DISTDIR}/VVVVVV-data-${DISTVERSION}.zip ${STAGEDIR}${DATADIR}/data.zip +.endif .include diff --git a/games/vvvvvv/distinfo b/games/vvvvvv/distinfo index 2d11675cb41a..cbd7b9ea84fb 100644 --- a/games/vvvvvv/distinfo +++ b/games/vvvvvv/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1578694479 -SHA256 (TerryCavanagh-VVVVVV-v2.2-cb3640e5_GH0.tar.gz) = d936ad517ef9b8236148cd8161201d23f55b98dc6a03f3b2763612abb11a1615 -SIZE (TerryCavanagh-VVVVVV-v2.2-cb3640e5_GH0.tar.gz) = 827825 +TIMESTAMP = 1640682897 +SHA256 (VVVVVV-data-2.3.6.zip) = 6fae3cdec06062d05827d4181c438153f3ea3900437a44db73bcd29799fe57e0 +SIZE (VVVVVV-data-2.3.6.zip) = 61404595 +SHA256 (TerryCavanagh-VVVVVV-2.3.6_GH0.tar.gz) = a3366aab9e8462d330044ab1ec63927e9f5c3801c0ed96b24f08c553dcb911e9 +SIZE (TerryCavanagh-VVVVVV-2.3.6_GH0.tar.gz) = 1725842 diff --git a/games/vvvvvv/files/patch-CMakeLists.txt b/games/vvvvvv/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0927b9a29e55 --- /dev/null +++ b/games/vvvvvv/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2021-12-22 13:20:25 UTC ++++ CMakeLists.txt +@@ -181,7 +181,7 @@ if(APPLE) + endif() + set(PNG_SRC ../third_party/lodepng/lodepng.c) + +-if(NOT OFFICIAL_BUILD) ++if(FALSE) + # Add interim commit hash and its date to the build + + # find_package sets GIT_FOUND and GIT_EXECUTABLE diff --git a/games/vvvvvv/files/patch-src_FileSystemUtils.cpp b/games/vvvvvv/files/patch-src_FileSystemUtils.cpp index 5bb4437be5bc..a93f7e9e794d 100644 --- a/games/vvvvvv/files/patch-src_FileSystemUtils.cpp +++ b/games/vvvvvv/files/patch-src_FileSystemUtils.cpp @@ -1,15 +1,29 @@ ---- src/FileSystemUtils.cpp.orig 2020-01-10 22:11:00 UTC +--- src/FileSystemUtils.cpp.orig 2021-12-22 13:20:25 UTC +++ src/FileSystemUtils.cpp -@@ -73,6 +73,12 @@ int FILESYSTEM_init(char *argvZero) - #ifdef _WIN32 - strcpy(output, PHYSFS_getBaseDir()); - strcat(output, "data.zip"); -+#elif defined(__FreeBSD__) -+ PLATFORM_getOSDirectory(output); -+ if (strlcat(output, "data.zip", sizeof(output)) >= sizeof(output)) { -+ puts("Cannot find location for data.zip\n"); -+ return 0; +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +@@ -154,6 +155,12 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, cha + } + + /* Mount the stock content last */ ++ if (assetsPath && access(assetsPath, R_OK) == -1) { ++ printf("%s: %s\n", assetsPath, strerror(errno)); ++ printf("Trying %sdata.zip instead.\n", output); ++ assetsPath = NULL; + } - #else - strcpy(output, "data.zip"); - #endif ++ + if (assetsPath) + { + SDL_strlcpy(output, assetsPath, sizeof(output)); +@@ -161,7 +168,7 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, cha + else + { + SDL_snprintf(output, sizeof(output), "%s%s", +- basePath, ++ output, + "data.zip" + ); + } diff --git a/games/vvvvvv/files/patch-src_main.cpp b/games/vvvvvv/files/patch-src_main.cpp new file mode 100644 index 000000000000..437afa0e181f --- /dev/null +++ b/games/vvvvvv/files/patch-src_main.cpp @@ -0,0 +1,11 @@ +--- src/main.cpp.orig 2021-12-28 09:43:31 UTC ++++ src/main.cpp +@@ -342,7 +342,7 @@ static void cleanup(void); + int main(int argc, char *argv[]) + { + char* baseDir = NULL; +- char* assetsPath = NULL; ++ char* assetsPath = (char*)ASSETSPATH; + + for (int i = 1; i < argc; ++i) + { diff --git a/games/vvvvvv/files/pkg-message.in b/games/vvvvvv/files/pkg-message.in new file mode 100644 index 000000000000..27aa099f8126 --- /dev/null +++ b/games/vvvvvv/files/pkg-message.in @@ -0,0 +1,12 @@ +[ +{ type: install + message: <