summaryrefslogtreecommitdiff
path: root/package/ffmpeg/patches/patch-configure
diff options
context:
space:
mode:
Diffstat (limited to 'package/ffmpeg/patches/patch-configure')
-rw-r--r--package/ffmpeg/patches/patch-configure74
1 files changed, 11 insertions, 63 deletions
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure
index 5ff0e14c8..d3edea539 100644
--- a/package/ffmpeg/patches/patch-configure
+++ b/package/ffmpeg/patches/patch-configure
@@ -1,63 +1,11 @@
---- ffmpeg-0.5.orig/configure 2009-03-01 18:57:14.000000000 +0100
-+++ ffmpeg-0.5/configure 2010-01-06 20:34:48.343750000 +0100
-@@ -1167,7 +1167,7 @@ arch=`uname -m`
- cpu="generic"
-
- # OS
--target_os=$(tolower $(uname -s))
-+target_os=linux
-
- # configurable options
- enable debug
-@@ -2486,51 +2486,6 @@ cmp -s $TMPH config.h &&
-
- rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH
-
--# build tree in object directory if source path is different from current one
--if enabled source_path_used; then
-- DIRS="\
-- doc \
-- libavcodec \
-- libavcodec/alpha \
-- libavcodec/arm \
-- libavcodec/bfin \
-- libavcodec/mlib \
-- libavcodec/ppc \
-- libavcodec/sh4 \
-- libavcodec/sparc \
-- libavcodec/x86 \
-- libavdevice \
-- libavfilter \
-- libavformat \
-- libavutil \
-- libpostproc \
-- libswscale \
-- tests \
-- tools \
-- vhook \
-- "
-- FILES="\
-- Makefile \
-- common.mak \
-- subdir.mak \
-- doc/texi2pod.pl \
-- libavcodec/Makefile \
-- libavdevice/Makefile \
-- libavfilter/Makefile \
-- libavformat/Makefile \
-- libavutil/Makefile \
-- libpostproc/Makefile \
-- libswscale/Makefile \
-- "
-- for dir in $DIRS ; do
-- mkdir -p $dir
-- done
-- for f in $FILES ; do
-- $ln_s "$source_path/$f" $f
-- done
--fi
--
--
- # build pkg-config files
-
- pkgconfig_generate(){
+--- ffmpeg-0.6.orig/configure 2010-06-15 21:44:30.000000000 +0200
++++ ffmpeg-0.6/configure 2010-07-12 21:34:52.258102064 +0200
+@@ -2640,7 +2640,7 @@ if enabled libdc1394; then
+ die "ERROR: No version of libdc1394 found "
+ fi
+
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${sysroot}/usr/bin/sdl-config"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+ sdl_cflags=$("${SDL_CONFIG}" --cflags)
+ sdl_libs=$("${SDL_CONFIG}" --libs)