Commit b32e2119 authored by Eric Petit's avatar Eric Petit

ffmpeg.patch.cvs: oops, fix build

parent dc32e3f7
...@@ -19,7 +19,15 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure ...@@ -19,7 +19,15 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
;; ;;
--build-suffix=*) BUILDSUF=${opt#--build-suffix=} --build-suffix=*) BUILDSUF=${opt#--build-suffix=}
;; ;;
@@ -867,6 +867,18 @@ @@ -473,7 +473,6 @@
--disable-audio-oss) audio_oss="no"
;;
--disable-audio-beos) audio_beos="no"
- extralibs="$extralibs -lbe -lmedia"
;;
--disable-dv1394) dv1394="no"
;;
@@ -867,6 +866,18 @@
ranlib="${cross_prefix}${ranlib}" ranlib="${cross_prefix}${ranlib}"
strip="${cross_prefix}${strip}" strip="${cross_prefix}${strip}"
...@@ -38,7 +46,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure ...@@ -38,7 +46,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
if test -z "$cross_prefix" ; then if test -z "$cross_prefix" ; then
# --- # ---
@@ -985,6 +997,7 @@ @@ -985,6 +996,7 @@
EOF EOF
have_lrintf="no" have_lrintf="no"
...@@ -46,7 +54,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure ...@@ -46,7 +54,7 @@ diff -ru ffmpeg-orig/configure ffmpeg/configure
if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then
have_lrintf="yes" have_lrintf="yes"
# allanc@chickenandporn.com: cannot execute cross-compiled # allanc@chickenandporn.com: cannot execute cross-compiled
@@ -993,6 +1006,7 @@ @@ -993,6 +1005,7 @@
$TMPE 2> /dev/null > /dev/null || have_lrintf="no" $TMPE 2> /dev/null > /dev/null || have_lrintf="no"
fi fi
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment