summaryrefslogtreecommitdiff
path: root/recipes/mplayer
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-01-13 15:19:33 +0100
committerKoen Kooi <koen@openembedded.org>2010-01-13 15:19:33 +0100
commit507d23ac850f9094c1f006f8de093dd09b248ac3 (patch)
treef347833a1963989bd41766f52d9a38ff49e8519a /recipes/mplayer
parent4a10cd2be07e2ca413aef483bac4df157b2c631c (diff)
mplayer: fix build error with EXPR_2F
Diffstat (limited to 'recipes/mplayer')
-rw-r--r--recipes/mplayer/files/fix-exp.diff29
-rw-r--r--recipes/mplayer/mplayer_svn.bb3
2 files changed, 31 insertions, 1 deletions
diff --git a/recipes/mplayer/files/fix-exp.diff b/recipes/mplayer/files/fix-exp.diff
new file mode 100644
index 0000000000..fd7352d6f2
--- /dev/null
+++ b/recipes/mplayer/files/fix-exp.diff
@@ -0,0 +1,29 @@
+Index: configure
+===================================================================
+--- configure (revision 30290)
++++ configure (revision 30291)
+@@ -3006,7 +3006,7 @@
+ fi
+ echores "$_posix4"
+
+-for func in llrint log2 lrint lrintf round roundf truncf; do
++for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do
+ echocheck $func
+ cat > $TMPC << EOF
+ #include <math.h>
+@@ -8682,12 +8682,15 @@
+
+
+ /* system functions */
++$def_exp2
++$def_exp2f
+ $def_gethostbyname2
+ $def_gettimeofday
+ $def_glob
+ $def_langinfo
+ $def_llrint
+ $def_log2
++$def_log2f
+ $def_lrint
+ $def_lrintf
+ $def_map_memalign
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index 01951a0f58..0f21869cd8 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -11,6 +11,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
file://makefile-nostrip-svn.patch;patch=1 \
file://mplayer-arm-pld.patch;patch=1 \
file://mplayer-lavc-arm.patch;patch=1 \
+ file://fix-exp.diff;patch=1;pnum=0;maxrev=30291 \
"
SRCREV = "30247"
@@ -36,7 +37,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
PV = "0.0+1.0rc2+svnr${SRCPV}"
-PR = "r15"
+PR = "r16"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"