diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-01-29 23:05:51 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-01-29 23:05:51 +0000 |
| commit | 2021b175d7f869ce55fd62b93d354bb8d3eb4455 (patch) | |
| tree | 53b30a2b26b76cca18097e3385986b409202dff0 /audio | |
| parent | 5dd1eb7fd834a4771c59eeabdad2af76faf81988 (diff) | |
| download | pkgsrc-2021b175d7f869ce55fd62b93d354bb8d3eb4455.tar.gz | |
fix a namespace problem on solaris
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/lame/distinfo | 3 | ||||
| -rw-r--r-- | audio/lame/patches/patch-aa | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/audio/lame/distinfo b/audio/lame/distinfo index 4de4af3f1fa..7943cc7e0ef 100644 --- a/audio/lame/distinfo +++ b/audio/lame/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.15 2006/10/23 01:30:34 ben Exp $ +$NetBSD: distinfo,v 1.16 2007/01/29 23:05:51 dmcmahill Exp $ SHA1 (lame-3.97.tar.gz) = acf56065f4e31ce023b0f99002d537adb1ec09df RMD160 (lame-3.97.tar.gz) = 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 Size (lame-3.97.tar.gz) = 1328058 bytes +SHA1 (patch-aa) = 171a672d21f0bcef64867efebf8a772ce986cd80 SHA1 (patch-ab) = 0d018fa85580f1653deaa61689c901af3e17b42c SHA1 (patch-ac) = dc1fe7bccdf15b293a0c655c2ddf651d25fada43 SHA1 (patch-ad) = c6012f720b0d24775539dd915a1466ebbf065c62 diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa new file mode 100644 index 00000000000..066724e8ee6 --- /dev/null +++ b/audio/lame/patches/patch-aa @@ -0,0 +1,31 @@ +$NetBSD: patch-aa,v 1.14 2007/01/29 23:05:51 dmcmahill Exp $ + +name space collision with a #define in /usr/include/term.h on solaris-2.9 + +--- frontend/brhist.c.orig 2006-09-24 09:53:31.000000000 -0400 ++++ frontend/brhist.c +@@ -429,7 +429,7 @@ stats_line(double *stat) + void + brhist_disp(const lame_global_flags * gf) + { +- int i, lines = 0; ++ int i, mylines = 0; + int br_hist[BRHIST_WIDTH]; /* how often a frame size was used */ + int br_sm_hist[BRHIST_WIDTH][4]; /* how often a special frame size/stereo mode commbination was used */ + int st_mode[4]; +@@ -456,13 +456,13 @@ brhist_disp(const lame_global_flags * gf + if (most_often < br_hist[i]) + most_often = br_hist[i]; + if (br_hist[i]) +- ++lines; ++ ++mylines; + } + + for (i = 0; i < BRHIST_WIDTH; i++) { + int show = br_hist[i]; + #ifdef RH_HIST +- show = show && (lines > 1); ++ show = show && (mylines > 1); + #endif + if (show + || (i >= brhist.vbr_bitrate_min_index |