Fri Nov 20 14:28:02 2015 UTC ()
Don't link against libcompat, since ftime hasn't been used for a while.
Fixes build of dynamic library. Bump revision.
(joerg)
diff -r1.2 -r1.3 pkgsrc/audio/opusfile/Makefile
diff -r1.6 -r1.7 pkgsrc/audio/opusfile/distinfo
diff -r0 -r1.1 pkgsrc/audio/opusfile/patches/patch-configure
diff -r0 -r1.1 pkgsrc/audio/opusfile/patches/patch-configure.ac
--- pkgsrc/audio/opusfile/Makefile 2014/08/16 21:30:50 1.2
+++ pkgsrc/audio/opusfile/Makefile 2015/11/20 14:28:02 1.3
| @@ -1,16 +1,17 @@ | | | @@ -1,16 +1,17 @@ |
1 | # $NetBSD: Makefile,v 1.2 2014/08/16 21:30:50 gls Exp $ | | 1 | # $NetBSD: Makefile,v 1.3 2015/11/20 14:28:02 joerg Exp $ |
2 | | | 2 | |
3 | DISTNAME= opusfile-0.6 | | 3 | DISTNAME= opusfile-0.6 |
| | | 4 | PKGREVISION= 1 |
4 | CATEGORIES= audio | | 5 | CATEGORIES= audio |
5 | MASTER_SITES= http://downloads.xiph.org/releases/opus/ | | 6 | MASTER_SITES= http://downloads.xiph.org/releases/opus/ |
6 | | | 7 | |
7 | MAINTAINER= pkgsrc-users@NetBSD.org | | 8 | MAINTAINER= pkgsrc-users@NetBSD.org |
8 | HOMEPAGE= http://opus-codec.org/ | | 9 | HOMEPAGE= http://opus-codec.org/ |
9 | COMMENT= Decoding and seeking API for opus files | | 10 | COMMENT= Decoding and seeking API for opus files |
10 | LICENSE= modified-bsd | | 11 | LICENSE= modified-bsd |
11 | | | 12 | |
12 | GNU_CONFIGURE= yes | | 13 | GNU_CONFIGURE= yes |
13 | USE_LIBTOOL= yes | | 14 | USE_LIBTOOL= yes |
14 | USE_TOOLS+= gmake pkg-config | | 15 | USE_TOOLS+= gmake pkg-config |
15 | | | 16 | |
16 | PKGCONFIG_OVERRIDE+= opusfile.pc.in | | 17 | PKGCONFIG_OVERRIDE+= opusfile.pc.in |
--- pkgsrc/audio/opusfile/distinfo 2015/11/03 01:12:44 1.6
+++ pkgsrc/audio/opusfile/distinfo 2015/11/20 14:28:02 1.7
| @@ -1,7 +1,9 @@ | | | @@ -1,7 +1,9 @@ |
1 | $NetBSD: distinfo,v 1.6 2015/11/03 01:12:44 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.7 2015/11/20 14:28:02 joerg Exp $ |
2 | | | 2 | |
3 | SHA1 (opusfile-0.6.tar.gz) = 2422e3c7bf6105a832226850b19053ec5ac41293 | | 3 | SHA1 (opusfile-0.6.tar.gz) = 2422e3c7bf6105a832226850b19053ec5ac41293 |
4 | RMD160 (opusfile-0.6.tar.gz) = a5d036100ecb561ad00b43f276585f3b6440f950 | | 4 | RMD160 (opusfile-0.6.tar.gz) = a5d036100ecb561ad00b43f276585f3b6440f950 |
5 | SHA512 (opusfile-0.6.tar.gz) = 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02 | | 5 | SHA512 (opusfile-0.6.tar.gz) = 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02 |
6 | Size (opusfile-0.6.tar.gz) = 437980 bytes | | 6 | Size (opusfile-0.6.tar.gz) = 437980 bytes |
| | | 7 | SHA1 (patch-configure) = e66accedd8adbc6177b0abbec43b2d48b4a154c5 |
| | | 8 | SHA1 (patch-configure.ac) = d8384babab6d2e3e1fcf61380a8c3db70accf59d |
7 | SHA1 (patch-src_http.c) = 631e7304c825baf5537c871b39e75bfb1f04da8a | | 9 | SHA1 (patch-src_http.c) = 631e7304c825baf5537c871b39e75bfb1f04da8a |
$NetBSD: patch-configure,v 1.1 2015/11/20 14:28:02 joerg Exp $
--- configure.orig 2015-11-18 13:16:26.000000000 +0000
+++ configure
@@ -11897,70 +11897,6 @@ fi
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ftime" >&5
-$as_echo_n "checking for library containing ftime... " >&6; }
-if ${ac_cv_search_ftime+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ftime ();
-int
-main ()
-{
-return ftime ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' compat; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_ftime=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_ftime+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_ftime+:} false; then :
-
-else
- ac_cv_search_ftime=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ftime" >&5
-$as_echo "$ac_cv_search_ftime" >&6; }
-ac_res=$ac_cv_search_ftime
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
- enable_http=no
-fi
-
-
-
-
-
-
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
$NetBSD: patch-configure.ac,v 1.1 2015/11/20 14:28:02 joerg Exp $
--- configure.ac.orig 2015-11-18 13:16:13.000000000 +0000
+++ configure.ac
@@ -86,7 +86,6 @@ AM_COND_IF(OP_WIN32,
)
)
)
-AC_SEARCH_LIBS(ftime, [compat], , [enable_http=no])
AS_IF([test "$enable_http" != "no"], [
openssl="openssl"