From nobody Fri Jun 23 21:00:50 2023 X-Original-To: dev-commits-ports-main@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 4QnqQV29rwz4gPmK; Fri, 23 Jun 2023 21:00: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 4QnqQV1dSdz44nJ; Fri, 23 Jun 2023 21:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687554050; 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=K2K4YnoObifKREfj37uilvSJLIWryFIamBYcoK5g7Mw=; b=Jt1cp9WT7txderZhiBYT5dRs93buc9OX/0j13T8aKcZUheyeYmqaYVUo+ebFDmtGzbMDdT L669hShyvLLEbfTKt2ksQCNiW/5QgZlnJTL+lzQ1K5L43anXvoTZQu9mDvPJHHgtNP02FM WcmX1Pj6bX0Hr1z6kgktiBnbq/CQs0UYg8eu2fL+/WjZNNpq4b2YcZqv5hrZ8E4qBq2ByR 3Awyv7Imwitok2JHTb/dDa8+lXS9WAabmIIKUOZAzyBVwwCVgBbI5oOqjFcQAgBlJWmSU8 437OhaTnQ8EmgkkgydjSfSpE4SoQ5MNhrkJdYl3sijpCk2lFnps/Zw8u4frXZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687554050; 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=K2K4YnoObifKREfj37uilvSJLIWryFIamBYcoK5g7Mw=; b=mhp092wDPEppY8eWUoWfVXBf10CmJFFuq3wb8U8jKT7TpuUmR/V49tA7s8p5dx5pU0cW+4 ZPi07vTn5n1nRJ6Bl3ViJXjVJC6fQ6Fe+imbGf9iB9/jayV1wI+GOQWbwRHdhEmcot734j RAyeRvYF6FT2cUj6t3IZJjH4w1/uvZpxJbbkWTFdBJzMkPoQz9i9vynPV5+PJeLEkP/kNh rkDtcZKAGs2XMLYQJ/H290MbzqMWE6qg3aqEMVcc3h8iPOr/AmI2cMJUlTnxESU/TVKTdB JkEuJn/ssXJPJjd0DdW9gY2r2DLr/tpeoPOeVe0/f6v90dU2uLVKT2TDo98aPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687554050; a=rsa-sha256; cv=none; b=l0LhlN4uVagRoomTBwEleL5bk0YqU7A7nkSTGLPfsLr3RiSymy1fGE2kqCjgDVWbCI+as/ BUWOf1/vMMtuR1M5wvaes3ZEj8hGjqwHZ4KhSatF4RH1WksoaC+KW+u4okG4E2lqXpaP+/ ehIVgAL4tPHhyJ8yrA5WJP6aoItuh5baDi3VxDYHebTtVRezG9xQt223JD/106STgMBxAM imOyOiMEmX4Z77n84ysQ7ebm4RkBmbBc8aP19zXgNCnUQa0R9DoJ5rJ4CGkBhqfeo2JcOR 4KUDSdUlXd52cF2z/oO2mVcRVKgrPdCUUwmxbpu7E0Gc+c/aEuhd3bJlr3uaEw== 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 4QnqQV0lLmzJcF; Fri, 23 Jun 2023 21:00: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 35NL0oin024355; Fri, 23 Jun 2023 21:00:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NL0o80024354; Fri, 23 Jun 2023 21:00:50 GMT (envelope-from git) Date: Fri, 23 Jun 2023 21:00:50 GMT Message-Id: <202306232100.35NL0o80024354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 05203b94b144 - main - games/ags: Update to 3.6.0.49 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05203b94b144224c53d048556a9ba255f2fc20d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=05203b94b144224c53d048556a9ba255f2fc20d6 commit 05203b94b144224c53d048556a9ba255f2fc20d6 Author: Jason E. Hale AuthorDate: 2023-06-23 20:58:42 +0000 Commit: Jason E. Hale CommitDate: 2023-06-23 21:00:44 +0000 games/ags: Update to 3.6.0.49 Take maintainership. https://github.com/adventuregamestudio/ags/releases/tag/v3.6.0.49 --- games/ags/Makefile | 26 +++++----------- games/ags/distinfo | 6 ++-- games/ags/files/patch-Engine_Makefile-defs.linux | 36 ++++++++++++++-------- .../files/patch-Engine_platform_bsd_acplbsd.cpp | 11 +++++++ 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/games/ags/Makefile b/games/ags/Makefile index ddedf9a0c1fe..f0b37f66a9c9 100644 --- a/games/ags/Makefile +++ b/games/ags/Makefile @@ -1,38 +1,28 @@ PORTNAME= ags -DISTVERSION= 3.4.4.1 +DISTVERSION= 3.6.0.49 CATEGORIES= games -MASTER_SITES= https://github.com/adventuregamestudio/ags/releases/download/v.${DISTVERSION}/ -DISTNAME= ags_linux_v.${DISTVERSION} +MASTER_SITES= https://github.com/adventuregamestudio/ags/releases/download/v${PORTVERSION}/ +DISTNAME= ags_${DISTVERSION}_source -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Adventure Game Studio Engine WWW= https://www.adventuregamestudio.co.uk/ LICENSE= ART20 LICENSE_FILE= ${WRKSRC}/License.txt -BUILD_DEPENDS= ${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro -LIB_DEPENDS= liballeg.so:devel/allegro \ - libogg.so:audio/libogg \ +LIB_DEPENDS= libogg.so:audio/libogg \ libtheora.so:multimedia/libtheora \ - libvorbis.so:audio/libvorbis \ - libfreetype.so:print/freetype2 + libvorbis.so:audio/libvorbis -USES= compiler:c++11-lang gmake localbase pkgconfig tar:xz xorg -USE_XORG= x11 +USES= compiler:c++11-lang gmake localbase pkgconfig sdl tar:xz +USE_SDL= sdl2 sound2 MAKE_ARGS= V=1 BUILD_WRKSRC= ${WRKSRC}/Engine PLIST_FILES= bin/ags -post-patch: - @${REINPLACE_CMD} 's|||' \ - ${WRKSRC}/Common/core/endianness.h - @${REINPLACE_CMD} -e 's|return cd_player|return 0; // cd_player|g' \ - -e 's|cd_exit|//cd_exit|g' \ - ${WRKSRC}/Engine/platform/linux/acpllnx.cpp - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Engine/ags ${STAGEDIR}${PREFIX}/bin diff --git a/games/ags/distinfo b/games/ags/distinfo index 423c66de5cb0..f5d81da60e7e 100644 --- a/games/ags/distinfo +++ b/games/ags/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1569470667 -SHA256 (ags_linux_v.3.4.4.1.tar.xz) = 9492566ad4f0910cbe62b49ef20081ff8c47035552993c592465d395e49af060 -SIZE (ags_linux_v.3.4.4.1.tar.xz) = 930676 +TIMESTAMP = 1687373460 +SHA256 (ags_3.6.0.49_source.tar.xz) = c7a81cff1a63ec45062ab7281d0a9880962aa9aa2bec311b038079a03707a642 +SIZE (ags_3.6.0.49_source.tar.xz) = 6345140 diff --git a/games/ags/files/patch-Engine_Makefile-defs.linux b/games/ags/files/patch-Engine_Makefile-defs.linux index 441f5a06260d..1d367101d163 100644 --- a/games/ags/files/patch-Engine_Makefile-defs.linux +++ b/games/ags/files/patch-Engine_Makefile-defs.linux @@ -1,16 +1,28 @@ ---- Engine/Makefile-defs.linux.orig 2019-02-12 12:39:10 UTC +--- Engine/Makefile-defs.linux.orig 2023-06-04 18:08:48 UTC +++ Engine/Makefile-defs.linux -@@ -1,6 +1,6 @@ - INCDIR = ../Engine ../Common ../Common/libinclude ../Plugins +@@ -6,14 +6,14 @@ LIBDIR = + INCDIR = ../Engine ../Common ../Common/libinclude ../Common/libsrc/alfont-2.0.9 ../Engine/libsrc/apeg-1.2.1/ ../libsrc/mojoAL ../Plugins ../Engine/libsrc/glad/include ../libsrc/glm $(ALLEGRO_SRCDIR)/include LIBDIR = --CFLAGS := -O2 -g -fsigned-char -Wfatal-errors -DNDEBUG -DALLEGRO_NO_FIX_ALIASES -DAGS_RUNTIME_PATCH_ALLEGRO -DAGS_HAS_CD_AUDIO -DAGS_CASE_SENSITIVE_FILESYSTEM -DALLEGRO_STATICLINK -DLINUX_VERSION -DDISABLE_MPEG_AUDIO -DBUILTIN_PLUGINS -DRTLD_NEXT $(shell pkg-config --cflags freetype2) $(CFLAGS) -+CFLAGS := -O2 -fsigned-char -Wfatal-errors -DNDEBUG -DALLEGRO_NO_FIX_ALIASES -DAGS_RUNTIME_PATCH_ALLEGRO -DAGS_CASE_SENSITIVE_FILESYSTEM -DALLEGRO_STATICLINK -DLINUX_VERSION -DDISABLE_MPEG_AUDIO -DBUILTIN_PLUGINS -DRTLD_NEXT $(shell pkg-config --cflags freetype2) $(CFLAGS) - CXXFLAGS := -fno-rtti -Wno-write-strings $(CXXFLAGS) - LIBS := -rdynamic -laldmb -ldumb -Wl,-Bdynamic - LIBS += $(shell pkg-config --libs allegro) -@@ -44,4 +44,4 @@ platform/linux/acpllnx.cpp \ - platform/util/pe.c \ + +-CFLAGS := -O2 -g \ ++CFLAGS := \ + -fsigned-char -fno-strict-aliasing -fwrapv \ + -Wunused-result \ + -Wno-unused-value \ + -Werror=write-strings -Werror=format -Werror=format-security \ + -DNDEBUG \ + -DALLEGRO_STATICLINK \ +- -DLINUX_VERSION -DBUILTIN_PLUGINS -DHAVE_FSEEKO -DDISABLE_MPEG_AUDIO -DAGS_CASE_SENSITIVE_FILESYSTEM -DAGS_HAS_CD_AUDIO \ ++ -DLINUX_VERSION -DBUILTIN_PLUGINS -DHAVE_FSEEKO -DDISABLE_MPEG_AUDIO -DAGS_CASE_SENSITIVE_FILESYSTEM \ + -D_FILE_OFFSET_BITS=64 -DRTLD_NEXT \ + $(FT_CFLAGS) $(CFLAGS) + +@@ -58,7 +58,7 @@ BASE_PLATFORM = \ + endif + + BASE_PLATFORM = \ +-platform/linux/acpllnx.cpp \ ++platform/bsd/acplbsd.cpp \ platform/util/libc.c --CDA = libsrc/libcda-0.5/linux.c -+# CDA = libsrc/libcda-0.5/linux.c + CDA := libsrc/libcda-0.5/linux.c diff --git a/games/ags/files/patch-Engine_platform_bsd_acplbsd.cpp b/games/ags/files/patch-Engine_platform_bsd_acplbsd.cpp new file mode 100644 index 000000000000..ab6a4267c48d --- /dev/null +++ b/games/ags/files/patch-Engine_platform_bsd_acplbsd.cpp @@ -0,0 +1,11 @@ +--- Engine/platform/bsd/acplbsd.cpp.orig 2023-06-23 17:18:33 UTC ++++ Engine/platform/bsd/acplbsd.cpp +@@ -19,7 +19,7 @@ + // *************** FREEBSD DRIVER *************** + + #include "platform/base/agsplatformdriver.h" +-#include "platform/base/agsplatform_unix.h" ++#include "platform/base/agsplatform_xdg_unix.h" + + struct AGSFreeBSD : AGSPlatformXDGUnix { + eScriptSystemOSID GetSystemOSID() override;