update to ffmpeg-20090809

packages/multimedia/ffmpeg/build

@@ -19,12 +19,15 @@ else
 fi
 
 if [ "$DEVTOOLS" = "yes" ]; then
-  DEVTOOLS_CONFIG="--enable-ffmpeg"
+  $SCRIPTS/build SDL
+  $SCRIPTS/build SDL_image
+  $SCRIPTS/build SDL_mixer
+  DEVTOOLS_CONFIG="--enable-ffplay"
 else
-  DEVTOOLS_CONFIG=""
+  DEVTOOLS_CONFIG="--disable-ffplay"
 fi
 
-cd $PKG_BUILD
+cd $PKG_BUILD/
 ./configure --enable-cross-compile \
             --cross-prefix=$TARGET_PREFIX \
             --arch=$TARGET_NAME \
@@ -34,11 +37,9 @@ cd $PKG_BUILD
             --disable-static \
             --enable-shared \
             --enable-gpl \
-            --disable-ffplay \
             --disable-ffserver \
-            $DEVTOOLS_CONFIG \
+            --disable-ffmpeg \
             --enable-postproc \
-            --enable-swscale \
             --disable-avfilter \
             --disable-avfilter-lavf \
             --enable-pthreads \
@@ -59,7 +60,8 @@ cd $PKG_BUILD
             --enable-zlib \
             --enable-libfaad \
             $DEBUG_CONFIG \
+            $DEVTOOLS_CONFIG \
 
 make
 
-$MAKEINSTALL
+$MAKEINSTALL

packages/multimedia/ffmpeg/install

@@ -10,10 +10,11 @@ cp -P $PKG_BUILD/libavformat/libavformat.so* $INSTALL/usr/lib
 cp -P $PKG_BUILD/libavutil/libavutil.so* $INSTALL/usr/lib
 cp -P $PKG_BUILD/libswscale/libswscale.so.* $INSTALL/usr/lib
 cp -P $PKG_BUILD/libpostproc/libpostproc.so.* $INSTALL/usr/lib
-cp -P $PKG_BUILD/libswscale/libswscale.so.*  $INSTALL/usr/lib
 
 if [ "$DEVTOOLS" = "yes" ]; then
-  mkdir -p $INSTALL/usr/bin
-  cp -P $PKG_BUILD/ffmpeg $INSTALL/usr/bin
-  cp -P $PKG_BUILD/libavdevice/libavdevice.so.* $INSTALL/usr/lib
+  $SCRIPTS/install SDL
+  $SCRIPTS/install SDL_image
+  $SCRIPTS/install SDL_mixer
+  mkdir -p $INSTALL/usr/bin && cp -P $BUILD/$1*/ffplay $INSTALL/usr/bin
+  cp -P $PKG_BUILD/libavdevice/libavdevice.so* $INSTALL/usr/lib
 fi

packages/multimedia/ffmpeg/patches/01_sdl-config.diff

@@ -0,0 +1,12 @@
+diff -Naur ffmpeg-export-2009-06-13.orig/configure ffmpeg-export-2009-06-13/configure
+--- ffmpeg-export-2009-06-13.orig/configure	2009-06-10 22:50:53.000000000 +0200
++++ ffmpeg-export-2009-06-13/configure	2009-06-21 14:51:52.000000000 +0200
+@@ -2129,7 +2129,7 @@
+ 
+ disable sdl_too_old
+ disable sdl
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="sdl-config"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+     sdl_cflags=$("${SDL_CONFIG}" --cflags)
+     temp_cflags $sdl_cflags

packages/multimedia/ffmpeg/url

@@ -1 +1 @@
-http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2
+http://sources.openelec.tv/svn/ffmpeg-20090809.tar.bz2