summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2011-09-04 21:17:13 +0000
committerdholland <dholland>2011-09-04 21:17:13 +0000
commit938bbaf35e2a01d01f240cab2b8bd64f8db95a10 (patch)
tree5350992f9d2225edd10dd939e2e2b83757785e63
parentd3cae4f27ec4cf633e142203fa842f893572bc9d (diff)
downloadpkgsrc-938bbaf35e2a01d01f240cab2b8bd64f8db95a10.tar.gz
Disable this package's INLINE because it's misused for out-of-line
declarations. Note that if someone wanted to go through and tidy up, most but not all of the functions currently tagged INLINE could be removed from the .h files and changed to static inilne. However, that doesn't seem worthwhile here and now.
-rw-r--r--audio/toolame/distinfo4
-rw-r--r--audio/toolame/patches/patch-ac15
2 files changed, 12 insertions, 7 deletions
diff --git a/audio/toolame/distinfo b/audio/toolame/distinfo
index cecbd698e94..de0d418fdb0 100644
--- a/audio/toolame/distinfo
+++ b/audio/toolame/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/07/30 11:30:03 grant Exp $
+$NetBSD: distinfo,v 1.5 2011/09/04 21:17:13 dholland Exp $
SHA1 (toolame-02l.tgz) = 9f58345ec5d552f49a9ad598e6eb2dc126cb10b4
RMD160 (toolame-02l.tgz) = 65ff0757f48080093df9e1932b5952199d03f5c6
Size (toolame-02l.tgz) = 127493 bytes
SHA1 (patch-aa) = 44633513f0ad2768ad1531ab41e059659d661630
SHA1 (patch-ab) = 3dae25436a931eea5fe33aa0dcca16c46e529ed7
-SHA1 (patch-ac) = 6a4df822e31858a52203a62ce8d5d1f20931dbbb
+SHA1 (patch-ac) = 35901599b52f09e6b50db7fde81d3332271eb0ef
SHA1 (patch-ad) = 9b3f8fc15012714da8b1c701103b5aa2ed77ac87
diff --git a/audio/toolame/patches/patch-ac b/audio/toolame/patches/patch-ac
index 0303ef52528..fa41acd1b41 100644
--- a/audio/toolame/patches/patch-ac
+++ b/audio/toolame/patches/patch-ac
@@ -1,6 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2005/07/30 11:30:03 grant Exp $
+$NetBSD: patch-ac,v 1.3 2011/09/04 21:17:13 dholland Exp $
---- Makefile.orig 2003-03-02 18:07:02.000000000 +1100
+- configure for pkgsrc
+- INLINE should/must be blank based on how it's (inappropriately) used
+
+--- Makefile.orig 2003-03-02 07:07:02.000000000 +0000
+++ Makefile
@@ -1,5 +1,5 @@
@@ -9,7 +12,7 @@ $NetBSD: patch-ac,v 1.2 2005/07/30 11:30:03 grant Exp $
c_sources = \
common.c \
-@@ -28,7 +28,7 @@ OBJ = $(c_sources:.c=.o)
+@@ -28,16 +28,16 @@ OBJ = $(c_sources:.c=.o)
#Uncomment this if you want to do some profiling/debugging
#PG = -g -pg
@@ -18,8 +21,10 @@ $NetBSD: patch-ac,v 1.2 2005/07/30 11:30:03 grant Exp $
# Optimize flag. 3 is about as high as you can sanely go with GCC3.2.
OPTIM = -O3
-@@ -37,7 +37,7 @@ OPTIM = -O3
- REQUIRED = -DNDEBUG -DINLINE=inline
+
+ # These flags are pretty much mandatory
+-REQUIRED = -DNDEBUG -DINLINE=inline
++REQUIRED = -DNDEBUG -DINLINE=
#pick your architecture
-ARCH = -march=pentium