[113022] trunk/dports/python/py-pyopencl

[ryandesign at macports.org]

Revision: 113022
          https://trac.macports.org/changeset/113022
Author:   ryandesign at macports.org
Date:     2013-11-06 17:25:13 -0800 (Wed, 06 Nov 2013)
Log Message:
-----------
py-pyopencl: update to 2013.2

Modified Paths:
--------------
    trunk/dports/python/py-pyopencl/Portfile

Removed Paths:
-------------
    trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff
    trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff

Modified: trunk/dports/python/py-pyopencl/Portfile
===================================================================
--- trunk/dports/python/py-pyopencl/Portfile	2013-11-07 01:19:49 UTC (rev 113021)
+++ trunk/dports/python/py-pyopencl/Portfile	2013-11-07 01:25:13 UTC (rev 113022)
@@ -5,8 +5,7 @@
 PortGroup           python 1.0
 
 name                py-pyopencl
-version             2012.1
-revision            0
+version             2013.2
 categories-append   science
 license             MIT
 platforms           darwin
@@ -24,18 +23,16 @@
 
 distname            pyopencl-${version}
 
-checksums           rmd160  bd4f5776ee7bd5393a8a46b4682d1e757372cc38 \
-                    sha256  823c9af3540ab84221acf7978bf688d98c7635e19d6bdb4d6818c48235184297
+checksums           rmd160  ad0d599183bd068db939e4eb1522d7887b4d9073 \
+                    sha256  f8e4218e4e47d397886f5dabde16a4d8dcc12caa0cb16ec68cae31f89c94d918
 
 patch.pre_args      -p1
-patchfiles          patch-setup.py.diff \
-                    patch-aksetup_helper.py.diff \
-                    patch-clCreateProgramWithBuiltInKernels.diff
+patchfiles          patch-setup.py.diff
 
 # Skipping 31 because there's no py31-mako
 python.versions     26 27 32 33
 
-if {${subport} != ${name}} {
+if {${subport} ne ${name}} {
     depends_build-append \
                         port:py${python.version}-setuptools \
                         port:py${python.version}-numpy \

Deleted: trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff
===================================================================
--- trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff	2013-11-07 01:19:49 UTC (rev 113021)
+++ trunk/dports/python/py-pyopencl/files/patch-aksetup_helper.py.diff	2013-11-07 01:25:13 UTC (rev 113022)
@@ -1,38 +0,0 @@
-From 7f7fa90c69781616ee448778e65336e368670452 Mon Sep 17 00:00:00 2001
-From: Andreas Kloeckner <inform at tiker.net>
-Date: Wed, 1 Aug 2012 01:39:17 -0400
-Subject: [PATCH 1/1] Update aksetup to preserve commas in StringListOption defaults.
-
----
- aksetup_helper.py |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/aksetup_helper.py b/aksetup_helper.py
-index cafdad6..12953df 100644
---- a/aksetup_helper.py
-+++ b/aksetup_helper.py
-@@ -486,7 +486,7 @@ class StringListOption(Option):
-         if default is None:
-             return None
- 
--        return ",".join([str(el) for el in default])
-+        return ",".join([str(el).replace(",", r"\,") for el in default])
- 
-     def get_help(self, default):
-         return Option.get_help(self, default) + " (several ok)"
-@@ -497,7 +497,11 @@ class StringListOption(Option):
-             return None
-         else:
-             if opt:
--                return opt.split(",")
-+                import re
-+                sep = re.compile(r"(?<!\\),")
-+                result = sep.split(opt)
-+                result = [i.replace(r"\,", ",") for i in result]
-+                return result
-             else:
-                 return []
- 
--- 
-1.7.2.5
-

Deleted: trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff
===================================================================
--- trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff	2013-11-07 01:19:49 UTC (rev 113021)
+++ trunk/dports/python/py-pyopencl/files/patch-clCreateProgramWithBuiltInKernels.diff	2013-11-07 01:25:13 UTC (rev 113022)
@@ -1,54 +0,0 @@
-From a6294d0b7a0bae75c67598426b0b2264b018c2cb Mon Sep 17 00:00:00 2001
-From: Andreas Kloeckner <inform at tiker.net>
-Date: Sat, 28 Jul 2012 16:18:52 -0400
-Subject: [PATCH 1/1] Don't expose clCreateProgramWithBuiltInKernels on Apple CL 1.2.
-
-(reported by Bogdan Opanchuk)
----
- src/wrapper/wrap_cl.hpp        |    5 ++++-
- src/wrapper/wrap_cl_part_2.cpp |    3 ++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/wrapper/wrap_cl.hpp b/src/wrapper/wrap_cl.hpp
-index 90c9a3f..9efedf7 100644
---- a/src/wrapper/wrap_cl.hpp
-+++ b/src/wrapper/wrap_cl.hpp
-@@ -3006,7 +3006,8 @@ namespace pyopencl
- 
- 
- 
--#if PYOPENCL_CL_VERSION >= 0x1020
-+#if (PYOPENCL_CL_VERSION >= 0x1020) && \
-+      ((PYOPENCL_CL_VERSION >= 0x1030) && defined(__APPLE__))
-   inline
-   program *create_program_with_built_in_kernels(
-       context &ctx,
-@@ -3033,9 +3034,11 @@ namespace pyopencl
-       throw;
-     }
-   }
-+#endif
- 
- 
- 
-+#if PYOPENCL_CL_VERSION >= 0x1020
-   inline
-   program *link_program(
-       context &ctx,
-diff --git a/src/wrapper/wrap_cl_part_2.cpp b/src/wrapper/wrap_cl_part_2.cpp
-index 3205c2e..cc7942c 100644
---- a/src/wrapper/wrap_cl_part_2.cpp
-+++ b/src/wrapper/wrap_cl_part_2.cpp
-@@ -196,7 +196,8 @@ void pyopencl_expose_part_2()
-             create_program_with_binary,
-             py::default_call_policies(),
-             py::args("context", "devices", "binaries")))
--#if PYOPENCL_CL_VERSION >= 0x1020
-+#if (PYOPENCL_CL_VERSION >= 0x1020) && \
-+      ((PYOPENCL_CL_VERSION >= 0x1030) && defined(__APPLE__))
-       .def("create_with_built_in_kernels",
-           create_program_with_built_in_kernels,
-           py::args("context", "devices", "kernel_names"),
--- 
-1.7.2.5
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131106/9909bdc5/attachment.html>