diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2015-04-17 04:55:28 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2015-04-17 04:55:28 +0000 |
| commit | 8b4d99c63bed57657ac585daca19a7dc1860ef82 (patch) | |
| tree | 035739157b0b546e30e3cab968119a457e702540 /dev-lang | |
| parent | Stable for HPPA (bug #543480). (diff) | |
| download | gentoo-2-8b4d99c63bed57657ac585daca19a7dc1860ef82.tar.gz gentoo-2-8b4d99c63bed57657ac585daca19a7dc1860ef82.tar.bz2 gentoo-2-8b4d99c63bed57657ac585daca19a7dc1860ef82.zip | |
Fix build with libvpx-1.4.0, bug #545952. Patch by Canarau Constantin.
(Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/php-libvpx.patch | 24 | ||||
| -rw-r--r-- | dev-lang/php/php-5.6.7.ebuild | 5 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index e74250e758ae..d4aab1f4a6fb 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.952 2015/04/05 22:15:41 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.953 2015/04/17 04:55:28 phajdan.jr Exp $ + + 17 Apr 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.6.7.ebuild, + +files/php-libvpx.patch: + Fix build with libvpx-1.4.0, bug #545952. Patch by Canarau Constantin. 05 Apr 2015; Sebastian Pipping <sping@gentoo.org> php-5.3.29.ebuild, php-5.4.36.ebuild, php-5.4.37.ebuild, php-5.4.38.ebuild, php-5.4.39.ebuild, diff --git a/dev-lang/php/files/php-libvpx.patch b/dev-lang/php/files/php-libvpx.patch new file mode 100644 index 000000000000..e23ae0efa534 --- /dev/null +++ b/dev-lang/php/files/php-libvpx.patch @@ -0,0 +1,24 @@ +--- 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); + diff --git a/dev-lang/php/php-5.6.7.ebuild b/dev-lang/php/php-5.6.7.ebuild index b7ed55d01c92..0b75c0b49526 100644 --- a/dev-lang/php/php-5.6.7.ebuild +++ b/dev-lang/php/php-5.6.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.7.ebuild,v 1.3 2015/04/05 22:15:41 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.7.ebuild,v 1.4 2015/04/17 04:55:28 phajdan.jr Exp $ EAPI=5 @@ -308,6 +308,9 @@ src_prepare() { || die "Failed to fix heimdal crypt library reference" fi + # Fix build with libvpx-1.4.0, bug #545952 . + epatch "${FILESDIR}/${PN}-libvpx.patch" + #Add user patches #357637 epatch_user |