cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix breakage in internal faad2 detection. Noted by jolan@

Browse Source
This commit is contained in:
biorn 2005-11-23 00:05:39 +00:00
parent 9488d52bf3
commit 6a664a3a92
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
x11/mplayer/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.35 2005/05/27 04:33:06 pvalchev Exp $
--- configure.orig Wed Apr 13 05:46:35 2005
+++ configure Sun May 8 13:21:59 2005
$OpenBSD: patch-configure,v 1.36 2005/11/23 00:05:39 biorn Exp $
--- configure.orig Wed Apr 13 13:46:35 2005
+++ configure Wed Nov 23 00:41:37 2005
@@ -475,6 +475,9 @@ if test -z "$_target" ; then
if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
-z "`echo $CFLAGS | grep -- -m32`" ]; then
@ -63,7 +63,19 @@ $OpenBSD: patch-configure,v 1.35 2005/05/27 04:33:06 pvalchev Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -6775,7 +6785,7 @@ CACA_LIB = $_ld_caca
@@ -5323,7 +5333,10 @@ _inc_faad="-I`pwd`/libfaad2"
if test "$_faad_internal" = auto ; then
# the faad check needs a config.h file
if not test -f "config.h" ; then
- > config.h
+ cat > config.h << EOF
+/* C99 lrintf function available */
+$_def_lrintf
+EOF
fi
# internal faad: check if our dear gcc is able to compile it...
cp "`pwd`/libfaad2/cfft.c" $TMPC
@@ -6775,7 +6788,7 @@ CACA_LIB = $_ld_caca
# audio output
ALSA_LIB = $_ld_alsa
NAS_LIB = $_ld_nas
@ -72,7 +84,7 @@ $OpenBSD: patch-configure,v 1.35 2005/05/27 04:33:06 pvalchev Exp $
ARTS_INC = $_inc_arts
ESD_LIB = $_ld_esd
ESD_INC = $_inc_esd
@@ -7041,7 +7051,7 @@ $_def_malloc
@@ -7041,7 +7054,7 @@ $_def_malloc
$_def_memalign
#ifndef HAVE_MEMALIGN
# define memalign(a,b) malloc(b)

12
x11/mplayer/patches/patch-libfaad2_common_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libfaad2_common_h,v 1.1 2005/11/23 00:05:39 biorn Exp $
--- libfaad2/common.h.orig Tue Nov 22 22:00:39 2005
+++ libfaad2/common.h Tue Nov 22 22:12:29 2005
@@ -341,7 +341,7 @@ char *strchr(), *strrchr();
}
return i;
}
- #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__)
+ #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
#define HAS_LRINTF
// from http://www.stereopsis.com/FPU.html
static INLINE int lrintf(float f)