[packages/hhvm/dev-3.12: 2/4] up to 3.9.1

glen glen at pld-linux.org
Tue Jun 28 00:30:03 CEST 2016 

commit cefab162d23ee9fd53962e94bd63b3e170ce24f1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Oct 6 19:48:37 2015 +0300

    up to 3.9.1

 disable-fastcgi.patch | 12 +++++++++---
 hhvm.spec             | 43 ++++++++++++++++++++++++-------------------
 libvpx-1.4.0.patch    | 50 --------------------------------------------------
 3 files changed, 33 insertions(+), 72 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index b8c11a2..7ac9b5b 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -28,33 +28,38 @@
 # hphp/system/idl/constants.idl.json defines it as 5.6.99-hhvm, but use some saner value
 %define		php_version			5.6.0
 
-# git show HHVM-3.6.6
-%define		githash	ead6875c956d4bd5e906ebea899c71c3b8a7182d
+# git show HHVM-3.9.1
+%define		githash	0f72cfc2f0a01fdfeb72fbcfeb247b72998a66db
 # these hashes are git submodules (be sure to check them on proper branch)
 # GIT_DIR=third-party/.git git log -1
 # note update to '054a1e7' includes only timezonedb update
-%define		thirdparty	3bf14f9
-%define		folly		0.26.0
+%define		thirdparty	5cfbd0e
+%define		folly		879db73
 %define		fbthrift	d30280a
+#define		fbthrift	b5635e3
 %define		webscalesql	004b6b3
+#define		webscalesql	04456ee
 %define		squangle	269cd2e
+#define		squangle	2661b7b
 %define		proxygen	d17b4e7
-%define		mcrouter	addcc91
+#define		proxygen	885e844
+%define		mcrouter	8303e73
+%define		wangle		6ce19ed
 Summary:	Virtual Machine, Runtime, and JIT for PHP
 Name:		hhvm
 # we prefer LTS versions, see
 # https://github.com/facebook/hhvm/wiki/Long-term-support-(LTS)
-# http://hhvm.com/blog/8849/hhvm-3-6-0
-Version:	3.6.6
+# http://hhvm.com/blog/9995/hhvm-3-9-0
+Version:	3.9.1
 Release:	0.1
 License:	PHP 3.01 and BSD
 Group:		Development/Languages
 Source0:	https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
-# Source0-md5:	beb306c94a0a0a07f54b1edc312a773d
-Source2:	https://github.com/facebook/folly/archive/v%{folly}/folly-%{folly}.tar.gz
-# Source2-md5:	c76a3fd2e86215d523a9fe18ba9087a1
+# Source0-md5:	8eaa29a6493c3e4485cc8a6c6d2d6bf3
+Source2:	https://github.com/facebook/folly/archive/%{folly}/folly-%{folly}.tar.gz
+# Source2-md5:	26bca264b28c61e31936d5f9d5a090fe
 Source3:	https://github.com/hhvm/hhvm-third-party/archive/%{thirdparty}/third_party-%{thirdparty}.tar.gz
-# Source3-md5:	494d37347bb6448ed514fd3dfacf7c88
+# Source3-md5:	4140d28d451bf8311149050a799cf200
 Source4:	https://github.com/facebook/fbthrift/archive/%{fbthrift}/fbthrift-%{fbthrift}.tar.gz
 # Source4-md5:	a049ddb82e4a94f1ff7a63e9a94008ac
 Source5:	https://github.com/webscalesql/webscalesql-5.6/archive/%{webscalesql}/webscalesql-5.6-%{webscalesql}.tar.gz
@@ -64,7 +69,9 @@ Source6:	https://github.com/facebook/squangle/archive/%{squangle}/squangle-%{squ
 Source7:	https://github.com/facebook/proxygen/archive/%{proxygen}/proxygen-%{proxygen}.tar.gz
 # Source7-md5:	0cc887c0055172f52aa18cba9d66159a
 Source8:	https://github.com/facebook/mcrouter/archive/%{mcrouter}/mcrouter-%{mcrouter}.tar.gz
-# Source8-md5:	7817451ce6bd6e4d74c6bb8b222a2ebb
+# Source8-md5:	578c6d503b4c1ef0e6cde909d8bd2743
+Source9:	https://github.com/facebook/wangle/archive/%{wangle}/wangle-%{wangle}.tar.gz
+# Source9-md5:	1fdbe3341fd215643c28da5868dab0f4
 Source10:	%{name}-fcgi.init
 Source11:	%{name}-fcgi.sysconfig
 Source12:	php.ini
@@ -75,7 +82,6 @@ Patch6:		webscalesql-5.6-build.patch
 Patch7:		disable-fastcgi.patch
 Patch8:		folly-malloc_usable_size.patch
 Patch10:	system-webscalesqlclient.patch
-Patch11:	libvpx-1.4.0.patch
 URL:		https://github.com/facebook/hhvm/wiki
 BuildRequires:	ImageMagick-devel
 BuildRequires:	a52dec-libs-devel
@@ -293,7 +299,7 @@ Requires:	gdb
 HHVM GDB Python bindings.
 
 %prep
