From owner-svn-ports-all@FreeBSD.ORG Tue Mar 26 14:11:37 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8D0DEF18; Tue, 26 Mar 2013 14:11:37 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7F028F43; Tue, 26 Mar 2013 14:11:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QEBb0P082183; Tue, 26 Mar 2013 14:11:37 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QEBa8F082172; Tue, 26 Mar 2013 14:11:36 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201303261411.r2QEBa8F082172@svn.freebsd.org> From: Martin Wilke Date: Tue, 26 Mar 2013 14:11:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315293 - in head/devel/kyra: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2013 14:11:37 -0000 Author: miwi Date: Tue Mar 26 14:11:35 2013 New Revision: 315293 URL: http://svnweb.freebsd.org/changeset/ports/315293 Log: - Update to 2.1.3 PR: v176562 Submitted by: Ports Fury Added: head/devel/kyra/files/patch-encoder__MakefileKyra (contents, props changed) head/devel/kyra/files/patch-engine__MakefileKyra (contents, props changed) head/devel/kyra/files/patch-guitest__guitest.cpp (contents, props changed) Deleted: head/devel/kyra/files/patch-engine_imnode.h head/devel/kyra/files/patch-util_gltypes.h Modified: head/devel/kyra/Makefile (contents, props changed) head/devel/kyra/distinfo (contents, props changed) head/devel/kyra/files/patch-engine_imagetree.h (contents, props changed) head/devel/kyra/pkg-plist (contents, props changed) Modified: head/devel/kyra/Makefile ============================================================================== --- head/devel/kyra/Makefile Tue Mar 26 14:07:26 2013 (r315292) +++ head/devel/kyra/Makefile Tue Mar 26 14:11:35 2013 (r315293) @@ -1,32 +1,46 @@ -# New ports collection makefile for: kyra -# Date created: 10.05.2003 -# Whom: Kirill Ponomarew -# +# Created by: Kirill Ponomarew # $FreeBSD$ -# PORTNAME= kyra -PORTVERSION= 2.0.7 -PORTREVISION= 12 +PORTVERSION= 2.1.3 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION} DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} MAINTAINER= ports@FreeBSD.org -COMMENT= A simple Sprite engine written in C++ +COMMENT= Simple Sprite engine written in C++ -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.11:${PORTSDIR}/graphics/jpeg +LICENSE= GPLv2 + +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + png15:${PORTSDIR}/graphics/png \ + tiff:${PORTSDIR}/graphics/tiff WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOTOOLS= libtool +USE_ZIP= yes +USE_GL= gl USE_SDL= image sdl -USE_GNOME= lthack -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USE_LDCONFIG= yes +USE_GMAKE= yes +MAKEFILE= MakefileKyra +MAKE_ENV= MAKE_KYRA=RELEASE KYRA_OPENGL=YES +MAKE_ARGS= CC="${CC}" CXX="${CXX}" LD="${CXX}" \ + RELEASE_CFLAGS="${CFLAGS}" RELEASE_CXXFLAGS="${CXXFLAGS}" +MAKE_JOBS_SAFE= yes + +do-install: +.for i in encoder spriteed + (cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} kr${i} ${PREFIX}/bin) +.endfor + (cd ${WRKSRC}/engine && ${INSTALL_DATA} libkyra.a ${PREFIX}/lib) + @${MKDIR} ${PREFIX}/include/Kyra + (cd ${WRKSRC} && ${INSTALL_DATA} kyra.h ${PREFIX}/include/Kyra) +.for i in engine gui guiExtended util + @${MKDIR} ${PREFIX}/include/Kyra/${i} + (cd ${WRKSRC}/${i} && ${INSTALL_DATA} *.h ${PREFIX}/include/Kyra/${i}) +.endfor + @${MKDIR} ${PREFIX}/include/Kyra/tinyxml + (cd ${WRKSRC}/../tinyxml && ${INSTALL_DATA} *.h \ + ${PREFIX}/include/Kyra/tinyxml) .include Modified: head/devel/kyra/distinfo ============================================================================== --- head/devel/kyra/distinfo Tue Mar 26 14:07:26 2013 (r315292) +++ head/devel/kyra/distinfo Tue Mar 26 14:11:35 2013 (r315293) @@ -1,2 +1,2 @@ -SHA256 (kyra_src_2_0_7.tar.gz) = 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6 -SIZE (kyra_src_2_0_7.tar.gz) = 1994743 +SHA256 (kyra_src_2_1_3.zip) = 19a9f2bceca6ddd5945fb687590e18f29b73819901a476f85ce9c37bec4170f0 +SIZE (kyra_src_2_1_3.zip) = 3595503 Added: head/devel/kyra/files/patch-encoder__MakefileKyra ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kyra/files/patch-encoder__MakefileKyra Tue Mar 26 14:11:35 2013 (r315293) @@ -0,0 +1,11 @@ +--- encoder/MakefileKyra.orig ++++ encoder/MakefileKyra +@@ -110,7 +110,7 @@ + # Output + #**************************************************************************** + +-${OUTPUT}: ${OBJS} ${LIBS} ++${OUTPUT}: ${OBJS} ../engine/libkyra.a + ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} + + #**************************************************************************** Added: head/devel/kyra/files/patch-engine__MakefileKyra ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kyra/files/patch-engine__MakefileKyra Tue Mar 26 14:11:35 2013 (r315293) @@ -0,0 +1,10 @@ +--- engine/MakefileKyra.orig ++++ engine/MakefileKyra +@@ -130,6 +130,7 @@ + ../util/glstring.cpp \ + ../util/glisomath.cpp \ + ../../grinliz/gldebug.cpp \ ++ ../../grinliz/gldynamic.cpp \ + ../../grinliz/glperformance.cpp \ + ../../grinliz/glgeometry.cpp \ + ../../grinliz/glprime.cpp \ Modified: head/devel/kyra/files/patch-engine_imagetree.h ============================================================================== --- head/devel/kyra/files/patch-engine_imagetree.h Tue Mar 26 14:07:26 2013 (r315292) +++ head/devel/kyra/files/patch-engine_imagetree.h Tue Mar 26 14:11:35 2013 (r315293) @@ -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 -@@ -217,7 +217,7 @@ +@@ -190,7 +190,7 @@ void Clear( KrImNode* root ); // delete the entire tree // Recursive hit test walk. -- bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray* outputArray, int windowIndex ); -+ bool HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray* outputArray, int windowIndex ); +- 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 Added: head/devel/kyra/files/patch-guitest__guitest.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kyra/files/patch-guitest__guitest.cpp Tue Mar 26 14:11:35 2013 (r315293) @@ -0,0 +1,26 @@ +--- guitest/guitest.cpp.orig ++++ guitest/guitest.cpp +@@ -96,19 +96,19 @@ + 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: Modified: head/devel/kyra/pkg-plist ============================================================================== --- head/devel/kyra/pkg-plist Tue Mar 26 14:07:26 2013 (r315292) +++ head/devel/kyra/pkg-plist Tue Mar 26 14:11:35 2013 (r315293) @@ -1,6 +1,5 @@ bin/krencoder bin/krspriteed -bin/kyra-config include/Kyra/engine/action.h include/Kyra/engine/box.h include/Kyra/engine/boxresource.h @@ -28,7 +27,6 @@ include/Kyra/engine/parser.h include/Kyra/engine/pixelblock.h include/Kyra/engine/rle.h include/Kyra/engine/sdlutil.h -include/Kyra/engine/splash.h include/Kyra/engine/sprite.h include/Kyra/engine/spriteresource.h include/Kyra/engine/tags.h @@ -46,33 +44,20 @@ include/Kyra/guiExtended/KrImageListBox. include/Kyra/guiExtended/progress.h include/Kyra/kyra.h include/Kyra/tinyxml/tinyxml.h +include/Kyra/tinyxml/tinystr.h include/Kyra/util/glbitstream.h include/Kyra/util/glcirclelist.h include/Kyra/util/gldebug.h -include/Kyra/util/gldynarray.h include/Kyra/util/glfixed.h -include/Kyra/util/glgraph.h include/Kyra/util/glinsidelist.h include/Kyra/util/glintarrayset.h include/Kyra/util/glisomath.h include/Kyra/util/gllist.h -include/Kyra/util/glmap.h -include/Kyra/util/glmemorypool.h -include/Kyra/util/glperformance.h -include/Kyra/util/glprime.h -include/Kyra/util/glrandom.h -include/Kyra/util/glstack.h include/Kyra/util/glstring.h -include/Kyra/util/gltypes.h -include/Kyra/util/glutil.h lib/libkyra.a -lib/libkyra.la -lib/libkyra.so -lib/libkyra.so.0 -share/aclocal/kyra.m4 @dirrm include/Kyra/util -@dirrm include/Kyra/gui +@dirrm include/Kyra/tinyxml @dirrm include/Kyra/guiExtended +@dirrm include/Kyra/gui @dirrm include/Kyra/engine -@dirrm include/Kyra/tinyxml @dirrm include/Kyra