Date: Tue, 11 Sep 2018 13:44:47 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479526 - in head: devel/py-game_sdl2 games/renpy games/renpy/files Message-ID: <201809111344.w8BDilpY040373@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Sep 11 13:44:47 2018 New Revision: 479526 URL: https://svnweb.freebsd.org/changeset/ports/479526 Log: devel/renpy: update to 7.1.0 Changes: https://www.renpy.org/release/7.1.0 (see Announcment) Changes: https://www.renpy.org/doc/html/changelog.html#renpy-7-1 Added: head/games/renpy/files/patch-system-fribidi (contents, props changed) Modified: head/devel/py-game_sdl2/Makefile (contents, props changed) head/devel/py-game_sdl2/distinfo (contents, props changed) head/games/renpy/Makefile (contents, props changed) head/games/renpy/distinfo (contents, props changed) Modified: head/devel/py-game_sdl2/Makefile ============================================================================== --- head/devel/py-game_sdl2/Makefile Tue Sep 11 13:44:36 2018 (r479525) +++ head/devel/py-game_sdl2/Makefile Tue Sep 11 13:44:47 2018 (r479526) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 7.0.0 +PORTVERSION= 7.1.0 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO Modified: head/devel/py-game_sdl2/distinfo ============================================================================== --- head/devel/py-game_sdl2/distinfo Tue Sep 11 13:44:36 2018 (r479525) +++ head/devel/py-game_sdl2/distinfo Tue Sep 11 13:44:47 2018 (r479526) @@ -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 Modified: head/games/renpy/Makefile ============================================================================== --- head/games/renpy/Makefile Tue Sep 11 13:44:36 2018 (r479525) +++ head/games/renpy/Makefile Tue Sep 11 13:44:47 2018 (r479526) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 7.0.0 +PORTVERSION?= 7.1.0 DISTVERSIONSUFFIX=-sdk PORTREVISION?= 0 CATEGORIES= games devel Modified: head/games/renpy/distinfo ============================================================================== --- head/games/renpy/distinfo Tue Sep 11 13:44:36 2018 (r479525) +++ head/games/renpy/distinfo Tue Sep 11 13:44:47 2018 (r479526) @@ -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 Added: head/games/renpy/files/patch-system-fribidi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/renpy/files/patch-system-fribidi Tue Sep 11 13:44:47 2018 (r479526) @@ -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 <Python.h> +-#include <fribidi-src/lib/fribidi.h> ++#include <fribidi.h> + #include <stdlib.h> + + #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"),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809111344.w8BDilpY040373>