186001 – devel/opencl: Upstream changes of the header files by Khronos enforces new hashes

FreeBSD Bugzilla – Bug 186001 devel/opencl: Upstream changes of the header files by Khronos enforces new hashes Last modified: 2014-02-09 11:51:02 UTC

Home
| New
| Browse
| Search
|

[?]
| Reports
| Help
| New Account
| Log In
Remember [x]
| Forgot Password
Login: [x]

Bug 186001 - devel/opencl: Upstream changes of the header files by Khronos enforces new hashes

Summary: devel/opencl: Upstream changes of the header files by Khronos enforces new h...

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	Thomas Zander

URL:
Keywords:

Depends on:
Blocks:

Reported:	2014-01-22 15:50 UTC by O. Hartmann
Modified:	2014-02-09 11:51 UTC (History)
CC List:	0 users

See Also:

Attachments
file.diff (2.29 KB, patch) 2014-01-22 15:50 UTC, O. Hartmann	no flags	Details \| Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description O. Hartmann 2014-01-22 15:50:00 UTC

Regarding a pkg-fallout on package build servers, an update of the hashes of some header files is required. Khronos changed some bytes, so the checksum mismatches.

Patch attached.

Fix: Patch attached with submission follows:

Comment 1 Edwin Groothuis freebsd_committer

freebsd_committer

freebsd_triage

2014-01-22 15:50:08 UTC

Class Changed
From-To: update->maintainer-update

Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool)

Comment 2 Thomas Zander freebsd_committer

freebsd_committer

freebsd_triage

2014-02-09 07:29:04 UTC

Responsible Changed
From-To: freebsd-ports-bugs->riggs

I'll take it.

Comment 3 dfilter service freebsd_committer

freebsd_committer

freebsd_triage

2014-02-09 11:16:20 UTC

Author: riggs
Date: Sun Feb  9 11:16:12 2014
New Revision: 343462
URL: http://svnweb.freebsd.org/changeset/ports/343462
QAT: https://qat.redports.org/buildarchive/r343462/

Log:
  - Fix build/install failure (upstream distfile contents have changed)
  - Bump PORTREVISION
  - Add LICENSE
  - Add WWW URL in pkg-descr
  
  PR:		ports/186001
  Submitted by:	O. Hartmann <ohartman@zedat.fu-berlin.de> (maintainer)
  Approved by:	thierry (mentor)
  MFH:		2014Q1

Modified:
  head/devel/opencl/Makefile
  head/devel/opencl/distinfo
  head/devel/opencl/files/patch-cl.hpp
  head/devel/opencl/pkg-descr

Modified: head/devel/opencl/Makefile
==============================================================================
--- head/devel/opencl/Makefile	Sun Feb  9 11:13:38 2014	(r343461)
+++ head/devel/opencl/Makefile	Sun Feb  9 11:16:12 2014	(r343462)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencl
 PORTVERSION=	1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
 DISTFILES=	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
@@ -14,6 +14,11 @@ EXTRACT_ONLY=
 MAINTAINER=	ohartman@zedat.fu-berlin.de
 COMMENT=	Open Computing Language (OpenCL) specifications V1.2 (header files)
 
+LICENSE=	unknown
+LICENSE_NAME=	BSD-esque license agreement
+LICENSE_TEXT=	License is included in each of the header files of this port
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 CONFLICTS=	opencl-1.[0-1]
 
 NO_BUILD=	yes

Modified: head/devel/opencl/distinfo
==============================================================================
--- head/devel/opencl/distinfo	Sun Feb  9 11:13:38 2014	(r343461)
+++ head/devel/opencl/distinfo	Sun Feb  9 11:16:12 2014	(r343462)
@@ -4,8 +4,8 @@ SHA256 (opencl/cl_platform.h) = e212b89b
 SIZE (opencl/cl_platform.h) = 41127
 SHA256 (opencl/cl.h) = a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa6e8b36d6ed52368
 SIZE (opencl/cl.h) = 61545
-SHA256 (opencl/cl_ext.h) = d23a11d1daebe39c6f5a9743f356bb58cdf0bf5a2019c723a6e2dc1e7dcb0360
-SIZE (opencl/cl_ext.h) = 13646
+SHA256 (opencl/cl_ext.h) = ab8dcf1e04ac63cc5a68fdfb4787a44a25a9c0c129ed7eda046e7911af3d4ebd
+SIZE (opencl/cl_ext.h) = 13766
 SHA256 (opencl/cl_dx9_media_sharing.h) = 26fb40bac8e229747bdc27b350b836e3703c1e946cb40893f4c8ab2289203920
 SIZE (opencl/cl_dx9_media_sharing.h) = 5157
 SHA256 (opencl/cl_d3d10.h) = c7adb38a19663ee240977afc64903f4638d9c5c03ca478793c9f7a15c1c6ac2b

Modified: head/devel/opencl/files/patch-cl.hpp
==============================================================================
--- head/devel/opencl/files/patch-cl.hpp	Sun Feb  9 11:13:38 2014	(r343461)
+++ head/devel/opencl/files/patch-cl.hpp	Sun Feb  9 11:16:12 2014	(r343462)
@@ -1,12 +1,11 @@
---- cl.hpp.orig	2013-09-01 13:35:56.642641000 +0000
-+++ cl.hpp
-@@ -210,11 +210,10 @@
+--- cl.hpp.orig	2013-08-20 13:33:04.000000000 +0200
++++ cl.hpp	2013-08-20 13:35:49.000000000 +0200
+@@ -210,11 +210,9 @@
  #include <string>
  #endif 
  
 -#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
-+#if defined(linux) || defined(__APPLE__) || defined(__MACOSX) \
-+ || defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(linux) || defined(__APPLE__) || defined(__MACOSX)
  #include <alloca.h>
  
 -#include <emmintrin.h>
@@ -14,7 +13,7 @@
  #endif // linux
  
  #include <cstring>
-@@ -1037,7 +1036,7 @@ namespace detail {
+@@ -1037,7 +1035,7 @@
  #endif // !_WIN32
      }
  
@@ -23,7 +22,7 @@
  }; // namespace detail
  
      
-@@ -2037,6 +2036,26 @@ public:
+@@ -2037,6 +2035,26 @@
  #endif // #if defined(CL_VERSION_1_1)
  };
  

Modified: head/devel/opencl/pkg-descr
==============================================================================
--- head/devel/opencl/pkg-descr	Sun Feb  9 11:13:38 2014	(r343461)
+++ head/devel/opencl/pkg-descr	Sun Feb  9 11:16:12 2014	(r343462)
@@ -4,3 +4,5 @@ other processors, giving software develo
 access to the power of these heterogeneous processing platforms. 
 
 This is OpenCL 1.2
+
+WWW: http://www.khronos.org/opencl/
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 4 dfilter service freebsd_committer

freebsd_committer

freebsd_triage

2014-02-09 11:49:05 UTC

Author: riggs
Date: Sun Feb  9 11:48:56 2014
New Revision: 343470
URL: http://svnweb.freebsd.org/changeset/ports/343470
QAT: https://qat.redports.org/buildarchive/r343470/

Log:
  MFH: r343462
  
  - Fix build/install failure (upstream distfile contents have changed)
  - Bump PORTREVISION
  - Add LICENSE
  - Add WWW URL in pkg-descr
  
  PR:		ports/186001
  Submitted by:	O. Hartmann <ohartman@zedat.fu-berlin.de> (maintainer)
  Approved by:	portmgr (antoine), thierry (mentor)

Modified:
  branches/2014Q1/devel/opencl/Makefile
  branches/2014Q1/devel/opencl/distinfo
  branches/2014Q1/devel/opencl/files/patch-cl.hpp
  branches/2014Q1/devel/opencl/pkg-descr
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/devel/opencl/Makefile
==============================================================================
--- branches/2014Q1/devel/opencl/Makefile	Sun Feb  9 11:47:22 2014	(r343469)
+++ branches/2014Q1/devel/opencl/Makefile	Sun Feb  9 11:48:56 2014	(r343470)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencl
 PORTVERSION=	1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.khronos.org/registry/cl/api/${PORTVERSION}/
 DISTFILES=	opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
@@ -14,6 +14,11 @@ EXTRACT_ONLY=
 MAINTAINER=	ohartman@zedat.fu-berlin.de
 COMMENT=	Open Computing Language (OpenCL) specifications V1.2 (header files)
 
