diff --git a/games/rlvm/Makefile b/games/rlvm/Makefile index a81eeefc1f51..b886e73fade2 100644 --- a/games/rlvm/Makefile +++ b/games/rlvm/Makefile @@ -1,98 +1,97 @@ PORTNAME= rlvm DISTVERSIONPREFIX= release- -DISTVERSION= 0.14-75 -DISTVERSIONSUFFIX= -g975e740c -PORTREVISION= 2 +DISTVERSION= 0.14-77 +DISTVERSIONSUFFIX= -gfabf134a CATEGORIES= games MAINTAINER= jbeich@FreeBSD.org COMMENT= RealLive virtual machine clone LICENSE= GPLv2 GPLv3 MIT LICENSE_COMB= multi BROKEN_FreeBSD_11_powerpc64= fails to link on powerpc64 elfv1: gcn_platform.cc: undefined reference to gcn::Exception::Exception BROKEN_FreeBSD_12_powerpc64= fails to link on powerpc64 elfv1: gcn_platform.cc: undefined reference to gcn::Exception::Exception BUILD_DEPENDS= ${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libvorbisfile.so:audio/libvorbis \ libboost_serialization.so:devel/boost-libs \ libguichan.so:devel/guichan RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USE_GITHUB= yes GH_ACCOUNT= eglaysher USES= compiler:c++11-lib gl gnome pkgconfig scons sdl USE_GL= glew glu USE_GNOME= gtk20 USE_SDL= image mixer ttf EXCLUDE= GLEW SDL_image SDL_mixer SDL_ttf gmock gtest guichan \ luabind utf8cpp # leaving only pygame, xclannad, *.cpp EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude vendor/,} LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps) MAKE_ARGS= VERBOSE=1 INSTALLS_ICONS= yes PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes OPTIONS_DEFINE= DEBUG DOCS NLS TEST OPTIONS_DEFAULT=MONA OPTIONS_MULTI= JAPANESE_FONT OPTIONS_MULTI_JAPANESE_FONT=KOCHI MONA SAZANAMI OPTIONS_SUB= yes JAPANESE_FONT_DESC=msgothic.ttc alternatives with verified metrics (unless --font) KOCHI_DESC= kochi-gothic-subst.ttf from japanese/font-kochi KOCHI_RUN_DEPENDS=${LOCALBASE}/share/fonts/kochi/kochi-gothic-subst.ttf:japanese/font-kochi MONA_DESC= mona.ttf from japanese/font-mona-ttf MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/mona-ttf/mona.ttf:japanese/font-mona-ttf SAZANAMI_DESC= sazanami-gothic.ttf from japanese/font-sazanami SAZANAMI_RUN_DEPENDS=${LOCALBASE}/share/fonts/sazanami/sazanami-gothic.ttf:japanese/font-sazanami DEBUG_MAKE_ARGS_OFF=--release NLS_USES= gettext NLS_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-nls TEST_USES= lua:51 TEST_BUILD_DEPENDS=googletest>=1.7.0:devel/googletest \ luabind>0:devel/luabind TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-test post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/src/platforms/gtk/gtk_rlvm_instance.cc @${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \ -e 's,truetype/ttf-dejavu,dejavu,' \ -e 's,truetype/mona,mona-ttf,' \ -e 's,truetype/,,' \ ${WRKSRC}/src/utilities/find_font_file.cc do-test-TEST-on: (cd ${WRKSRC} && build/${PORTNAME}_unittests) pre-install-TEST-on: do-test-TEST-on do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.6 \ ${STAGEDIR}${PREFIX}/share/man/man6 ${INSTALL_DATA} ${WRKSRC}/src/platforms/gtk/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} @(cd ${WRKSRC}/resources && for f in */${PORTNAME}.png; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ ${INSTALL_DATA} -v $$f \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ done) post-install-NLS-on: (cd ${WRKSRC}/build/locale && ${COPYTREE_SHARE} \ . ${STAGEDIR}${PREFIX}/share/locale) post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS:Nnotes}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ notes ${STAGEDIR}${DOCSDIR}) .include diff --git a/games/rlvm/distinfo b/games/rlvm/distinfo index 62a69c247005..e87aa5d8d978 100644 --- a/games/rlvm/distinfo +++ b/games/rlvm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580529853 -SHA256 (eglaysher-rlvm-release-0.14-75-g975e740c_GH0.tar.gz) = ecac97ae2098f6e4aa8f81d7ad10882e4947e6491e79ed265d240115d3f205fc -SIZE (eglaysher-rlvm-release-0.14-75-g975e740c_GH0.tar.gz) = 1905520 +TIMESTAMP = 1622120369 +SHA256 (eglaysher-rlvm-release-0.14-77-gfabf134a_GH0.tar.gz) = 0cf16f5f6ef7d19df62133c01ffd3f135edd2c5dc12018a390c96e3b3c4e7e74 +SIZE (eglaysher-rlvm-release-0.14-77-gfabf134a_GH0.tar.gz) = 1905421 diff --git a/games/rlvm/files/patch-SConstruct b/games/rlvm/files/patch-SConstruct index 8960cb596572..a574c1801a5b 100644 --- a/games/rlvm/files/patch-SConstruct +++ b/games/rlvm/files/patch-SConstruct @@ -1,49 +1,47 @@ ---- SConstruct.orig 2021-08-10 14:26:06 UTC +--- SConstruct.orig 2021-05-27 12:59:29 UTC +++ SConstruct @@ -19,8 +19,13 @@ AddOption('--fullstatic', action='store_true', # Set libraries used by all configurations and all binaries in rlvm. env = Environment( + ENV=os.environ, tools = ["default", "rlvm"], + **dict((k, v.split()) for k, v in ARGUMENTS.items()) +) +env.Append( + LIBS = ["z"], LOCAL_LIBS = [], -@@ -284,7 +289,8 @@ if not config.CheckGuichan(): - - # Get the configuration from sdl and freetype +@@ -286,6 +291,7 @@ if not config.CheckGuichan(): env.ParseConfig("sdl-config --cflags") --env.ParseConfig("freetype-config --cflags --libs") -+env.ParseConfig("pkg-config freetype2 --cflags --libs") + env.Append(CFLAGS=["-DFB_USE_FREETYPE"]) + env.ParseConfig("pkg-config --cflags --libs freetype2") +config.CheckLibWithHeader('intl', 'libintl.h', "cpp") - env = config.Finish() -@@ -313,7 +319,6 @@ if GetOption('release'): + env = config.Finish() +@@ -315,7 +321,6 @@ if GetOption('release'): # Now add release optimizations to the environment env.Append( CPPFLAGS = [ - "-Os", "-DNDEBUG", "-DBOOST_DISABLE_ASSERTS" ] -@@ -359,13 +364,7 @@ elif GetOption('pprof'): +@@ -361,13 +366,7 @@ elif GetOption('pprof'): "profiler"] ) else: - # Add debugging flags to all binaries here - env.Append( - CPPFLAGS = [ - "-g", - "-O0" - ] - ) + pass # Cross platform core of rlvm. Produces librlvm.a and libsystem_sdl.a env.SConscript("SConscript",