diff --git a/games/openbor/Makefile b/games/openbor/Makefile index 8266389ccb24..14fe9a453c0e 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -1,119 +1,119 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 7123 +PORTVERSION?= 7138 .ifndef PKGNAMESUFFIX PORTREVISION= 0 .endif CATEGORIES= games PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ .if ${PORTVERSION} < 3971 PATCHFILES+= 794ba23189a3.patch:-p2 .elif ${PORTVERSION} < 7084 PATCHFILES+= 731d96887795.patch:-p2 .endif MAINTAINER= jbeich@FreeBSD.org COMMENT= 2D side scrolling engine for beat 'em ups, shooters, and more #' 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?= f5261e7c +GH_TAGNAME?= 3caaddd5 USES+= gmake pkgconfig sdl .if ${PORTVERSION} < 4433 USE_CSTD= gnu89 .endif .if ${PORTVERSION} < 4108 USE_SDL= gfx -.elif ${PORTVERSION} < 6639 || ${PORTVERSION} >= 7119 +.elif ${PORTVERSION} < 6639 USE_SDL= gfx2 .else USE_SDL= sdl2 .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}" .if ${PORTVERSION} < 7098 CFLAGS+= -fcommon # https://github.com/DCurrent/openbor/issues/206 .endif 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= DOCS 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/ -Wno-unused-result//' \ -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 '/^[[:space:]]*VERSION_.*=0000/d' \ -e '/.*read -r VERSION_/d' \ ${WRKSRC}/version.sh do-configure: (cd ${WRKSRC} && VERSION_BUILD=${PORTVERSION} VERSION_COMMIT=${GH_TAGNAME} \ ${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 diff --git a/games/openbor/distinfo b/games/openbor/distinfo index 1d9207a1c997..d2161a6a074a 100644 --- a/games/openbor/distinfo +++ b/games/openbor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621341374 -SHA256 (DCurrent-openbor-7123-f5261e7c_GH0.tar.gz) = f6ab8cc741defeb594a1341d0ef306b5849cb8c593d5d9941164b05d80727e7a -SIZE (DCurrent-openbor-7123-f5261e7c_GH0.tar.gz) = 26906486 +TIMESTAMP = 1626732659 +SHA256 (DCurrent-openbor-7138-3caaddd5_GH0.tar.gz) = 4671f869aeffb0a13fd21171bbccef2dcca5b5b0c8f5a64bf2a921bc7404fac5 +SIZE (DCurrent-openbor-7138-3caaddd5_GH0.tar.gz) = 26900809 diff --git a/games/openbor/files/patch-sdl_video.c b/games/openbor/files/patch-sdl_video.c deleted file mode 100644 index d2e5be68d653..000000000000 --- a/games/openbor/files/patch-sdl_video.c +++ /dev/null @@ -1,17 +0,0 @@ -Haptic isn't implemented on BSDs thus disabled by default - ---- sdl/video.c.orig 2018-07-02 13:46:53 UTC -+++ sdl/video.c -@@ -46,7 +46,11 @@ int brightness = 0; - void initSDL() - { - SDL_DisplayMode video_info; -- int init_flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC; -+ int init_flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK; -+ -+#ifndef SDL_HAPTIC_DISABLED -+ init_flags |= SDL_INIT_HAPTIC; -+#endif - - /*#if EE_CURRENT_PLATFORM == EE_PLATFORM_WINDOWS - SDL_setenv("SDL_AUDIODRIVER", "directsound", true);