diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index 60eaa482c84c..3239df9e3e86 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -1,52 +1,48 @@ # Created by: Kirill Ponomarew PORTNAME= kyra PORTVERSION= 2.1.3 PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION} DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} MAINTAINER= ports@FreeBSD.org COMMENT= Simple Sprite engine written in C++ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -BROKEN_aarch64= invalid output constraint =A in assembler -BROKEN_armv6= invalid output constraint =A in assembler -BROKEN_armv7= invalid output constraint =A in assembler - WRKSRC= ${WRKDIR}/${PORTNAME} USES= compiler gl gmake jpeg sdl zip USE_GL= gl USE_SDL= image sdl CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing MAKEFILE= MakefileKyra MAKE_ENV= MAKE_KYRA=RELEASE KYRA_OPENGL=YES MAKE_ARGS= CC="${CC}" CXX="${CXX}" LD="${CXX}" \ RELEASE_CFLAGS="${CFLAGS}" RELEASE_CXXFLAGS="${CXXFLAGS}" do-install: .for i in encoder spriteed (cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} kr${i} ${STAGEDIR}${PREFIX}/bin) .endfor (cd ${WRKSRC}/engine && ${INSTALL_DATA} libkyra.a ${STAGEDIR}${PREFIX}/lib) @${MKDIR} ${STAGEDIR}${PREFIX}/include/Kyra (cd ${WRKSRC} && ${INSTALL_DATA} kyra.h ${STAGEDIR}${PREFIX}/include/Kyra) .for i in engine gui guiExtended util @${MKDIR} ${STAGEDIR}${PREFIX}/include/Kyra/${i} (cd ${WRKSRC}/${i} && ${INSTALL_DATA} *.h \ ${STAGEDIR}${PREFIX}/include/Kyra/${i}) .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/include/Kyra/tinyxml (cd ${WRKSRC}/../tinyxml && ${INSTALL_DATA} *.h \ ${STAGEDIR}${PREFIX}/include/Kyra/tinyxml) .include diff --git a/devel/kyra/files/patch-encoder__MakefileKyra b/devel/kyra/files/patch-encoder__MakefileKyra index 7dccfc1b79dd..d33e4ec639a0 100644 --- a/devel/kyra/files/patch-encoder__MakefileKyra +++ b/devel/kyra/files/patch-encoder__MakefileKyra @@ -1,11 +1,11 @@ ---- encoder/MakefileKyra.orig +--- encoder/MakefileKyra.orig 2005-09-21 18:12:50 UTC +++ encoder/MakefileKyra -@@ -110,7 +110,7 @@ +@@ -110,7 +110,7 @@ OBJS := $(addsuffix .o,$(basename ${SRCS})) # Output #**************************************************************************** -${OUTPUT}: ${OBJS} ${LIBS} +${OUTPUT}: ${OBJS} ../engine/libkyra.a ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} #**************************************************************************** diff --git a/devel/kyra/files/patch-engine__MakefileKyra b/devel/kyra/files/patch-engine__MakefileKyra index c0ee8d2ed656..886a268edf05 100644 --- a/devel/kyra/files/patch-engine__MakefileKyra +++ b/devel/kyra/files/patch-engine__MakefileKyra @@ -1,10 +1,10 @@ ---- engine/MakefileKyra.orig +--- engine/MakefileKyra.orig 2006-07-21 01:54:05 UTC +++ engine/MakefileKyra -@@ -130,6 +130,7 @@ +@@ -130,6 +130,7 @@ SRCS := action.cpp \ ../util/glstring.cpp \ ../util/glisomath.cpp \ ../../grinliz/gldebug.cpp \ + ../../grinliz/gldynamic.cpp \ ../../grinliz/glperformance.cpp \ ../../grinliz/glgeometry.cpp \ ../../grinliz/glprime.cpp \ diff --git a/devel/kyra/files/patch-engine_encoder.h b/devel/kyra/files/patch-engine_encoder.h index d36b98a248de..f9fe5d6fad80 100644 --- a/devel/kyra/files/patch-engine_encoder.h +++ b/devel/kyra/files/patch-engine_encoder.h @@ -1,11 +1,11 @@ ---- engine/encoder.h.orig 2007-11-12 17:25:45.000000000 +0100 -+++ engine/encoder.h 2007-11-12 17:25:59.000000000 +0100 -@@ -185,7 +185,7 @@ +--- engine/encoder.h.orig 2005-03-31 01:02:36 UTC ++++ engine/encoder.h +@@ -148,7 +148,7 @@ class KrEncoder GLASSERT( numRGBA >= numSegment ); // GLASSERT( numSegment >= numLine ); } - void KrEncoder::Save(); + void Save(); KrResourceVault* GetVault() { return &vault; } diff --git a/devel/kyra/files/patch-engine_imagetree.h b/devel/kyra/files/patch-engine_imagetree.h index 3a80086453cb..494f878687f3 100644 --- a/devel/kyra/files/patch-engine_imagetree.h +++ b/devel/kyra/files/patch-engine_imagetree.h @@ -1,11 +1,11 @@ ---- engine/imagetree.h.orig 2007-11-12 17:22:54.000000000 +0100 -+++ engine/imagetree.h 2007-11-12 17:23:06.000000000 +0100 -@@ -190,7 +190,7 @@ +--- engine/imagetree.h.orig 2005-03-31 01:02:38 UTC ++++ engine/imagetree.h +@@ -190,7 +190,7 @@ class KrImageTree void Clear( KrImNode* root ); // delete the entire tree // Recursive hit test walk. - bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, std::vector* outputArray, int windowIndex ); + bool HitTestRec( KrImNode* node, int x, int y, int flags, std::vector* outputArray, int windowIndex ); KrImNode* root; // The root to position the window KrImNode* offsetRoot; // The root as returned to the client diff --git a/devel/kyra/files/patch-engine_namefield.h b/devel/kyra/files/patch-engine_namefield.h index 03ab36ad2ba8..9f27cecc6ce3 100644 --- a/devel/kyra/files/patch-engine_namefield.h +++ b/devel/kyra/files/patch-engine_namefield.h @@ -1,10 +1,10 @@ ---- engine/namefield.h.orig Tue Sep 12 19:06:04 2006 -+++ engine/namefield.h Tue Sep 12 19:07:20 2006 -@@ -31,6 +31,7 @@ - #include "../util/gltypes.h" +--- engine/namefield.h.orig 2005-02-14 08:03:33 UTC ++++ engine/namefield.h +@@ -34,6 +34,7 @@ + #include "../../grinliz/gltypes.h" #include "../util/gllist.h" #include "SDL_endian.h" +#include "SDL_rwops.h" diff --git a/devel/kyra/files/patch-grinliz_glperformance.h b/devel/kyra/files/patch-grinliz_glperformance.h new file mode 100644 index 000000000000..7089639e9723 --- /dev/null +++ b/devel/kyra/files/patch-grinliz_glperformance.h @@ -0,0 +1,20 @@ +--- ../grinliz/glperformance.h.orig 2021-10-26 01:06:25.780070000 +0200 ++++ ../grinliz/glperformance.h 2021-10-26 01:16:02.969577000 +0200 +@@ -34,6 +34,8 @@ + #include "gltypes.h" + #include "gldebug.h" + ++#include ++ + namespace grinliz { + + const int GL_MAX_PROFILE_DATAITEM = 64; +@@ -91,7 +93,7 @@ + #else + inline U64 FastTime() + { +- #ifdef __GNUC__ ++ #if defined(__GNUC__) && (defined(__amd64__) || defined(__i386__)) + U64 val; + __asm__ __volatile__ ("rdtsc" : "=A" (val)); + return val; diff --git a/devel/kyra/files/patch-guiExtended_progress.h b/devel/kyra/files/patch-guiExtended_progress.h index b5c98606925d..e4c6ca345f13 100644 --- a/devel/kyra/files/patch-guiExtended_progress.h +++ b/devel/kyra/files/patch-guiExtended_progress.h @@ -1,20 +1,20 @@ ---- guiExtended/progress.h.orig 2007-11-12 17:24:08.000000000 +0100 -+++ guiExtended/progress.h 2007-11-12 17:24:34.000000000 +0100 -@@ -43,7 +43,7 @@ +--- guiExtended/progress.h.orig 2004-11-21 19:28:32 UTC ++++ guiExtended/progress.h +@@ -43,7 +43,7 @@ class KrProgress : public KrWidget (public) /** if width of the resource is greater then its height then makes a horizontal, else makes a vertical progress bar */ - KrProgress::KrProgress (int width, + KrProgress (int width, int height, KrRGBA FillColor, KrRGBA ChangeColor, -@@ -53,7 +53,7 @@ +@@ -53,7 +53,7 @@ class KrProgress : public KrWidget (public) /** if width of the resource is greater then its height then makes a horizontal, else makes a vertical progress bar */ - KrProgress::KrProgress (int width, + KrProgress (int width, int height, const KrScheme& scheme); diff --git a/devel/kyra/files/patch-guitest__guitest.cpp b/devel/kyra/files/patch-guitest__guitest.cpp index d70993b5656c..de9b79c958b2 100644 --- a/devel/kyra/files/patch-guitest__guitest.cpp +++ b/devel/kyra/files/patch-guitest__guitest.cpp @@ -1,26 +1,26 @@ ---- guitest/guitest.cpp.orig +--- guitest/guitest.cpp.orig 2005-04-07 05:53:51 UTC +++ guitest/guitest.cpp -@@ -96,19 +96,19 @@ +@@ -96,19 +96,19 @@ class MyConsole : public KrConsole switch ( event.type ) { case KrWidgetEvent::ACTIVATED: - sprintf( buf, "ACTIVATED %s source=0x%x\n", source->WidgetType(), (unsigned)source ); + sprintf( buf, "ACTIVATED %s source=0x%x\n", source->WidgetType(), (uintptr_t)source ); break; case KrWidgetEvent::DEACTIVATED: - sprintf( buf, "DEACTIVATED %s source=0x%x\n", source->WidgetType(), (unsigned)source ); + sprintf( buf, "DEACTIVATED %s source=0x%x\n", source->WidgetType(), (uintptr_t)source ); break; case KrWidgetEvent::COMMAND: - sprintf( buf, "COMMAND %s source=0x%x command=%s arg=%s\n", source->WidgetType(), (unsigned)source, event.command.command, event.command.arg ); + sprintf( buf, "COMMAND %s source=0x%x command=%s arg=%s\n", source->WidgetType(), (uintptr_t)source, event.command.command, event.command.arg ); break; case KrWidgetEvent::SELECTION: - sprintf( buf, "SELECTION %s source=0x%x id=%d text=%s\n", source->WidgetType(), (unsigned)source, event.selection.index, event.selection.text ? event.selection.text : "(null)" ); + sprintf( buf, "SELECTION %s source=0x%x id=%d text=%s\n", source->WidgetType(), (uintptr_t)source, event.selection.index, event.selection.text ? event.selection.text : "(null)" ); break; default: