Merge pull request #2187 from jprjr/update-php

Update php to 5.6.11
This commit is contained in:
Juan RP 2015-08-05 15:51:59 +02:00
commit 186b402aa2
2 changed files with 3 additions and 27 deletions

View file

@ -1,24 +0,0 @@
--- ext/gd/libgd/webpimg.c.orig 2015-04-10 17:33:03.864937281 +0300
+++ ext/gd/libgd/webpimg.c 2015-04-10 17:33:32.089873980 +0300
@@ -706,14 +706,14 @@
codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
- vpx_img_wrap(&img, IMG_FMT_I420,
+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
y_width, y_height, 16, (uint8*)(Y));
- img.planes[PLANE_Y] = (uint8*)(Y);
- img.planes[PLANE_U] = (uint8*)(U);
- img.planes[PLANE_V] = (uint8*)(V);
- img.stride[PLANE_Y] = y_stride;
- img.stride[PLANE_U] = uv_stride;
- img.stride[PLANE_V] = uv_stride;
+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
+ img.planes[VPX_PLANE_U] = (uint8*)(U);
+ img.planes[VPX_PLANE_V] = (uint8*)(V);
+ img.stride[VPX_PLANE_Y] = y_stride;
+ img.stride[VPX_PLANE_U] = uv_stride;
+ img.stride[VPX_PLANE_V] = uv_stride;
res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);

View file

@ -1,7 +1,7 @@
# Template build file for 'php'
pkgname=php
version=5.6.9
revision=3
version=5.6.11
revision=1
short_desc="An HTML-embedded scripting language"
license="PHP"
homepage="http://www.php.net"
@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel
readline-devel libmysqlclient-devel"
conf_files="/etc/php/php.ini"
distfiles="http://www.php.net/distributions/php-${version}.tar.gz"
checksum=49527ba66357fe65bcd463dfb8dcff1b8879419f88b3c334f50696a2aceacb87
checksum=85916b46c0d1f2a5315c84fb2773293f4084c3676ba4ed420d0432cbb60ff9d8
# Package build options
nocross=yes