LinGui: make Help->Guide work on windows/mingw

[handbrake-jp/handbrake-jp-git.git] / contrib / ffmpeg / P02-darwin-pic.patch

diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch
index 3368da8..c151b29 100644 (file)
--- a/contrib/ffmpeg/P02-darwin-pic.patch
+++ b/contrib/ffmpeg/P02-darwin-pic.patch
@@ -1,16 +1,8 @@
-diff -Naur ffmpeg-r20602.orig/configure ffmpeg-r20602/configure
---- ffmpeg-r20602.orig/configure       2009-11-24 15:17:19.000000000 -0800
-+++ ffmpeg-r20602/configure    2009-11-27 12:02:03.659012744 -0800
-@@ -1913,7 +1913,7 @@
- 
- enable $arch $subarch
- enabled spic && enable pic
--check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
-+#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
- 
- # OS specific
- case $target_os in
-@@ -1982,6 +1982,7 @@
+Index: configure
+===================================================================
+--- ffmpeg.orig/configure      (revision 22823)
++++ ffmpeg/configure   (working copy)
+@@ -2191,6 +2191,7 @@
          FFSERVERLDFLAGS=-Wl,-bind_at_load
          objformat="macho"
          enabled x86_64 && objformat="macho64"
@@ -18,3 +10,12 @@ diff -Naur ffmpeg-r20602.orig/configure ffmpeg-r20602/configure
          enabled_any pic shared ||
              { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
          ;;
+@@ -2291,7 +2292,7 @@
+         ;;
+ esac
+ 
+-check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
++#check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
+ 
+ set_default $PATHS_LIST
+