pkg/26412: mplayer fails to compile libfaad2 on NetBSD >= 2.0F

[dogcow+netbsdspam%babymeat.com@localhost]

>Number:         26412
>Category:       pkg
>Synopsis:       mplayer fails to compile libfaad2 on NetBSD >= 2.0F
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jul 23 07:15:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Tom Spindler
>Release:        NetBSD 2.0G
>Organization:
        
>Environment:
        
        
System: NetBSD whitey 2.0G NetBSD 2.0G (WHITEY) #3: Mon Jul 5 06:42:07 PDT 2004 
dogcow@whitey:/media/tmp/obj/obj/media/src/src/sys/arch/i386/compile/WHITEY i386
Architecture: i386
Machine: i386
>Description:
        
libfaad2 in Mplayer has an inlined lrintf; unfortunately, this definition
clashes with the one introduced in NetBSD-current recently (around 2.0F).
>How-To-Repeat:
cd pkgsrc/multimedia/mplayer; make install
.....
Checking for internal FAAD2 (AAC) support ... no (broken gcc)

        
>Fix:
        
here's a patch. it works on my system, looks mostly right to me.

--- libfaad2/common.h.orig      2004-06-23 06:50:49.000000000 -0700
+++ libfaad2/common.h   2004-07-22 23:39:30.000000000 -0700
@@ -34,6 +34,8 @@
 extern "C" {
 #endif
 
+#include <sys/param.h>
+
 /* Allow build on cygwin*/
 #if defined(__CYGWIN__)
 #define __STRICT_ANSI__
@@ -336,6 +338,7 @@
     }
   #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
     #define HAS_LRINTF
+    #if (__NetBSD_Version__ < 200060000)
     // from http://www.stereopsis.com/FPU.html
     static INLINE int lrintf(float f)
     {
@@ -348,6 +351,7 @@
         return i;
     }
+    #endif
   #endif
 
 
   #ifdef __ICL /* only Intel C compiler has fmath ??? */

>Release-Note:
>Audit-Trail:
>Unformatted: