[57504] trunk/dports/python
mmoll at macports.org
mmoll at macports.org
Fri Sep 11 13:33:17 PDT 2009
Revision: 57504
http://trac.macports.org/changeset/57504
Author: mmoll at macports.org
Date: 2009-09-11 13:33:13 -0700 (Fri, 11 Sep 2009)
Log Message:
-----------
py2[56]-tables: fix bug in compression filters. closes #21295.
Modified Paths:
--------------
trunk/dports/python/py25-tables/Portfile
trunk/dports/python/py26-tables/Portfile
Added Paths:
-----------
trunk/dports/python/py25-tables/files/
trunk/dports/python/py25-tables/files/patch-H5Z.diff
trunk/dports/python/py26-tables/files/
trunk/dports/python/py26-tables/files/patch-H5Z.diff
Modified: trunk/dports/python/py25-tables/Portfile
===================================================================
--- trunk/dports/python/py25-tables/Portfile 2009-09-11 19:53:44 UTC (rev 57503)
+++ trunk/dports/python/py25-tables/Portfile 2009-09-11 20:33:13 UTC (rev 57504)
@@ -21,7 +21,7 @@
checksums md5 fce2100e655e91849b3d73f22274b0c4 \
sha1 fc13f8b02e07f753800ccf7a546c8803d50b0409 \
rmd160 ec18e21ed15921f342ba0c9943782034a2356db4
-
+patchfiles patch-H5Z.diff
depends_lib-append port:hdf5-18 \
port:py25-numpy \
port:zlib \
Added: trunk/dports/python/py25-tables/files/patch-H5Z.diff
===================================================================
--- trunk/dports/python/py25-tables/files/patch-H5Z.diff (rev 0)
+++ trunk/dports/python/py25-tables/files/patch-H5Z.diff 2009-09-11 20:33:13 UTC (rev 57504)
@@ -0,0 +1,62 @@
+Index: src/H5Zbzip2.c
+===================================================================
+--- src/H5Zbzip2.c (revision 2381)
++++ src/H5Zbzip2.c (revision 4143)
+@@ -23,5 +23,11 @@
+ char *libver, *versionp, *datep, *sep;
+
+-#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7
++/* The conditional below is somewhat messy, but it is necessary because
++ the THG team has decided to fix an API inconsistency in the definition
++ of the H5Z_class_t structure in version 1.8.3 */
++#if (H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7) || \
++ (H5_USE_16_API && (H5_VERS_MAJOR > 1 || \
++ (H5_VERS_MAJOR == 1 && (H5_VERS_MINOR > 8 || \
++ (H5_VERS_MINOR == 8 && H5_VERS_RELEASE >= 3)))))
+ /* 1.6.x */
+ H5Z_class_t filter_class = {
+@@ -33,5 +39,5 @@
+ };
+ #else
+- /* 1.7.x */
++ /* 1.8.x where x < 3 */
+ H5Z_class_t filter_class = {
+ H5Z_CLASS_T_VERS, /* H5Z_class_t version */
+@@ -43,5 +49,5 @@
+ (H5Z_func_t)(bzip2_deflate) /* filter_func */
+ };
+-#endif /* if H5_VERSION < "1.7" */
++#endif
+
+ /* Register the filter class for the bzip2 compressor. */
+Index: src/H5Zlzo.c
+===================================================================
+--- src/H5Zlzo.c (revision 3695)
++++ src/H5Zlzo.c (revision 4143)
+@@ -43,5 +43,11 @@
+ #ifdef HAVE_LZO_LIB
+
+-#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7
++/* The conditional below is somewhat messy, but it is necessary because
++ the THG team has decided to fix an API inconsistency in the definition
++ of the H5Z_class_t structure in version 1.8.3 */
++#if (H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7) || \
++ (H5_USE_16_API && (H5_VERS_MAJOR > 1 || \
++ (H5_VERS_MAJOR == 1 && (H5_VERS_MINOR > 8 || \
++ (H5_VERS_MINOR == 8 && H5_VERS_RELEASE >= 3)))))
+ /* 1.6.x */
+ H5Z_class_t filter_class = {
+@@ -53,5 +59,5 @@
+ };
+ #else
+- /* 1.7.x */
++ /* 1.8.x where x < 3 */
+ H5Z_class_t filter_class = {
+ H5Z_CLASS_T_VERS, /* H5Z_class_t version */
+@@ -63,5 +69,5 @@
+ (H5Z_func_t)(lzo_deflate) /* filter_func */
+ };
+-#endif /* if H5_VERSION < "1.7" */
++#endif
+
+ /* Init the LZO library */
Modified: trunk/dports/python/py26-tables/Portfile
===================================================================
--- trunk/dports/python/py26-tables/Portfile 2009-09-11 19:53:44 UTC (rev 57503)
+++ trunk/dports/python/py26-tables/Portfile 2009-09-11 20:33:13 UTC (rev 57504)
@@ -21,7 +21,7 @@
checksums md5 fce2100e655e91849b3d73f22274b0c4 \
sha1 fc13f8b02e07f753800ccf7a546c8803d50b0409 \
rmd160 ec18e21ed15921f342ba0c9943782034a2356db4
-
+patchfiles patch-H5Z.diff
depends_lib-append port:hdf5-18 \
port:py26-numpy \
port:zlib \
Added: trunk/dports/python/py26-tables/files/patch-H5Z.diff
===================================================================
--- trunk/dports/python/py26-tables/files/patch-H5Z.diff (rev 0)
+++ trunk/dports/python/py26-tables/files/patch-H5Z.diff 2009-09-11 20:33:13 UTC (rev 57504)
@@ -0,0 +1,62 @@
+Index: src/H5Zbzip2.c
+===================================================================
+--- src/H5Zbzip2.c (revision 2381)
++++ src/H5Zbzip2.c (revision 4143)
+@@ -23,5 +23,11 @@
+ char *libver, *versionp, *datep, *sep;
+
+-#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7
++/* The conditional below is somewhat messy, but it is necessary because
++ the THG team has decided to fix an API inconsistency in the definition
++ of the H5Z_class_t structure in version 1.8.3 */
++#if (H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7) || \
++ (H5_USE_16_API && (H5_VERS_MAJOR > 1 || \
++ (H5_VERS_MAJOR == 1 && (H5_VERS_MINOR > 8 || \
++ (H5_VERS_MINOR == 8 && H5_VERS_RELEASE >= 3)))))
+ /* 1.6.x */
+ H5Z_class_t filter_class = {
+@@ -33,5 +39,5 @@
+ };
+ #else
+- /* 1.7.x */
++ /* 1.8.x where x < 3 */
+ H5Z_class_t filter_class = {
+ H5Z_CLASS_T_VERS, /* H5Z_class_t version */
+@@ -43,5 +49,5 @@
+ (H5Z_func_t)(bzip2_deflate) /* filter_func */
+ };
+-#endif /* if H5_VERSION < "1.7" */
++#endif
+
+ /* Register the filter class for the bzip2 compressor. */
+Index: src/H5Zlzo.c
+===================================================================
+--- src/H5Zlzo.c (revision 3695)
++++ src/H5Zlzo.c (revision 4143)
+@@ -43,5 +43,11 @@
+ #ifdef HAVE_LZO_LIB
+
+-#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7
++/* The conditional below is somewhat messy, but it is necessary because
++ the THG team has decided to fix an API inconsistency in the definition
++ of the H5Z_class_t structure in version 1.8.3 */
++#if (H5_VERS_MAJOR == 1 && H5_VERS_MINOR < 7) || \
++ (H5_USE_16_API && (H5_VERS_MAJOR > 1 || \
++ (H5_VERS_MAJOR == 1 && (H5_VERS_MINOR > 8 || \
++ (H5_VERS_MINOR == 8 && H5_VERS_RELEASE >= 3)))))
+ /* 1.6.x */
+ H5Z_class_t filter_class = {
+@@ -53,5 +59,5 @@
+ };
+ #else
+- /* 1.7.x */
++ /* 1.8.x where x < 3 */
+ H5Z_class_t filter_class = {
+ H5Z_CLASS_T_VERS, /* H5Z_class_t version */
+@@ -63,5 +69,5 @@
+ (H5Z_func_t)(lzo_deflate) /* filter_func */
+ };
+-#endif /* if H5_VERSION < "1.7" */
++#endif
+
+ /* Init the LZO library */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090911/152f2e06/attachment.html>
More information about the macports-changes
mailing list