[packages/hhvm] - fix building with libvpx 1.4.x - rel 2
baggins
baggins at pld-linux.org
Sun May 24 10:06:02 CEST 2015
commit c77f551ca2b37eccdb1d6da435884ad3650ba113
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun May 24 10:05:45 2015 +0200
- fix building with libvpx 1.4.x
- rel 2
hhvm.spec | 4 +++-
libvpx2.patch | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 4c63a97..40b7350 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -35,7 +35,7 @@ Name: hhvm
# we prefer LTS versions
# see http://hhvm.com/blog/6083/hhvm-long-term-support
Version: 3.3.5
-Release: 1
+Release: 2
License: PHP 3.01 and BSD
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -53,6 +53,7 @@ Patch2: hphpize.patch
Patch3: MAX.patch
Patch4: system-thirdparty.patch
Patch5: cmake.patch
+Patch6: libvpx2.patch
URL: https://github.com/facebook/hhvm/wiki
BuildRequires: ImageMagick-devel
BuildRequires: a52dec-libs-devel
@@ -259,6 +260,7 @@ mv folly-* third-party/folly/src
%patch3 -p1
%patch4 -p1
#%patch5 -p1
+%patch6 -p1
# prefer ones from system
rm CMake/FindBISON.cmake
diff --git a/libvpx2.patch b/libvpx2.patch
new file mode 100644
index 0000000..f7c2781
--- /dev/null
+++ b/libvpx2.patch
@@ -0,0 +1,24 @@
+--- hhvm-HHVM-3.3.5/hphp/runtime/ext/gd/libgd/webpimg.cpp~ 2015-03-04 22:47:09.000000000 +0100
++++ hhvm-HHVM-3.3.5/hphp/runtime/ext/gd/libgd/webpimg.cpp 2015-05-24 10:04:28.014496157 +0200
+@@ -705,14 +705,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);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/c77f551ca2b37eccdb1d6da435884ad3650ba113
More information about the pld-cvs-commit
mailing list