summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2004-03-27 17:33:28 +0000
committerhe <he@pkgsrc.org>2004-03-27 17:33:28 +0000
commit9c6e2e60a048029670bc06cd3a2f342e80f3ae1d (patch)
tree0fe4c1f6223e8dbc9ea6dc5b24405f55a168abcb /audio
parent4fd46c4b58ee6318e35f75f86513996e6c5d81bf (diff)
downloadpkgsrc-9c6e2e60a048029670bc06cd3a2f342e80f3ae1d.tar.gz
Fix this so it builds on alpha.
If we're going to mess with defining FLOAT on the command line (done for alpha from before), we should also define FLOAT_MAX. Pull in <float.h> in libmp3lib/machine.h, so that DBL_MAX is available for that purpose.
Diffstat (limited to 'audio')
-rw-r--r--audio/lame/Makefile4
-rw-r--r--audio/lame/distinfo3
-rw-r--r--audio/lame/patches/patch-ad12
3 files changed, 16 insertions, 3 deletions
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 76f1bd26721..5e14e2228f6 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/03/20 02:23:38 snj Exp $
+# $NetBSD: Makefile,v 1.39 2004/03/27 17:33:28 he Exp $
#
DISTNAME= lame-${VERS}
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --disable-analyzer
# double is faster than float on Alpha
CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
-mfp-regs -fschedule-insns -fschedule-insns2 \
- -finline-functions -DFLOAT=double
+ -finline-functions -DFLOAT=double -DFLOAT_MAX=DBL_MAX
.endif
.include "../../mk/curses.buildlink3.mk"
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index d10443e32a8..9fa3fbdc9cd 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2004/01/20 15:46:12 adam Exp $
+$NetBSD: distinfo,v 1.10 2004/03/27 17:33:28 he Exp $
SHA1 (lame-3.95.1.tar.gz) = 6547f289ae2f078eb5f053a54e2724f0de72ca94
Size (lame-3.95.1.tar.gz) = 1244071 bytes
SHA1 (patch-aa) = 6ade10e302c6f848cdc9392fed89d87b40d0eb77
SHA1 (patch-ab) = da88c3c130e8b1420baf52c36e657378bdb58a36
SHA1 (patch-ac) = 8e1495493c534943608baeab18c1063c66509dbc
+SHA1 (patch-ad) = 976c3364ca70f90a5f7b3aabfa3b228dcf0d010f
diff --git a/audio/lame/patches/patch-ad b/audio/lame/patches/patch-ad
new file mode 100644
index 00000000000..3c2ff4e5f4a
--- /dev/null
+++ b/audio/lame/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2004/03/27 17:33:28 he Exp $
+
+--- libmp3lame/machine.h.orig 2004-03-27 18:23:04.000000000 +0100
++++ libmp3lame/machine.h
+@@ -113,6 +113,7 @@ char *strchr (), *strrchr ();
+ # include <float.h>
+ # define FLOAT_MAX FLT_MAX
+ #else
++# include <float.h>
+ # ifndef FLOAT
+ typedef float FLOAT;
+ # ifdef FLT_MAX