diff options
| author |   Olivier Crête <tester@gentoo.org> | 2003-08-10 05:24:49 +0000 |
|---|---|---|
| committer | Olivier Crête <tester@gentoo.org> | 2003-08-10 05:24:49 +0000 |
| commit | b2a95dcbd11d05eeb6a220aea8f0734bb968db94 (patch) | |
| tree | 9e4c2a275bc4ab5f4944cc54db5a630299a9327f /media-sound/mpg123 | |
| parent | New package, ~x86 masked. Closes #22901. (diff) | |
| download | historical-b2a95dcbd11d05eeb6a220aea8f0734bb968db94.tar.gz historical-b2a95dcbd11d05eeb6a220aea8f0734bb968db94.tar.bz2 historical-b2a95dcbd11d05eeb6a220aea8f0734bb968db94.zip | |
new version of the amd64 patch for mpg123
Diffstat (limited to 'media-sound/mpg123')
| -rw-r--r-- | media-sound/mpg123/Manifest | 14 | ||||
| -rw-r--r-- | media-sound/mpg123/files/mpg123-0.59r-amd64.diff | 78 |
2 files changed, 85 insertions, 7 deletions
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index 5caa44631410..50cbda6681a4 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -1,12 +1,12 @@ -MD5 243bfbe7420f5102bb8c41f3c811f2c0 ChangeLog 2453 -MD5 8905c48231e5ce22894c3ea16ec40623 mpg123-0.59r-r1.ebuild 1418 MD5 e0390e44363588cabadff482a39beb65 mpg123-0.59r-r2.ebuild 1669 +MD5 8905c48231e5ce22894c3ea16ec40623 mpg123-0.59r-r1.ebuild 1418 +MD5 243bfbe7420f5102bb8c41f3c811f2c0 ChangeLog 2453 MD5 8ef5c7ee34e42ac19fed2a25a2c7606b mpg123-0.59s.ebuild 1327 -MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r1 64 +MD5 25074032444365516e00f7c2b9a7a736 files/mpg123-0.59r-hppa.diff 1121 +MD5 b8cddd1215747a09daf3476eb7290bc6 files/mpg123-0.59r-make-fix.diff 7832 MD5 660470ffc0acfb171f08032a4d727cba files/mpg123-0.59r-alpha.diff 17451 -MD5 95c31be37fcef2c3d007c5ae0a069863 files/mpg123-0.59r-sparc.diff 405 +MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r1 64 MD5 8936a4142ebda9826bda6818a51e1524 files/digest-mpg123-0.59r-r2 64 -MD5 b8cddd1215747a09daf3476eb7290bc6 files/mpg123-0.59r-make-fix.diff 7832 -MD5 25074032444365516e00f7c2b9a7a736 files/mpg123-0.59r-hppa.diff 1121 -MD5 cb793529594684aef1f4c6c0a12f825c files/mpg123-0.59r-amd64.diff 825 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s 67 +MD5 95c31be37fcef2c3d007c5ae0a069863 files/mpg123-0.59r-sparc.diff 405 +MD5 efa64a45cc5ceed3325967030d014e3b files/mpg123-0.59r-amd64.diff 3512 diff --git a/media-sound/mpg123/files/mpg123-0.59r-amd64.diff b/media-sound/mpg123/files/mpg123-0.59r-amd64.diff index 9fd303ecd545..4f557c8036e4 100644 --- a/media-sound/mpg123/files/mpg123-0.59r-amd64.diff +++ b/media-sound/mpg123/files/mpg123-0.59r-amd64.diff @@ -30,3 +30,81 @@ #linux-ppc: # $(MAKE) LDFLAGS= \ # OBJECTS='decode.o dct64.o audio_oss.o' \ +diff -urN mpg123-0.59r/getlopt.c mpg123-0.59r.alpha/getlopt.c +--- getlopt.c 1998-12-08 04:41:11.000000000 -0500 ++++ mpg123-0.59r.alpha/getlopt.c 2002-11-22 17:52:59.000000000 -0500 +@@ -48,7 +48,7 @@ + if (opt->flags & 2) /* var is *char */ + *((char *) opt->var) = (char) opt->value; + else +- *((long *) opt->var) = opt->value; ++ *((int *) opt->var) = opt->value; + } + else + result = opt->value ? opt->value : opt->sname; +@@ -62,7 +62,7 @@ + if (opt->flags & 2) /* var is *char */ + *((char **) opt->var) = strdup(loptarg); + else +- *((long *) opt->var) = atoi(loptarg); ++ *((int *) opt->var) = atoi(loptarg); + } + else + result = opt->value ? opt->value : opt->sname; +diff -urN mpg123-0.59r/layer3.c mpg123-0.59r.alpha/layer3.c +--- layer3.c 1999-04-21 11:25:18.000000000 -0400 ++++ mpg123-0.59r.alpha/layer3.c 2002-11-22 17:52:59.000000000 -0500 +@@ -608,7 +608,7 @@ + * Dequantize samples (includes huffman decoding) + */ + /* 24 is enough because tab13 has max. a 19 bit huffvector */ +-#define BITSHIFT ((sizeof(long)-1)*8) ++#define BITSHIFT ((sizeof(int)-1)*8) + #define REFRESH_MASK \ + while(num < BITSHIFT) { \ + mask |= getbyte()<<(BITSHIFT-num); \ +@@ -625,7 +625,7 @@ + int *me; + + int num=getbitoffset(); +- long mask = (long) getbits(num)<<(BITSHIFT+8-num); ++ int mask = (int) getbits(num)<<(BITSHIFT+8-num); + part2remain -= num; + + { +@@ -709,7 +709,7 @@ + if(x == 15 && h->linbits) { + max[lwin] = cb; + REFRESH_MASK; +- x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); ++ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +@@ -733,7 +733,7 @@ + if(y == 15 && h->linbits) { + max[lwin] = cb; + REFRESH_MASK; +- y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); ++ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +@@ -883,7 +883,7 @@ + if (x == 15 && h->linbits) { + max = cb; + REFRESH_MASK; +- x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); ++ x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) +@@ -907,7 +907,7 @@ + if (y == 15 && h->linbits) { + max = cb; + REFRESH_MASK; +- y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits); ++ y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits); + num -= h->linbits+1; + mask <<= h->linbits; + if(mask < 0) |