+LICENSE=	unknown
+LICENSE_NAME=	BSD-esque license agreement
+LICENSE_TEXT=	License is included in each of the header files of this port
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 CONFLICTS=	opencl-1.[0-1]
 
 NO_BUILD=	yes

Modified: branches/2014Q1/devel/opencl/distinfo
==============================================================================
--- branches/2014Q1/devel/opencl/distinfo	Sun Feb  9 11:47:22 2014	(r343469)
+++ branches/2014Q1/devel/opencl/distinfo	Sun Feb  9 11:48:56 2014	(r343470)
@@ -4,8 +4,8 @@ SHA256 (opencl/cl_platform.h) = e212b89b
 SIZE (opencl/cl_platform.h) = 41127
 SHA256 (opencl/cl.h) = a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa6e8b36d6ed52368
 SIZE (opencl/cl.h) = 61545
-SHA256 (opencl/cl_ext.h) = d23a11d1daebe39c6f5a9743f356bb58cdf0bf5a2019c723a6e2dc1e7dcb0360
-SIZE (opencl/cl_ext.h) = 13646
+SHA256 (opencl/cl_ext.h) = ab8dcf1e04ac63cc5a68fdfb4787a44a25a9c0c129ed7eda046e7911af3d4ebd
+SIZE (opencl/cl_ext.h) = 13766
 SHA256 (opencl/cl_dx9_media_sharing.h) = 26fb40bac8e229747bdc27b350b836e3703c1e946cb40893f4c8ab2289203920
 SIZE (opencl/cl_dx9_media_sharing.h) = 5157
 SHA256 (opencl/cl_d3d10.h) = c7adb38a19663ee240977afc64903f4638d9c5c03ca478793c9f7a15c1c6ac2b

Modified: branches/2014Q1/devel/opencl/files/patch-cl.hpp
==============================================================================
--- branches/2014Q1/devel/opencl/files/patch-cl.hpp	Sun Feb  9 11:47:22 2014	(r343469)
+++ branches/2014Q1/devel/opencl/files/patch-cl.hpp	Sun Feb  9 11:48:56 2014	(r343470)
@@ -1,12 +1,11 @@
---- cl.hpp.orig	2013-09-01 13:35:56.642641000 +0000
-+++ cl.hpp
-@@ -210,11 +210,10 @@
+--- cl.hpp.orig	2013-08-20 13:33:04.000000000 +0200
++++ cl.hpp	2013-08-20 13:35:49.000000000 +0200
+@@ -210,11 +210,9 @@
  #include <string>
  #endif 
  
 -#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
-+#if defined(linux) || defined(__APPLE__) || defined(__MACOSX) \
-+ || defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(linux) || defined(__APPLE__) || defined(__MACOSX)
  #include <alloca.h>
  
 -#include <emmintrin.h>
@@ -14,7 +13,7 @@
  #endif // linux
  
  #include <cstring>
-@@ -1037,7 +1036,7 @@ namespace detail {
+@@ -1037,7 +1035,7 @@
  #endif // !_WIN32
      }
  
@@ -23,7 +22,7 @@
  }; // namespace detail
  
      
-@@ -2037,6 +2036,26 @@ public:
+@@ -2037,6 +2035,26 @@
  #endif // #if defined(CL_VERSION_1_1)
  };
  

Modified: branches/2014Q1/devel/opencl/pkg-descr
==============================================================================
--- branches/2014Q1/devel/opencl/pkg-descr	Sun Feb  9 11:47:22 2014	(r343469)
+++ branches/2014Q1/devel/opencl/pkg-descr	Sun Feb  9 11:48:56 2014	(r343470)
@@ -4,3 +4,5 @@ other processors, giving software develo
 access to the power of these heterogeneous processing platforms. 
 
 This is OpenCL 1.2
+
+WWW: http://www.khronos.org/opencl/
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 5 Thomas Zander freebsd_committer

freebsd_committer

freebsd_triage

2014-02-09 11:51:02 UTC

State Changed
From-To: open->closed

Committed, with minor changes: Add LICENSE and project URL in pkg-descr. 
Thanks!