diff options
author | tron <tron> | 2001-04-04 07:08:28 +0000 |
---|---|---|
committer | tron <tron> | 2001-04-04 07:08:28 +0000 |
commit | c9f24c976193c47858b323510e7814e42454b028 (patch) | |
tree | b9ed6f288aa552ff2538db753a1c9320c5a4cf0e | |
parent | 5bd40dab42338a0af075c1750c4dbf8c62909ead (diff) | |
download | pkgsrc-c9f24c976193c47858b323510e7814e42454b028.tar.gz |
Make this package work under Solaris. The patches were contributed by
Christian Weisgerber in private e-mail.
-rw-r--r-- | audio/libvorbis/files/patch-sum | 5 | ||||
-rw-r--r-- | audio/libvorbis/patches/patch-ab | 12 | ||||
-rw-r--r-- | audio/libvorbis/patches/patch-ac | 66 | ||||
-rw-r--r-- | audio/libvorbis/patches/patch-ad | 21 |
4 files changed, 103 insertions, 1 deletions
diff --git a/audio/libvorbis/files/patch-sum b/audio/libvorbis/files/patch-sum index 58ef21add55..e068de901d7 100644 --- a/audio/libvorbis/files/patch-sum +++ b/audio/libvorbis/files/patch-sum @@ -1,3 +1,6 @@ -$NetBSD: patch-sum,v 1.1 2001/03/21 15:47:27 wiz Exp $ +$NetBSD: patch-sum,v 1.2 2001/04/04 07:08:28 tron Exp $ SHA1 (patch-aa) = 2293192c1eeadfdb9629d94c86a083c8e348f137 +SHA1 (patch-ab) = 1a84a3757aecef0f4ae0caba996e8740b84ac1e6 +SHA1 (patch-ac) = 39ceba79fffefc2bb165f2245e30158dfa3bc006 +SHA1 (patch-ad) = b3ef346320dfce68e2f1621b902445e9688bf377 diff --git a/audio/libvorbis/patches/patch-ab b/audio/libvorbis/patches/patch-ab new file mode 100644 index 00000000000..0a9181733fe --- /dev/null +++ b/audio/libvorbis/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2001/04/04 07:08:29 tron Exp $ + +--- configure.in.orig Fri Mar 30 02:02:35 2001 ++++ configure.in Fri Mar 30 02:10:16 2001 +@@ -162,6 +162,7 @@ dnl ------------------------------------ + + AC_FUNC_ALLOCA + AC_FUNC_MEMCMP ++AC_CHECK_FUNCS(sqrtf) + + dnl -------------------------------------------------- + dnl Do substitutions diff --git a/audio/libvorbis/patches/patch-ac b/audio/libvorbis/patches/patch-ac new file mode 100644 index 00000000000..2fcd4663932 --- /dev/null +++ b/audio/libvorbis/patches/patch-ac @@ -0,0 +1,66 @@ +$NetBSD: patch-ac,v 1.1 2001/04/04 07:08:29 tron Exp $ + +--- configure.orig Mon Feb 26 14:34:27 2001 ++++ configure Wed Apr 4 09:01:22 2001 +@@ -2235,6 +2235,61 @@ + echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 + test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" + ++for ac_func in sqrtf ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:2242: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <<EOF ++#line 2247 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif ++ ++; return 0; } ++EOF ++if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_func 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done ++ + + + diff --git a/audio/libvorbis/patches/patch-ad b/audio/libvorbis/patches/patch-ad new file mode 100644 index 00000000000..4d0985e7153 --- /dev/null +++ b/audio/libvorbis/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1 2001/04/04 07:08:29 tron Exp $ + +--- lib/os.h.orig Fri Mar 30 02:10:53 2001 ++++ lib/os.h Fri Mar 30 02:13:07 2001 +@@ -42,15 +42,7 @@ + # define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b)) + #endif + +-#ifndef __GNUC__ +-# define NO_FLOAT_MATH_LIB +-#endif +- +-#ifdef DARWIN +-# define NO_FLOAT_MATH_LIB +-#endif +- +-#ifndef NO_FLOAT_MATH_LIB ++#ifdef HAVE_SQRTF + # define sqrt sqrtf + # define log logf + # define exp expf |