From owner-svn-ports-all@freebsd.org Tue Sep 6 23:45:00 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D26ABCD7E1; Tue, 6 Sep 2016 23:45:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 675FE682; Tue, 6 Sep 2016 23:45:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u86NixeQ087335; Tue, 6 Sep 2016 23:44:59 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u86NixDF087329; Tue, 6 Sep 2016 23:44:59 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609062344.u86NixDF087329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 6 Sep 2016 23:44:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421472 - in head: devel devel/renpy devel/renpy6 devel/renpy6/files games/katawa-shoujo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 23:45:00 -0000 Author: jbeich Date: Tue Sep 6 23:44:58 2016 New Revision: 421472 URL: https://svnweb.freebsd.org/changeset/ports/421472 Log: devel/renpy: add 6.18 slave for compatibility with games/katawa-shoujo PKGNAMESUFFIX is based on 6.99.11 being "the latest in a series of releases that will culminate in Ren'Py 7". Added: head/devel/renpy6/ head/devel/renpy6/Makefile (contents, props changed) head/devel/renpy6/distinfo (contents, props changed) head/devel/renpy6/files/ head/devel/renpy6/files/patch-module_ffdecode.c (contents, props changed) Modified: head/devel/Makefile (contents, props changed) head/devel/renpy/Makefile (contents, props changed) head/games/katawa-shoujo/Makefile (contents, props changed) Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Sep 6 23:44:44 2016 (r421471) +++ head/devel/Makefile Tue Sep 6 23:44:58 2016 (r421472) @@ -4783,6 +4783,7 @@ SUBDIR += relx SUBDIR += remake SUBDIR += renpy + SUBDIR += renpy6 SUBDIR += replay SUBDIR += rhtvision SUBDIR += rlog Modified: head/devel/renpy/Makefile ============================================================================== --- head/devel/renpy/Makefile Tue Sep 6 23:44:44 2016 (r421471) +++ head/devel/renpy/Makefile Tue Sep 6 23:44:58 2016 (r421472) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION= 6.99.11 +PORTVERSION?= 6.99.11 DISTVERSIONSUFFIX=-sdk -PORTREVISION= 0 +PORTREVISION?= 0 CATEGORIES= devel games MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ @@ -16,21 +16,25 @@ LICENSE_NAME_DejaVu= Bitstream Vera and 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 \ - cython:lang/cython +BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2 +BUILD_DEPENDS+= cython:lang/cython 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 +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2 +CONFLICTS_INSTALL?= ${PORTNAME}6-* + +.ifndef PKGNAMESUFFIX # Upstream tends to reroll distfiles before moving under /release/ PORTSCOUT= site:http://www.renpy.org/dl/release/ +.endif USES= python:2.7 shebangfix tar:bz2 USE_GL= glew USE_PYTHON= autoplist distutils -USE_SDL= sdl2 +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 @@ -66,9 +70,14 @@ LICENSE_FILE_${lic}= ${WRKSRC}/LICENSE.t LICENSE_PERMS_${lic}= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept . endfor +.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} Added: head/devel/renpy6/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/renpy6/Makefile Tue Sep 6 23:44:58 2016 (r421472) @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTVERSION= 6.18.3 +PORTREVISION= 0 +PKGNAMESUFFIX= 6 + +CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* + +MASTERDIR= ${.CURDIR}/../renpy +PATCHDIR= ${.CURDIR}/files +DISTINFO_FILE= ${.CURDIR}/distinfo + +PORTSCOUT= limit:^6\.18\.* + +BUILD_DEPENDS= ${PYGAME} +RUN_DEPENDS= ${PYGAME} + +USE_SDL= sdl + +post-patch: + @${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \ + ${WRKSRC}/launcher/game/project.rpy + +.include "${MASTERDIR}/Makefile" Added: head/devel/renpy6/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/renpy6/distinfo Tue Sep 6 23:44:58 2016 (r421472) @@ -0,0 +1,3 @@ +TIMESTAMP = 1473191823 +SHA256 (renpy-6.18.3-sdk.tar.bz2) = 0b2a45c510b60b07b414592e42590ae5e46f480b08380a257b08c21ca88b7f91 +SIZE (renpy-6.18.3-sdk.tar.bz2) = 46125089 Added: head/devel/renpy6/files/patch-module_ffdecode.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/renpy6/files/patch-module_ffdecode.c Tue Sep 6 23:44:58 2016 (r421472) @@ -0,0 +1,94 @@ +https://github.com/renpy/renpy/commit/2be0638 +https://github.com/renpy/renpy/commit/4aac7ca + +--- module/ffdecode.c.orig 2014-07-06 14:22:40 UTC ++++ module/ffdecode.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -101,8 +102,8 @@ typedef struct VideoState { + compensation */ + + #ifndef HAS_RESAMPLE +- uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ; +- uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ; ++ uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ; ++ uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ; + #else + uint8_t *audio_buf1; + #endif +@@ -573,7 +574,7 @@ static int video_refresh(void *opaque) + video_display(is); + } + +- av_free(vp->frame); ++ av_frame_free(&vp->frame); + vp->frame = NULL; + + is->first_frame = 0; +@@ -627,13 +628,13 @@ static void alloc_picture(void *opaque, + + pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4); + if (bytes[0] == 4 && bytes[1] == 1) { +- vp->fmt = PIX_FMT_ARGB; ++ vp->fmt = AV_PIX_FMT_ARGB; + } else if (bytes[0] == 4 && bytes[1] == 3) { +- vp->fmt = PIX_FMT_ABGR; ++ vp->fmt = AV_PIX_FMT_ABGR; + } else if (bytes[0] == 1) { +- vp->fmt = PIX_FMT_RGBA; ++ vp->fmt = AV_PIX_FMT_RGBA; + } else { +- vp->fmt = PIX_FMT_BGRA; ++ vp->fmt = AV_PIX_FMT_BGRA; + } + + pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255); +@@ -756,7 +757,7 @@ static int video_thread(void *arg) + double pts; + + for(;;) { +- frame = avcodec_alloc_frame(); ++ frame = av_frame_alloc(); + + while (is->paused && !is->videoq.abort_request) { + SDL_Delay(2); +@@ -816,10 +817,10 @@ static int audio_decode_frame(VideoState + int resample_changed, audio_resample; + + if (!is->frame) { +- if (!(is->frame = avcodec_alloc_frame())) ++ if (!(is->frame = av_frame_alloc())) + return AVERROR(ENOMEM); + } else +- avcodec_get_frame_defaults(is->frame); ++ av_frame_unref(is->frame); + + if (flush_complete) + break; +@@ -1231,9 +1232,9 @@ static int stream_component_open(VideoSt + /* prepare audio output */ + if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { + if (enc->channels > 0) { +- enc->request_channels = FFMIN(2, enc->channels); ++ enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels)); + } else { +- enc->request_channels = 2; ++ enc->request_channel_layout = av_get_default_channel_layout(2); + } + } + +@@ -1633,7 +1634,7 @@ void ffpy_stream_close(VideoState *is) + for(i=0; ipictq[i]; + if (vp->frame) { +- av_free(vp->frame); ++ av_frame_free(&vp->frame); + } + } + Modified: head/games/katawa-shoujo/Makefile ============================================================================== --- head/games/katawa-shoujo/Makefile Tue Sep 6 23:44:44 2016 (r421471) +++ head/games/katawa-shoujo/Makefile Tue Sep 6 23:44:58 2016 (r421472) @@ -3,7 +3,7 @@ PORTNAME= katawa-shoujo PORTVERSION= 1.3.1 DISTVERSIONSUFFIX=-[linux-x86][18161880] -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://dl.katawa-shoujo.com/gold_${PORTVERSION}/:game \ http://dl.katawa-shoujo.com/patches/:patch \ @@ -22,9 +22,7 @@ LICENSE_NAME= Creative Commons Attributi LICENSE_TEXT= See https://creativecommons.org/licenses/by-nc-nd/3.0/ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -RUN_DEPENDS= renpy:devel/renpy - -BROKEN= game/ui_settings.rpy:2: ValueError('list.remove(x): x not in list',) +RUN_DEPENDS= renpy6<6.99.11:devel/renpy6 USES= tar:bz2 NO_ARCH= yes