From owner-svn-ports-head@FreeBSD.ORG Sun May 11 16:21:05 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AE40764; Sun, 11 May 2014 16:21:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B6C72FAE; Sun, 11 May 2014 16:21:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BGL441058224; Sun, 11 May 2014 16:21:04 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BGL4tK058221; Sun, 11 May 2014 16:21:04 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405111621.s4BGL4tK058221@svn.freebsd.org> From: Dmitry Marakasov Date: Sun, 11 May 2014 16:21:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353716 - in head/games/blinkensisters: . 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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2014 16:21:05 -0000 Author: amdmi3 Date: Sun May 11 16:21:04 2014 New Revision: 353716 URL: http://svnweb.freebsd.org/changeset/ports/353716 QAT: https://qat.redports.org/buildarchive/r353716/ Log: - Support staging - Use new OPTIONS features Added: head/games/blinkensisters/files/ head/games/blinkensisters/files/patch-main.cpp (contents, props changed) head/games/blinkensisters/files/patch-oggplayer.cpp (contents, props changed) Deleted: head/games/blinkensisters/pkg-plist Modified: head/games/blinkensisters/Makefile Modified: head/games/blinkensisters/Makefile ============================================================================== --- head/games/blinkensisters/Makefile Sun May 11 16:04:28 2014 (r353715) +++ head/games/blinkensisters/Makefile Sun May 11 16:21:04 2014 (r353716) @@ -12,7 +12,7 @@ COMMENT= Parallax-style 2D scrolling pla USE_SDL= sdl image ttf USE_PERL5= build -USES= cmake perl5 +USES= cmake perl5 compiler:c++11-lang # actually, old gcc fails in theora.h CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include @@ -20,16 +20,33 @@ CXXFLAGS+= -I${LOCALBASE}/include WRKSRC= ${WRKDIR}/blinkensisters/lostpixels/game/software ADDONS_WRKSRC= ${WRKDIR}/blinkensisters/lostpixels/game/addons +PLIST_FILES= bin/LostPixels \ + bin/bmfcompress \ + bin/bmfdecompress PORTDOCS= * +PORTDATA= * + +OPTIONS_DEFINE= ADDONS SDL_MIXER SDL_NET THEORA DOCS +OPTIONS_DEFAULT=ADDONS SDL_MIXER SDL_NET THEORA -OPTIONS_DEFINE= ADDONS SDL_MIXER SDL_NET THEORA ADDONS_DESC= Install addons (~200 MB download size) SDL_MIXER_DESC= Build with sound support SDL_NET_DESC= Build with network support -OPTIONS_DEFAULT= SDL_MIXER SDL_NET +SDL_MIXER_USE= SDL=mixer +SDL_MIXER_CMAKE_OFF= -DUSE_SDL_MIXER:BOOL=OFF +SDL_MIXER_PLIST_FILES= bin/BlinkenPlayer + +SDL_NET_USE= SDL=net +SDL_NET_CMAKE_OFF= -DUSE_SDL_NET:BOOL=OFF +SDL_NET_PLIST_FILES= bin/blpmatrix \ + bin/blpviewer \ + bin/bxxviewer \ + bin/mcufviewer + +THEORA_CMAKE_ON= -DUSE_THEORA:BOOL=ON +THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora -NO_STAGE= yes .include .if ${ARCH} == "sparc64" @@ -39,38 +56,11 @@ BROKEN= Does not compile on sparc64 .if ${PORT_OPTIONS:MADDONS} DISTNAME= LostPixels-${PORTVERSION}-source-with-addons PKGNAMESUFFIX= -with-addons -PLIST_SUB+= ADDONS="" .else DISTNAME= LostPixels-${PORTVERSION}-source -PLIST_SUB+= ADDONS="@comment " -.endif - -.if ${PORT_OPTIONS:MSDL_MIXER} -USE_SDL+= mixer -PLIST_SUB+= SDL_MIXER="" -.else -CMAKE_ARGS+= -DUSE_SDL_MIXER:BOOL=OFF -PLIST_SUB+= SDL_MIXER="@comment " -.endif - -.if ${PORT_OPTIONS:MSDL_NET} -USE_SDL+= net -PLIST_SUB+= SDL_NET="" -.else -CMAKE_ARGS+= -DUSE_SDL_NET:BOOL=OFF -PLIST_SUB+= SDL_NET="@comment " -.endif - -.if ${PORT_OPTIONS:MTHEORA} -CMAKE_ARGS+= -DUSE_THEORA:BOOL=ON -.else -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora .endif post-patch: -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/^INSTALL.*doc/ d' ${WRKSRC}/CMakeLists.txt -.endif @${REINPLACE_CMD} -e 's|share/blinkensisters|${DATADIR:S,${PREFIX}/,,}|; \ s|share/doc/blinkensisters|${DOCSDIR:S,${PREFIX}/,,}|' \ ${WRKSRC}/CMakeLists.txt @@ -84,8 +74,8 @@ post-build: cd ${ADDONS_WRKSRC} && ${MAKE} post-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${ADDONS_WRKSRC}/for_upload/*.bmf ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${ADDONS_WRKSRC}/for_upload/*.bmf ${STAGEDIR}${DATADIR}/ .endif .include Added: head/games/blinkensisters/files/patch-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/blinkensisters/files/patch-main.cpp Sun May 11 16:21:04 2014 (r353716) @@ -0,0 +1,15 @@ +Game fails to load this file +--- main.cpp.orig 2008-12-06 23:51:54.000000000 +0300 ++++ main.cpp 2014-05-11 20:09:10.346486193 +0400 +@@ -446,11 +446,7 @@ + + // Display the Intro sequence + #ifdef CAVAC_RELEASEMODE +-#ifdef HASOGGSUPPORT +- playogg(configGetPath("startanim_video.ogg"),gScreen); /* play the standard ogg video instead of the BMF showVideo("startanim.bmf", true); */ +-#else // HASOGGSUPPORT + showVideo("startanim.bmf", true, true); +-#endif // NO HASOGGSUPPORT + #endif // CAVAC_RELEASEMODE + configStartupComplete(); + Added: head/games/blinkensisters/files/patch-oggplayer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/blinkensisters/files/patch-oggplayer.cpp Sun May 11 16:21:04 2014 (r353716) @@ -0,0 +1,11 @@ +--- oggplayer.cpp.orig 2008-12-06 23:51:54.000000000 +0300 ++++ oggplayer.cpp 2013-12-20 21:39:40.586265026 +0400 +@@ -68,7 +68,7 @@ + hard/kernel buffer is going to be most of or > a second, that's + just a little bit important */ + #if defined(__FreeBSD__) +-#include ++#include + #define AUDIO_DEVICE "/dev/audio" + #elif defined(__NetBSD__) || defined(__OpenBSD__) + #include