Date: Sat, 19 Nov 2016 17:03:37 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426407 - in head/graphics/php5-ffmpeg: . files Message-ID: <201611191703.uAJH3bQp065742@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Nov 19 17:03:37 2016 New Revision: 426407 URL: https://svnweb.freebsd.org/changeset/ports/426407 Log: - Pet portlint - Rename patch files Added: head/graphics/php5-ffmpeg/files/patch-ffmpeg_frame.c - copied unchanged from r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__frame.c head/graphics/php5-ffmpeg/files/patch-ffmpeg_movie.c - copied unchanged from r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__movie.c head/graphics/php5-ffmpeg/files/patch-ffmpeg_tools.c - copied unchanged from r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__tools.c Deleted: head/graphics/php5-ffmpeg/files/patch-ffmpeg__frame.c head/graphics/php5-ffmpeg/files/patch-ffmpeg__movie.c head/graphics/php5-ffmpeg/files/patch-ffmpeg__tools.c Modified: head/graphics/php5-ffmpeg/Makefile Modified: head/graphics/php5-ffmpeg/Makefile ============================================================================== --- head/graphics/php5-ffmpeg/Makefile Sat Nov 19 17:03:31 2016 (r426406) +++ head/graphics/php5-ffmpeg/Makefile Sat Nov 19 17:03:37 2016 (r426407) @@ -3,8 +3,8 @@ PORTNAME= ffmpeg PORTVERSION= 0.6.0.20120114 -PORTREVISION= 2 DISTVERSIONPREFIX= php- +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= LOCAL/sunpoet PKGNAMEPREFIX= php5- Copied: head/graphics/php5-ffmpeg/files/patch-ffmpeg_frame.c (from r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__frame.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php5-ffmpeg/files/patch-ffmpeg_frame.c Sat Nov 19 17:03:37 2016 (r426407, copy of r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__frame.c) @@ -0,0 +1,20 @@ +--- ffmpeg_frame.c.orig 2014-07-23 17:57:32 UTC ++++ ffmpeg_frame.c +@@ -499,7 +499,7 @@ int _php_resample_frame(ff_frame_context + } + + /* convert to PIX_FMT_YUV420P required for resampling */ +- _php_convert_frame(ff_frame, PIX_FMT_YUV420P); ++ _php_convert_frame(ff_frame, AV_PIX_FMT_YUV420P); + + img_resample_ctx = img_resample_full_init( + wanted_width, wanted_height, +@@ -511,7 +511,7 @@ int _php_resample_frame(ff_frame_context + } + + resampled_frame = avcodec_alloc_frame(); +- avpicture_alloc((AVPicture*)resampled_frame, PIX_FMT_YUV420P, ++ avpicture_alloc((AVPicture*)resampled_frame, AV_PIX_FMT_YUV420P, + wanted_width, wanted_height); + + img_resample(img_resample_ctx, (AVPicture*)resampled_frame, Copied: head/graphics/php5-ffmpeg/files/patch-ffmpeg_movie.c (from r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__movie.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php5-ffmpeg/files/patch-ffmpeg_movie.c Sat Nov 19 17:03:37 2016 (r426407, copy of r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__movie.c) @@ -0,0 +1,55 @@ +--- ffmpeg_movie.c.orig 2014-07-23 17:57:31 UTC ++++ ffmpeg_movie.c +@@ -315,7 +315,7 @@ FFMPEG_PHP_CONSTRUCTOR(ffmpeg_movie, __c + } + + if (persistent) { +- list_entry *le; ++ zend_rsrc_list_entry *le; + /* resolve the fully-qualified path name to use as the hash key */ + fullpath = expand_filepath(filename, NULL TSRMLS_CC); + +@@ -350,7 +350,7 @@ FFMPEG_PHP_CONSTRUCTOR(ffmpeg_movie, __c + } + + } else { /* no existing persistant movie, create one */ +- list_entry new_le; ++ zend_rsrc_list_entry new_le; + ffmovie_ctx = _php_alloc_ffmovie_ctx(1); + + if (_php_open_movie_file(ffmovie_ctx, filename)) { +@@ -364,7 +364,7 @@ FFMPEG_PHP_CONSTRUCTOR(ffmpeg_movie, __c + new_le.ptr = ffmovie_ctx; + + if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey, +- hashkey_length+1, (void *)&new_le, sizeof(list_entry), ++ hashkey_length+1, (void *)&new_le, sizeof(zend_rsrc_list_entry), + NULL)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Failed to register persistent resource"); +@@ -508,7 +508,7 @@ static AVCodecContext* _php_get_decoder_ + codec_id)); + + if (!decoder) { +- zend_error(E_ERROR, "Could not find decoder for %s", ++ zend_error(E_WARNING, "Could not find decoder for %s", + _php_get_filename(ffmovie_ctx)); + return NULL; + } +@@ -964,13 +964,15 @@ static const char* _php_get_codec_name(f + /* Copied from libavcodec/utils.c::avcodec_string */ + if (p) { + codec_name = p->name; ++/* + if (decoder_ctx->codec_id == CODEC_ID_MP3) { + if (decoder_ctx->sub_id == 2) + codec_name = "mp2"; + else if (decoder_ctx->sub_id == 1) + codec_name = "mp1"; + } +- } else if (decoder_ctx->codec_id == CODEC_ID_MPEG2TS) { ++ */ ++ } else if (decoder_ctx->codec_id == AV_CODEC_ID_MPEG2TS) { + /* fake mpeg2 transport stream codec (currently not registered) */ + codec_name = "mpeg2ts"; + } else if (decoder_ctx->codec_name[0] != '\0') { Copied: head/graphics/php5-ffmpeg/files/patch-ffmpeg_tools.c (from r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__tools.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/php5-ffmpeg/files/patch-ffmpeg_tools.c Sat Nov 19 17:03:37 2016 (r426407, copy of r426406, head/graphics/php5-ffmpeg/files/patch-ffmpeg__tools.c) @@ -0,0 +1,13 @@ +--- ffmpeg_tools.c.orig 2014-07-23 17:57:32 UTC ++++ ffmpeg_tools.c +@@ -98,8 +98,8 @@ ImgReSampleContext * img_resample_full_i + int srcSurface = (iwidth - rightBand - leftBand)* (iheight - topBand - bottomBand); + // We use bilinear when the source surface is big, and bicubic when the number of pixels to handle is less than 1 MPixels + s->context = sws_getContext(iwidth - rightBand - leftBand, +- iheight - topBand - bottomBand, PIX_FMT_YUV420P, owidth, oheight, +- PIX_FMT_YUV420P, srcSurface > 1024000 ? SWS_FAST_BILINEAR : SWS_BICUBIC, ++ iheight - topBand - bottomBand, AV_PIX_FMT_YUV420P, owidth, oheight, ++ AV_PIX_FMT_YUV420P, srcSurface > 1024000 ? SWS_FAST_BILINEAR : SWS_BICUBIC, + NULL, NULL, NULL); + if (s->context == NULL) { + av_free(s);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611191703.uAJH3bQp065742>