ags: update to ags-3.5.0.28

pkgsrc changes:

 Use pkgsrc wip/aldumb and freetype libraries instead of the internal versions.

Changelog:

REVISION HISTORY
================
VERSION 3.5.0 - Patch 6, December 2020

Engine:
 - Fixed Viewport::GetAtScreenXY() causing script errors at runtime.
 - Fixed Software renderer could freeze the game in case there are multiple room viewports.
 - Fixed Software renderer could draw room viewport in a wrong position if it was moved.
 - Fixed RunAGSGame crashed the game if it uses any font plugin (implementing IAGSFontRenderer).
 - Fixed built-in palgorithms plugin had uninitialized variable that could cause a crash.
This commit is contained in:
Yorick Hardy 2020-12-30 19:51:29 +02:00
parent 01af39fd4b
commit be903f62f4
4 changed files with 56 additions and 14 deletions

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2015/09/14 22:26:14 yhardy Exp $
DISTNAME= ags-3.5.0.27
DISTNAME= ags-3.5.0.28
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=adventuregamestudio/}
GITHUB_TAG= v.${PKGVERSION_NOREV}
@ -21,20 +21,21 @@ do-build:
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/doc/ags
# work around an error in lib/pkgconfig/dumb.pc
BUILDLINK_TRANSFORM+= l:libdumb:dumb
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Engine/ags ${DESTDIR}${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${DESTDIR}${PREFIX}/share/doc/ags/
${INSTALL_DATA} ${WRKSRC}/OPTIONS.md ${DESTDIR}${PREFIX}/share/doc/ags/
${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/ags/
.include "../../audio/dumb/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/allegro/buildlink3.mk"
# builds own copy of freetype
#.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
# TODO: switch to audio/dumb
# needs libaldmb.so
.include "../../wip/dumb/buildlink3.mk"
.include "../../wip/aldumb/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View File

@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.2 2015/09/14 22:26:14 yhardy Exp $
$NetBSD$
SHA1 (ags-3.5.0.27.tar.gz) = 6d16d859aa91515fd45c5016890ef90549d1f87e
RMD160 (ags-3.5.0.27.tar.gz) = 502a2e19ea5ffc6a6705b7f0eaa4fa95afeea98f
SHA512 (ags-3.5.0.27.tar.gz) = 29995c765c15e8b902d9f84e9959875a42ed5cb1961e49b3f21ce6a4dcbfcd14213ecee71decfb917fe0f90571ac031f5e52079bfb3989af5ef5af34154083cf
Size (ags-3.5.0.27.tar.gz) = 7614860 bytes
SHA1 (ags-3.5.0.28.tar.gz) = dceec06239f48cd514add268810c1f050cdd4fba
RMD160 (ags-3.5.0.28.tar.gz) = fca7aee72dde675e19134fff1bf8be338873c6c8
SHA512 (ags-3.5.0.28.tar.gz) = 190169f3d05647f632b9834a45c2f29730c4259cc4f5734c4b1b831c23ea46516684089db508e778bc5beaaf2c4e9cd3b6c4b1bedebf06c2b1cd581a312b8946
Size (ags-3.5.0.28.tar.gz) = 7616059 bytes
SHA1 (patch-Common_core_platform.h) = 393ae8b7e90601cfab0b11ecb185693db6a24ee1
SHA1 (patch-Engine_Makefile-defs.linux) = a37e4d19021214959387c5a87be927693c71acb5
SHA1 (patch-Engine_Makefile) = 849759ce98a4e4cdb5bf2d1ebb961295169ab170
SHA1 (patch-Engine_Makefile-defs.linux) = 9461a89b4c2c956206abe584a9fca155440870e2
SHA1 (patch-Engine_libsrc_libcda-0.5_linux.c) = f4f2bd480b36c1c47aa724b29b620b27a4ad392b

View File

@ -0,0 +1,15 @@
$NetBSD$
Don't build the ags copy of freetype.
--- Engine/Makefile.orig 2020-12-29 21:18:54.000000000 +0000
+++ Engine/Makefile
@@ -23,7 +23,7 @@ OBJS := $(OBJS:.mm=.o)
OBJS := $(OBJS:.cpp=.o)
OBJS := $(OBJS:.c=.o)
-OBJS_COMMON := $(COMMON) $(ALFONT) $(FREETYPE)
+OBJS_COMMON := $(COMMON) $(ALFONT)
OBJS_COMMON := $(OBJS_COMMON:.mm=.o)
OBJS_COMMON := $(OBJS_COMMON:.cpp=.o)
OBJS_COMMON := $(OBJS_COMMON:.c=.o)

View File

@ -1,10 +1,29 @@
$NetBSD$
Use appropriate options for dlopen.
Link pkgsrc libdumb, libaldmb and freetype2.
--- Engine/Makefile-defs.linux.orig 2019-12-29 17:06:00.000000000 +0000
--- Engine/Makefile-defs.linux.orig 2020-12-29 21:18:54.000000000 +0000
+++ Engine/Makefile-defs.linux
@@ -33,7 +33,11 @@ else
@@ -1,7 +1,7 @@
USE_BUILT_IN_LIBSRC = 0
USE_MIDI_PATCH = 1
-include Makefile-defs.freetype
+#include Makefile-defs.freetype
INCDIR = ../Engine ../Common ../Common/libinclude ../Common/libsrc/alfont-2.0.9 ../Plugins ../Engine/libsrc/glad/include
LIBDIR =
@@ -25,6 +25,8 @@ LIBS += $(shell pkg-config --libs allegr
LIBS += $(shell pkg-config --libs x11)
LIBS += $(shell pkg-config --libs ogg)
LIBS += $(shell pkg-config --libs theora)
+LIBS += $(shell pkg-config --libs freetype2)
+CFLAGS += $(shell pkg-config --cflags freetype2)
ifeq ($(USE_TREMOR), 1)
LIBS += -lvorbisidec
@@ -33,11 +35,16 @@ else
LIBS += $(shell pkg-config --libs vorbis)
endif
LIBS += $(shell pkg-config --libs vorbisfile)
@ -17,3 +36,9 @@ Use appropriate options for dlopen.
ifneq ($(USE_BUILT_IN_LIBSRC), 1)
ALDUMB :=
-LIBS += -Wl,--push-state,-Bstatic -laldmb -ldumb -Wl,--pop-state
+LIBS += $(shell pkg-config --libs dumb)
+LIBS += -laldmb
endif
ifeq ($(ALLEGRO_MAGIC_DRV), 1)