Bug 213213 - multimedia/php-pHash: Fix for PHP 7
Summary: multimedia/php-pHash: Fix for PHP 7
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Jan Beich
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2016-10-04 23:59 UTC by Naram Qashat
Modified: 2016-11-05 19:29 UTC (History)
0 users

See Also:


Attachments
php-pHash-fixForPHP7.patch (9.65 KB, patch)
2016-10-04 23:59 UTC, Naram Qashat
cyberbotx: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Naram Qashat 2016-10-04 23:59:20 UTC
Created attachment 175430 [details]
php-pHash-fixForPHP7.patch

* Update files/patch-pHash.cpp
* Add files/patch-php__pHash.h

Having just got around to actually updating to PHP 7 on my own system, I found that the pHash PHP extension didn't build with PHP 7. This corrects that.
Comment 1 commit-hook freebsd_committer freebsd_triage 2016-11-05 19:26:23 UTC
A commit references this bug:

Author: jbeich
Date: Sat Nov  5 19:25:47 UTC 2016
New revision: 425436
URL: https://svnweb.freebsd.org/changeset/ports/425436

Log:
  multimedia/php-pHash: unbreak build with lang/php70

  In file included from bindings/php/pHash.cpp:17:
  In file included from ./php_pHash.h:28:
  In file included from /usr/local/include/php/main/php.h:35:
  In file included from /usr/local/include/php/Zend/zend.h:36:
  bindings/php/pHash.cpp:51:36: error:
        unknown type name 'zend_rsrc_list_entry'
  extern "C" void ph_video_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
                                     ^
  bindings/php/pHash.cpp:260:18: error: use of
        undeclared identifier 'ZEND_REGISTER_RESOURCE'
          return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_video_hash);
                          ^
  bindings/php/pHash.cpp:397:26: error:
        unexpected type name 'ulong64': expected expression
          ZEND_FETCH_RESOURCE(h1, ulong64 *, &h1_res, h1_resid, "ph_image_hash", le_ph_image_hash);
                                  ^
  [...]

  PR:		213213
  Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)

Changes:
  head/multimedia/php-pHash/files/patch-pHash.cpp
  head/multimedia/php-pHash/files/patch-php__pHash.h
Comment 2 Jan Beich freebsd_committer freebsd_triage 2016-11-05 19:27:11 UTC
Thanks. Landed.
Comment 3 commit-hook freebsd_committer freebsd_triage 2016-11-05 19:29:27 UTC
A commit references this bug:

Author: jbeich
Date: Sat Nov  5 19:28:33 UTC 2016
New revision: 425439
URL: https://svnweb.freebsd.org/changeset/ports/425439

Log:
  MFH: r425436

  multimedia/php-pHash: unbreak build with lang/php70

  In file included from bindings/php/pHash.cpp:17:
  In file included from ./php_pHash.h:28:
  In file included from /usr/local/include/php/main/php.h:35:
  In file included from /usr/local/include/php/Zend/zend.h:36:
  bindings/php/pHash.cpp:51:36: error:
        unknown type name 'zend_rsrc_list_entry'
  extern "C" void ph_video_hash_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
                                     ^
  bindings/php/pHash.cpp:260:18: error: use of
        undeclared identifier 'ZEND_REGISTER_RESOURCE'
          return_res_id = ZEND_REGISTER_RESOURCE(return_value, return_res, le_ph_video_hash);
                          ^
  bindings/php/pHash.cpp:397:26: error:
        unexpected type name 'ulong64': expected expression
          ZEND_FETCH_RESOURCE(h1, ulong64 *, &h1_res, h1_resid, "ph_image_hash", le_ph_image_hash);
                                  ^
  [...]

  PR:		213213
  Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
  Approved by:	ports-secteam blanket

Changes:
_U  branches/2016Q4/
  branches/2016Q4/multimedia/php-pHash/files/patch-pHash.cpp
  branches/2016Q4/multimedia/php-pHash/files/patch-php__pHash.h