Index: head/devel/py-game_sdl2/Makefile =================================================================== --- head/devel/py-game_sdl2/Makefile (revision 479525) +++ head/devel/py-game_sdl2/Makefile (revision 479526) @@ -1,34 +1,34 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 7.0.0 +PORTVERSION= 7.1.0 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= py${PORTNAME}-2.1.0-for-renpy-${DISTVERSION} MAINTAINER= jbeich@FreeBSD.org COMMENT= Reimplementation of portions of the pygame API using SDL2 LICENSE= LGPL21+ ZLIB LICENSE_COMB= multi LIB_DEPENDS= libpng.so:graphics/png # Upstream tends to reroll distfiles before moving under /release/ PORTSCOUT= site:http://www.renpy.org/dl/release/ USES= jpeg python USE_SDL= image2 mixer2 ttf2 USE_PYTHON= autoplist distutils cython EXCLUDE= gen gen3 PKG-INFO '*.egg-info' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} BINARY_ALIAS= cython=cython-${PYTHON_VER} post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ -exec ${STRIP_CMD} {} + .include Index: head/devel/py-game_sdl2/distinfo =================================================================== --- head/devel/py-game_sdl2/distinfo (revision 479525) +++ head/devel/py-game_sdl2/distinfo (revision 479526) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527821357 -SHA256 (pygame_sdl2-2.1.0-for-renpy-7.0.0.tar.gz) = 7eba0b990d613868daa077943bf89ce542e2945ed005e130cfa85f9819944437 -SIZE (pygame_sdl2-2.1.0-for-renpy-7.0.0.tar.gz) = 2573001 +TIMESTAMP = 1536624238 +SHA256 (pygame_sdl2-2.1.0-for-renpy-7.1.0.tar.gz) = 56136a6e56369d3b8bf95ede11a76f82243a1737ece30fe72189780d5104f2a0 +SIZE (pygame_sdl2-2.1.0-for-renpy-7.1.0.tar.gz) = 2572875 Index: head/games/renpy/Makefile =================================================================== --- head/games/renpy/Makefile (revision 479525) +++ head/games/renpy/Makefile (revision 479526) @@ -1,114 +1,114 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 7.0.0 +PORTVERSION?= 7.1.0 DISTVERSIONSUFFIX=-sdk PORTREVISION?= 0 CATEGORIES= games devel MASTER_SITES= https://www.renpy.org/dl/${PORTVERSION}/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Framework for developing visual-novel type games LICENSE= APACHE20 BSD3CLAUSE DejaVu LGPL21+ MIT OFL11 ZLIB LICENSE_COMB= multi LICENSE_NAME_DejaVu= Bitstream Vera and Arev fonts license LICENSE_FILE_DejaVu= ${WRKSRC}/renpy/common/DejaVuSans.txt LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2@${PY_FLAVOR} LIB_DEPENDS= libfribidi.so:converters/fribidi \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg \ libfreetype.so:print/freetype2 RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2@${PY_FLAVOR} CONFLICTS_INSTALL?= ${PORTNAME}6-* # Upstream tends to reroll distfiles before moving under /release/ PORTSCOUT?= site:http://www.renpy.org/dl/release/ USES= python:2.7 shebangfix tar:bz2 USE_GL= glew USE_PYTHON= autoplist distutils cython USE_SDL?= sdl2 EXCLUDE= gen 'module/*.py[co]' 'renpy/*.py[co]' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} SHEBANG_FILES= renpy.py launcher/game/tkaskdir.py TARGET_ORDER_OVERRIDE=610:fix-shebang BUILD_WRKSRC= ${WRKSRC}/module INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKE_ENV+= RENPY_DEPS_INSTALL="${LOCALBASE}" \ RENPY_CYTHON=cython-${PYTHON_VER} PORTDATA?= gui PORTDATA+= launcher renpy renpy.py PORTDOCS= * PLIST_FILES= bin/${PORTNAME} DESKTOP_ENTRIES="Ren'Py" \ "" \ "${DATADIR}/launcher/game/images/logo32.png" \ "${PORTNAME} %f" \ "Development;Game;AdventureGame;" \ "" OPTIONS_DEFAULT=TKINTER DIST OPTIONS_DEFINE= DOCS DIST EXAMPLES TKINTER DIST_DESC= Distribution runtimes for Windows, OS X, Linux DIST_VARS= LICENSE+="ART20 PSFL" \ PORTDATA+="lib renpy.app renpy.exe renpy.sh" EXAMPLES_VARS= PORTDATA+="the_question tutorial" TKINTER_DESC= Install Tkinter to allow choosing Projects Directory TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} . for lic in FREETYPE LIBJPEG LIBPNG MSVCR90 DIST_VARS+= LICENSE+=${lic} LICENSE_NAME_${lic}= ${lic} license LICENSE_FILE_${lic}= ${WRKSRC}/LICENSE.txt LICENSE_PERMS_${lic}= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept . endfor post-extract: @${FIND} ${WRKSRC}/lib ${WRKSRC}/renpy.app -type d -empty -delete .if !target(post-patch) post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \ ${WRKSRC}/launcher/game/choose_directory.rpy .endif post-patch: common-post-patch common-post-patch: # Avoid having to add -I/usr/include -L/usr/lib @${REINPLACE_CMD} '/library("z")/d' ${BUILD_WRKSRC}/${PYSETUP} post-build: @${PYTHON_CMD} -m compileall -d ${DATADIR} ${WRKSRC} @${PYTHON_CMD} -O -m compileall -d ${DATADIR} ${WRKSRC} add-plist-post: add-empty-dirs add-empty-dirs: # Keep images directory in gui and templates, see renpy@d81ea29 ${FIND} ${WRKSRC} -type d -empty \ ! \( -name "saves" -or -name "pysdlsound" \) | \ ${SED} 's,^${WRKSRC},@dir ${DATADIR},' >>${TMPPLIST} post-install: common-post-install common-post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ -exec ${STRIP_CMD} {} + ${LN} -fs ../${DATADIR_REL}/renpy.py \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDATA}" ${STAGEDIR}${DATADIR} \ "! -name *.orig ! -name *.bak \ ! -name saves ! -name log.txt") ${CHMOD} +x ${STAGEDIR}${DATADIR}/renpy.py post-install-DOCS-on: (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR} \ "! -name *.orig ! -name *.bak") .include Index: head/games/renpy/distinfo =================================================================== --- head/games/renpy/distinfo (revision 479525) +++ head/games/renpy/distinfo (revision 479526) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527821217 -SHA256 (renpy-7.0.0-sdk.tar.bz2) = 548561684b4e800c5aa349f9fae0371789c462dc3ede4ffd60ef45d3df1cc384 -SIZE (renpy-7.0.0-sdk.tar.bz2) = 92106485 +TIMESTAMP = 1536624118 +SHA256 (renpy-7.1.0-sdk.tar.bz2) = 1ea30273e3c7eaf7f3c974b622a21618a8e96143d181178cb321bf9878d89b27 +SIZE (renpy-7.1.0-sdk.tar.bz2) = 92329790 Index: head/games/renpy/files/patch-system-fribidi =================================================================== --- head/games/renpy/files/patch-system-fribidi (nonexistent) +++ head/games/renpy/files/patch-system-fribidi (revision 479526) @@ -0,0 +1,57 @@ +Partially revert 4a9efc0cab7d as module/fribidi-src/ is missing from source archive. + +gen/_renpybidi.c:564:10: fatal error: 'fribidi.h' file not found +#include "fribidi.h" + ^ + +--- module/renpybidicore.c.orig 2018-07-11 04:11:19 UTC ++++ module/renpybidicore.c +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + + #ifndef alloca +--- module/setup.py.orig 2018-07-11 04:29:32 UTC ++++ module/setup.py +@@ -92,6 +92,7 @@ has_avresample = library("avresample", optional=True) + has_swresample = library("swresample", optional=True) + has_swscale = library("swscale", optional=True) + library("freetype") ++has_fribidi = include("fribidi.h", directory="fribidi", optional=True) and library("fribidi", optional=True) + library("z") + has_libglew = library("GLEW", optional=True) + has_libglew32 = library("glew32", optional=True) +@@ -105,6 +106,16 @@ else: + sdl = [ 'SDL2' ] + png = 'png' + ++ ++if has_fribidi and (not android) and (not ios): ++ try: ++ # Some versions of fribidi require glib, and it doesn't hurt to include it in ++ # our path. ++ glib_flags = subprocess.check_output(["pkg-config", "--cflags", "glib-2.0"]) ++ setuplib.extra_compile_args.extend(glib_flags.split()) ++ except: ++ pass ++ + steam_sdk = os.environ.get("RENPY_STEAM_SDK", None) + steam_platform = os.environ.get("RENPY_STEAM_PLATFORM", "") + +@@ -134,11 +145,12 @@ renpybidicore.c + """.split() + cython( + "_renpybidi", +- FRIBIDI_SOURCES, +- includes=[ ++ has_fribidi and [ i for i in FRIBIDI_SOURCES if 'fribidi-src' not in i ] or FRIBIDI_SOURCES, ++ includes=has_fribidi and [] or [ + BASE + "/fribidi-src/", + BASE + "/fribidi-src/lib/", + ], ++ libs=has_fribidi and ['fribidi'] or [], + define_macros=[ + ("FRIBIDI_ENTRY", ""), + ("HAVE_CONFIG_H", "1"), Property changes on: head/games/renpy/files/patch-system-fribidi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property