Skip to content

Commit

Permalink
biology/py-pybigwig: Update to 0.3.22
Browse files Browse the repository at this point in the history
No real changes from 0.3.21
Add patch to resolve conflict with roundup() macro in sys/param.h

Reported by:    pkg-fallout
  • Loading branch information
Jason W. Bacon authored and Jason W. Bacon committed Dec 16, 2023
1 parent e30cd5f commit 0f12812
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 4 deletions.
2 changes: 1 addition & 1 deletion biology/py-pybigwig/Makefile
@@ -1,5 +1,5 @@
PORTNAME= pyBigWig
DISTVERSION= 0.3.21
DISTVERSION= 0.3.22
CATEGORIES= biology python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Expand Down
6 changes: 3 additions & 3 deletions biology/py-pybigwig/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1680381155
SHA256 (pyBigWig-0.3.21.tar.gz) = 5bff713fe3f8840e0fbe48cf8c8fe9d92c8af8ba107da0b845076164445d076e
SIZE (pyBigWig-0.3.21.tar.gz) = 73827
TIMESTAMP = 1681053575
SHA256 (pyBigWig-0.3.22.tar.gz) = 5d4426f754bd7b7f6dc21d6c3f93b58a96a65b6eb2e578ae03b31a71272d2243
SIZE (pyBigWig-0.3.22.tar.gz) = 73864
29 changes: 29 additions & 0 deletions biology/py-pybigwig/files/patch-libBigWig_bwValues.c
@@ -0,0 +1,29 @@
--- libBigWig/bwValues.c.orig 2023-12-16 13:51:54 UTC
+++ libBigWig/bwValues.c
@@ -5,7 +5,7 @@
#include <zlib.h>
#include <errno.h>

-static uint32_t roundup(uint32_t v) {
+static uint32_t bigwig_roundup(uint32_t v) {
v--;
v |= v >> 1;
v |= v >> 2;
@@ -346,7 +346,7 @@ static bwOverlappingIntervals_t *pushIntervals(bwOverl
//Returns NULL on error, in which case o has been free()d
static bwOverlappingIntervals_t *pushIntervals(bwOverlappingIntervals_t *o, uint32_t start, uint32_t end, float value) {
if(o->l+1 >= o->m) {
- o->m = roundup(o->l+1);
+ o->m = bigwig_roundup(o->l+1);
o->start = realloc(o->start, o->m * sizeof(uint32_t));
if(!o->start) goto error;
o->end = realloc(o->end, o->m * sizeof(uint32_t));
@@ -366,7 +366,7 @@ static bbOverlappingEntries_t *pushBBIntervals(bbOverl

static bbOverlappingEntries_t *pushBBIntervals(bbOverlappingEntries_t *o, uint32_t start, uint32_t end, char *str, int withString) {
if(o->l+1 >= o->m) {
- o->m = roundup(o->l+1);
+ o->m = bigwig_roundup(o->l+1);
o->start = realloc(o->start, o->m * sizeof(uint32_t));
if(!o->start) goto error;
o->end = realloc(o->end, o->m * sizeof(uint32_t));

0 comments on commit 0f12812

Please sign in to comment.