X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fffmpeg%2FP02-darwin-pic.patch;h=c151b2950e9cf2958b86fc49ac69dfa2d62e63c1;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=3368da8bec7385d1bc6a67f1f2da9bbfff122b3a;hpb=a17e2c45e86bc502be186b43efbea67f63b206c9;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/ffmpeg/P02-darwin-pic.patch b/contrib/ffmpeg/P02-darwin-pic.patch
index 3368da8b..c151b295 100644
--- 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
+