aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@xbmc.org>2011-02-23 18:49:43 +0200
committerAnssi Hannula <anssi@xbmc.org>2011-02-23 23:49:07 +0200
commit61f285644db19a03384acc6c1fcb328c6d66d6b7 (patch)
treec3e05d8530a7c11672b77333d074980591235dd5
parentfa5a1ca75a884083f09cbfcfb9d8b4e969ce8584 (diff)
updated: ffmpeg win32 build script patch to reflect tree state
-rw-r--r--lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch b/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch
index 210229205f..a0344ef2dd 100644
--- a/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch
+++ b/lib/ffmpeg/patches/0026-add-files-needed-for-xbmc-win32-build.patch
@@ -1,14 +1,14 @@
-From 64b0c51701e4c954e4bab5dc78dc09eb81c836ff Mon Sep 17 00:00:00 2001
+From 5931c5bb05da02fa495d99b3b7e86239a2b79374 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Fri, 4 Feb 2011 12:38:15 +0200
Subject: [PATCH] add files needed for xbmc win32 build
---
.gitignore | 5 +
- build_xbmc_win32.sh | 48 +++
+ build_xbmc_win32.sh | 49 +++
include-xbmc-win32/dxva2/dxva2api.h | 502 +++++++++++++++++++++++++++++++
include-xbmc-win32/libavutil/avconfig.h | 6 +
- 4 files changed, 561 insertions(+), 0 deletions(-)
+ 4 files changed, 562 insertions(+), 0 deletions(-)
create mode 100644 build_xbmc_win32.sh
create mode 100644 include-xbmc-win32/dxva2/dxva2api.h
create mode 100644 include-xbmc-win32/libavutil/avconfig.h
@@ -28,10 +28,10 @@ index eac1758..70b94fc 100644
+*.lib
diff --git a/build_xbmc_win32.sh b/build_xbmc_win32.sh
new file mode 100644
-index 0000000..3d005d6
+index 0000000..5befc5a
--- /dev/null
+++ b/build_xbmc_win32.sh
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,49 @@
+#!/bin/bash
+
+if [ -d .libs ]
@@ -66,11 +66,12 @@ index 0000000..3d005d6
+--enable-encoder=ac3 \
+--enable-encoder=aac \
+--enable-runtime-cpudetect \
-+--disable-debug"
++--disable-debug \
++--disable-doc"
+
+./configure --extra-cflags="-fno-common -Iinclude-xbmc-win32/dxva2" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
+
-+make -j3 &&
++make &&
+mkdir .libs &&
+cp lib*/*.dll .libs/ &&
+mv .libs/swscale-0.dll .libs/swscale-0.6.1.dll &&