Index: branches/2018Q1/games/openbor/Makefile =================================================================== --- branches/2018Q1/games/openbor/Makefile (revision 462556) +++ branches/2018Q1/games/openbor/Makefile (revision 462557) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 4601 +PORTVERSION?= 4604 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif CATEGORIES= games MAINTAINER= jbeich@FreeBSD.org COMMENT= Moddable fighting game engine (aka Beats of Rage) LICENSE= BSD3CLAUSE GPLv2+ .if ${PORTVERSION} >= 4134 LICENSE+= ISCL .endif LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2 # source/gfxlib/hq2x.c LICENSE_FILE_ISCL= ${WRKSRC}/source/webmlib/nestegg/LICENSE LIB_DEPENDS= libpng.so:graphics/png .if ${PORTVERSION} >= 4134 LIB_DEPENDS+= libvpx.so:multimedia/libvpx .endif .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 .endif USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= ab066c1 +GH_TAGNAME?= d73408f USES+= gmake pkgconfig .if ${PORTVERSION} < 4433 USE_CSTD= gnu89 .endif .if ${PORTVERSION} < 4108 USE_SDL= gfx .else USE_SDL= gfx2 .endif WRKSRC_SUBDIR= engine MAKE_ENV= BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \ GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}" MAKE_ARGS= CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \ TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \ TARGET_FINAL='${TARGET}' BUILD_MMX="" ECHO="${ECHO}" LDFLAGS+= -Wl,--as-needed # ogg, pthread, zlib SUB_FILES= pkg-message SUB_LIST= PKGBASE=${PKGBASE} PLIST_FILES= bin/${PKGBASE} \ share/pixmaps/${PKGBASE}.png DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} PORTDOCS= README DESKTOP_ENTRIES="OpenBOR v3.0 Build ${PORTVERSION}" \ "" \ "${PKGBASE}" \ "${PKGBASE}" \ "Game;ArcadeGame;" \ "" OPTIONS_DEFINE= TREMOR OPTIONS_DEFAULT= ${MACHINE_CPU:Msoftfp:C/.+/TREMOR/} OPTIONS_DEFINE_i386= MMX OPTIONS_DEFAULT_i386= MMX # runtime detection MMX_BUILD_DEPENDS= yasm:devel/yasm MMX_MAKE_ARGS= BUILD_MMX=1 TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor TREMOR_MAKE_ARGS= BUILD_TREMOR=1 BUILD_VORBIS="" TREMOR_LIB_DEPENDS_OFF= libvorbisfile.so:audio/libvorbis post-patch: @${REINPLACE_CMD} -e 's/ -O[0-9]//; s/ -g//; s/ -Werror//' \ -e 's/ -fomit-frame-pointer//' \ -e 's/ -freorder-blocks//' \ -e 's/ -Wl,-rpath,$$(LIBRARIES)//' \ -e '/echo/!s/ @/ /' \ -e 's/@echo/@$$(ECHO)/' \ -e 's/$$(LIBS)/$$(LDFLAGS) &/' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's/\.openbor/.${PKGBASE}/' \ ${WRKSRC}/sdl/sdlport.c @${GREP} -Flr 'malloc.h' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ 's,malloc\.h,stdlib.h,' @${REINPLACE_CMD} -e 's/^function \(.*\) {/\1() {/' \ -e 's/^get_revnum$$/VERSION_BUILD=${PORTVERSION}/' \ ${WRKSRC}/version.sh do-configure: (cd ${WRKSRC} && ${SH} ./version.sh) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/OpenBOR.elf \ ${STAGEDIR}${PREFIX}/bin/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/resources/OpenBOR_Icon_128x128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PKGBASE}.png (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: branches/2018Q1/games/openbor/distinfo =================================================================== --- branches/2018Q1/games/openbor/distinfo (revision 462556) +++ branches/2018Q1/games/openbor/distinfo (revision 462557) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519052570 -SHA256 (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 5ce8ce0d179d82716c5ca4ff4b0ff84a11ede9cf2cdcc62109f81a6c89a2b085 -SIZE (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 107146373 +TIMESTAMP = 1519248328 +SHA256 (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 1827f54f3340782ca11e3c17e3c6623f9fb88112db510e89db917909842de656 +SIZE (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 107146873 Index: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.h =================================================================== --- branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.h (revision 462556) +++ branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.h (nonexistent) @@ -1,13 +0,0 @@ -Don't crash with > 80 tracks. - ---- source/gamelib/packfile.h.orig 2015-04-18 21:22:03 UTC -+++ source/gamelib/packfile.h -@@ -42,7 +42,7 @@ typedef struct fileliststruct - { - char filename[128]; - int nTracks; -- char bgmFileName[80][256]; -+ char bgmFileName[256][80]; - int bgmTrack; - unsigned int bgmTracks[256]; - #ifdef SDL Property changes on: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c =================================================================== --- branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c (revision 462556) +++ branches/2018Q1/games/openbor/files/patch-source_gamelib_packfile.c (revision 462557) @@ -1,13 +1,23 @@ Reset seek position for BGM with more than 128 tracks +Don't crash with more than 256 tracks. --- source/gamelib/packfile.c.orig 2018-02-19 15:02:50 UTC +++ source/gamelib/packfile.c @@ -1408,7 +1408,7 @@ void packfile_music_read(fileliststruct *filelist, int getBasePath(packfile, filelist[i].filename, 1); if(stristr(packfile, ".pak")) { - memset(filelist[i].bgmTracks, 0, PACKFILE_PATH_MAX); + memset(filelist[i].bgmTracks, 0, sizeof(filelist[i].bgmTracks)); filelist[i].nTracks = 0; fd = fopen(packfile, "rb"); if(fd == NULL) +@@ -1440,7 +1440,7 @@ void packfile_music_read(fileliststruct *filelist, int + { + goto nextpak; + } +- if(filelist[i].nTracks < PACKFILE_PATH_MAX) ++ if(filelist[i].nTracks < 256) + { + packfile_get_titlename(pn.namebuf, filelist[i].bgmFileName[filelist[i].nTracks]); + filelist[i].bgmTracks[filelist[i].nTracks] = off; Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 462556) +++ branches/2018Q1 (revision 462557) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r462552