Date: Fri, 23 Jun 2023 21:00:50 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 05203b94b144 - main - games/ags: Update to 3.6.0.49 Message-ID: <202306232100.35NL0o80024354@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=05203b94b144224c53d048556a9ba255f2fc20d6 commit 05203b94b144224c53d048556a9ba255f2fc20d6 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2023-06-23 20:58:42 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> 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|<endian.h>|<sys/endian.h>|' \ - ${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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306232100.35NL0o80024354>