From bc8b33cdcb075e21c45669e06a6e4e827e0c2424 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@xbmc.org>
Date: Sun, 30 Jan 2011 02:15:10 +0200
Subject: [PATCH] updated: update ffmpeg add-build-scripts.patch to reflect
 tree state

---
 .../patches/0030-add-build-scripts.patch      | 53 ++++++++++++-------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/lib/ffmpeg/patches/0030-add-build-scripts.patch b/lib/ffmpeg/patches/0030-add-build-scripts.patch
index a00b0c20909b9..1882023801deb 100644
--- a/lib/ffmpeg/patches/0030-add-build-scripts.patch
+++ b/lib/ffmpeg/patches/0030-add-build-scripts.patch
@@ -1,18 +1,18 @@
-From 325e678b4ac86e5b16d4679617bda597b8ddc13f Mon Sep 17 00:00:00 2001
+From 3259b08a06055fadb55e38063620f678536d7122 Mon Sep 17 00:00:00 2001
 From: Cory Fields <theuni-nospam-@xbmc.org>
 Date: Fri, 9 Jul 2010 16:50:49 -0400
-Subject: [PATCH 30/32] add build scripts
+Subject: [PATCH] add build scripts
 
 ---
  build_xbmc.sh       |   30 +++++++++++++++++++++++++++
  build_xbmc_win32.sh |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 85 insertions(+), 0 deletions(-)
- create mode 100755 build_xbmc.sh
+ create mode 100644 build_xbmc.sh
  create mode 100644 build_xbmc_win32.sh
 
 diff --git a/build_xbmc.sh b/build_xbmc.sh
-new file mode 100755
-index 0000000..069503a
+new file mode 100644
+index 0000000..3fe4415
 --- /dev/null
 +++ b/build_xbmc.sh
 @@ -0,0 +1,30 @@
@@ -31,7 +31,7 @@ index 0000000..069503a
 +gcc -shared -fPIC --soname,avutil-51-i486-linux.so -o avutil-51-i486-linux.so -rdynamic libavutil/*.o 
 +
 +echo wrapping libavcodec
-+gcc -o avcodec-51-i486-linux.so --soname,avcodec-51-i486-linux.so -shared -fPIC -rdynamic /usr/lib/libfaac.a  libavcodec/*.o libavcodec/i386/*.o `cat $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.def` $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.o
++gcc -o avcodec-51-i486-linux.so --soname,avcodec-51-i486-linux.so -shared -fPIC -rdynamic libavcodec/*.o libavcodec/i386/*.o `cat $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.def` $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.o
 +
 +echo wrapping libavformat
 +gcc -o avformat-51-i486-linux.so --soname,avformat-51-i486-linux.so -shared  -fPIC  -rdynamic libavformat/*.o `cat $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.def`,-export-all-symbols $XBMC_ROOT/xbmc/cores/DllLoader/exports/wrapper.o
@@ -48,17 +48,27 @@ index 0000000..069503a
 +
 diff --git a/build_xbmc_win32.sh b/build_xbmc_win32.sh
 new file mode 100644
-index 0000000..8efebcc
+index 0000000..baf42e4
 --- /dev/null
 +++ b/build_xbmc_win32.sh
 @@ -0,0 +1,55 @@
-+#!/bin/bash 
++#!/bin/bash
++
++START_PATH=`pwd`
++if [ $START_PATH != "/xbmc/lib/ffmpeg" ]
++then
++cd /xbmc/lib/ffmpeg
++fi
++
 +if [ -d .libs ]
 +then
 +rm -r .libs
 +fi
 +
++if [ -f config.mak ]
++then
 +make distclean
++fi
 +
 +OPTIONS="
 +--enable-shared \
@@ -67,30 +77,37 @@ index 0000000..8efebcc
 +--enable-w32threads \
 +--enable-postproc \
 +--enable-zlib \
-+--enable-libfaad \
 +--disable-static \
 +--disable-altivec \
 +--disable-muxers \
 +--disable-encoders \
 +--disable-debug \
++--disable-ffplay \
++--disable-ffserver \
++--disable-ffmpeg \
++--disable-ffprobe \
++--disable-devices \
 +--enable-muxer=spdif \
 +--enable-muxer=adts \
 +--enable-encoder=ac3 \
-+--enable-encoder=aac"
++--enable-encoder=aac \
++--enable-runtime-cpudetect \
++--disable-debug"
 +
-+./configure --extra-cflags="-fno-common -I../libfaad2/include -Iinclude/dxva2" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
++./configure --extra-cflags="-fno-common -Iinclude/dxva2" --extra-ldflags="-L../../../../../system/players/dvdplayer" ${OPTIONS} &&
 + 
 +make -j3 && 
 +mkdir .libs &&
 +cp lib*/*.dll .libs/ &&
 +mv .libs/swscale-0.dll .libs/swscale-0.6.1.dll &&
-+cp .libs/avcodec-52.dll ../../../../../system/players/dvdplayer/ &&
-+cp .libs/avformat-52.dll ../../../../../system/players/dvdplayer/ &&
-+cp .libs/avutil-50.dll ../../../../../system/players/dvdplayer/ &&
-+cp .libs/postproc-51.dll ../../../../../system/players/dvdplayer/ &&
-+cp .libs/swscale-0.6.1.dll ../../../../../system/players/dvdplayer/ &&
-+cp libavutil/avconfig.h include/libavutil/
++cp .libs/avcodec-52.dll /xbmc/system/players/dvdplayer/ &&
++cp .libs/avformat-52.dll /xbmc/system/players/dvdplayer/ &&
++cp .libs/avutil-50.dll /xbmc/system/players/dvdplayer/ &&
++cp .libs/postproc-51.dll /xbmc/system/players/dvdplayer/ &&
++cp .libs/swscale-0.6.1.dll /xbmc/system/players/dvdplayer/
 +
++cd $START_PATH
+\ No newline at end of file
 -- 
-1.7.0
+1.7.3