-%setup -q -n %{name}-HHVM-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8
+%setup -q -n %{name}-HHVM-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9
 
 # handle git submodules
 rmdir third-party
@@ -304,20 +310,19 @@ rmdir third-party/thrift/src
 mv fbthrift-* third-party/thrift/src
 rmdir third-party/webscalesqlclient/webscalesql-5.6
 mv webscalesql-* third-party/webscalesqlclient/webscalesql-5.6
-rmdir third-party/squangle/squangle
-mv squangle-* third-party/squangle/squangle
+mv squangle-* third-party/squangle/src/squangle
 rmdir third-party/proxygen/src
 mv proxygen-* third-party/proxygen/src
-rmdir third-party/mcrouter/src/
+rmdir third-party/mcrouter/src
 mv mcrouter-* third-party/mcrouter/src
+mv wangle-* third-party/wangle/src/wangle
 
 %patch2 -p1
 #%patch5 -p1
 %patch6 -p1 -d third-party/webscalesqlclient/webscalesql-5.6
 %patch7 -p1
-%patch8 -p1 -d third-party
+#%patch8 -p1 -d third-party
 %patch10 -p1
-%patch11 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
diff --git a/disable-fastcgi.patch b/disable-fastcgi.patch
index 9f660a9..f00e9b5 100644
--- a/disable-fastcgi.patch
+++ b/disable-fastcgi.patch
@@ -3,8 +3,8 @@ it's not possible to to build with -DENABLE_FASTCGI=1
 this commit adds it unconditionally ON for Linux:
 https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
 
---- hhvm-HHVM-3.6.1/CMake/HPHPSetup.cmake~	2015-03-24 02:00:12.000000000 +0200
-+++ hhvm-HHVM-3.6.1/CMake/HPHPSetup.cmake	2015-04-06 09:50:54.551300775 +0300
+--- hhvm-HHVM-3.9.1/CMake/HPHPSetup.cmake~	2015-10-05 10:35:55.000000000 +0300
++++ hhvm-HHVM-3.9.1/CMake/HPHPSetup.cmake	2015-10-05 10:37:21.859232742 +0300
 @@ -19,7 +19,9 @@
  endif()
  
@@ -16,7 +16,7 @@ https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
    set(HHVM_ANCHOR_SYMS
      -Wl,-u,_register_fastcgi_server
      -Wl,-segaddr,__text,0
-@@ -28,11 +30,15 @@
+@@ -49,14 +49,20 @@
    set(HHVM_ANCHOR_SYMS
      -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive)
  elseif(CYGWIN)
@@ -26,6 +26,12 @@ https://github.com/facebook/hhvm/commit/773a4cd620820d8424756f6f8def466d179e5f8e
 +  endif()
    set(HHVM_ANCHOR_SYMS
    -Wl,--whole-archive ${HHVM_WHOLE_ARCHIVE_LIBRARIES} -Wl,--no-whole-archive)
+ elseif (MSVC)
+-  set(ENABLE_FASTCGI 0)
++  if(NOT DEFINED ENABLE_FASTCGI)
++    set(ENABLE_FASTCGI 0)
++  endif()
+   set(HHVM_ANCHOR_SYMS ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
  else()
 -  set(ENABLE_FASTCGI 1)
 +  if(NOT DEFINED ENABLE_FASTCGI)
diff --git a/libvpx-1.4.0.patch b/libvpx-1.4.0.patch
deleted file mode 100644
index 747d361..0000000
--- a/libvpx-1.4.0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/facebook/hhvm/pull/5191
-
-From a8cc58ea31e753663a59796ee973de0decbcd4b2 Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-Date: Mon, 4 May 2015 10:02:32 -0700
-Subject: [PATCH] Fix building gd extension with libvpx 1.4.0
-
-Summary: In libvpx 1.4.0 the compatibility layer for some of the older constants have been removed [1].
-The use of this constants was deprecated since 2010 in favor of the newer VPX_ prefixed names.
-The same issue as been reported in the php bugtracker [2].
-
-Thanks!
-
-[1] https://gerrit.chromium.org/gerrit/#/c/70164/3/vpx/vpx_image.h,unified
-[2] https://bugs.php.net/patch-display.php?bug_id=69479&patch=php-gd-newvpx.diff&revision=latest
-Closes https://github.com/facebook/hhvm/pull/5191
-
-Reviewed By: @fredemmott
-
-Differential Revision: D2005702
----
- hphp/runtime/ext/gd/libgd/webpimg.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/hphp/runtime/ext/gd/libgd/webpimg.cpp b/hphp/runtime/ext/gd/libgd/webpimg.cpp
-index 29dd633..0c1c3ba 100644
---- a/hphp/runtime/ext/gd/libgd/webpimg.cpp
-+++ b/hphp/runtime/ext/gd/libgd/webpimg.cpp
-@@ -705,14 +705,14 @@ static WebPResult VPXEncode(const uint8* Y,
-     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/aa0a559a8f8b20c8b1cd5f8c39def1b960e90070

More information about the pld-cvs-commit mailing list