summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2016-09-02 14:07:43 +0000
committermaya <maya@pkgsrc.org>2016-09-02 14:07:43 +0000
commit224ae9ad4eb14951177533698088f270f6d9f5d6 (patch)
treefd9fd1abaa0c69688060b31c6dce743e5d8fb9ea /audio
parent7cc18b611a70b128a393b2f001f4a83533ac6634 (diff)
downloadpkgsrc-224ae9ad4eb14951177533698088f270f6d9f5d6.tar.gz
Use a compile test at configure to check for SSE, not just the existence
of a header. Default compiler setup in netbsd disables SSE, we cannot compile stuff that uses it - but we do have the headers for it. Allows us to get rid of SSE disabling for sunpro compiler, it should fail the compile test as well. Patch from FreeBSD (pointed out by John D. Baker) Fixes PR pkg/51209: audio/lame build fails on i386-7.99.30
Diffstat (limited to 'audio')
-rw-r--r--audio/lame/Makefile6
-rw-r--r--audio/lame/distinfo4
-rw-r--r--audio/lame/patches/patch-configure51
3 files changed, 48 insertions, 13 deletions
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 54bdeddd3eb..5dd4f0b531b 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2015/08/18 07:31:02 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2016/09/02 14:07:43 maya Exp $
DISTNAME= lame-3.99.5
PKGREVISION= 3
@@ -34,9 +34,5 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
CONFIGURE_ARGS+= --enable-nasm
.endif
-.if !empty(PKGSRC_COMPILER:Msunpro)
-CONFIGURE_ENV+= ac_cv_header_xmmintrin_h=no
-.endif
-
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 5e74e849bfe..49268ea1560 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 01:12:36 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/09/02 14:07:43 maya Exp $
SHA1 (lame-3.99.5.tar.gz) = 03a0bfa85713adcc6b3383c12e2cc68a9cfbf4c4
RMD160 (lame-3.99.5.tar.gz) = 8a0990af918b635cc79eb27a3beafc6c0ee13a9f
@@ -6,7 +6,7 @@ SHA512 (lame-3.99.5.tar.gz) = ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e6491
Size (lame-3.99.5.tar.gz) = 1445348 bytes
SHA1 (patch-ab) = e356b7614cfd4a2012f66926fe58a717dcc130f3
SHA1 (patch-ad) = fa14817f765a61f046a96a1b556e2c8203fc27ad
-SHA1 (patch-configure) = bc2243e364a2a6397cc0d09129969274b88f6b98
+SHA1 (patch-configure) = 36615887c54ff229c65f0023f4f392cc4c4b282b
SHA1 (patch-configure.in) = 6ca01d610b94a402f2c2b351aa901a5072f3a0cb
SHA1 (patch-frontend_get__audio.c) = c6df7a003d07e916c5129d45322c708f09b524e8
SHA1 (patch-libmp3lame_lame.c) = bdc403ff8a1a7d5a6082b4d214fd43df99b1344e
diff --git a/audio/lame/patches/patch-configure b/audio/lame/patches/patch-configure
index ab74c5be684..3e0d81471bc 100644
--- a/audio/lame/patches/patch-configure
+++ b/audio/lame/patches/patch-configure
@@ -1,10 +1,49 @@
-$NetBSD: patch-configure,v 1.1 2013/10/10 10:49:30 roy Exp $
+$NetBSD: patch-configure,v 1.2 2016/09/02 14:07:43 maya Exp $
initscr is a curses function, not termcap.
---- configure.orig 2013-10-10 10:45:38.000000000 +0000
+--- configure.orig 2012-02-28 18:54:37.000000000 +0000
+++ configure
-@@ -13602,9 +13602,9 @@ fi
+@@ -11922,7 +11922,6 @@ for ac_header in \
+ sys/soundcard.h \
+ sys/time.h \
+ unistd.h \
+- xmmintrin.h \
+ linux/soundcard.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -11936,6 +11935,30 @@ fi
+
+ done
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking working SSE intrinsics" >&5
++$as_echo_n "checking working SSE intrinsics... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <xmmintrin.h>
++int
++main ()
++{
++_mm_sfence();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++$as_echo "#define HAVE_XMMINTRIN_H 1" >>confdefs.h
++
++ ac_cv_header_xmmintrin_h=yes
++else
++ ac_cv_header_xmmintrin_h=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_header_xmmintrin_h}" >&5
++$as_echo "${ac_cv_header_xmmintrin_h}" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+@@ -13602,9 +13625,9 @@ fi
done
@@ -17,7 +56,7 @@ initscr is a curses function, not termcap.
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13618,33 +13618,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -13618,33 +13641,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
@@ -61,7 +100,7 @@ initscr is a curses function, not termcap.
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13658,33 +13658,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -13658,33 +13681,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
@@ -105,7 +144,7 @@ initscr is a curses function, not termcap.
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -13698,27 +13698,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -13698,27 +13721,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif