X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fpatch-x264-solaris.patch;h=24d629ff9a2b0058b1d216e201eb491fa766eda1;hb=f9341345b37e0738a140423297c222a7e40eddab;hp=ac271d5700e9914b96ea4560ebb70cc71d2c7c83;hpb=56fe6b674dec41afa8539ea5a0edc17bde174895;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/patch-x264-solaris.patch b/contrib/patch-x264-solaris.patch
index ac271d57..24d629ff 100644
--- a/contrib/patch-x264-solaris.patch
+++ b/contrib/patch-x264-solaris.patch
@@ -15,15 +15,15 @@ diff -ru x264/Makefile x264.solaris/Makefile
  	install -m 644 libx264.a $(DESTDIR)$(libdir)
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
 diff -ru x264/configure x264.solaris/configure
---- x264/configure	Mon Jun  9 01:36:08 2008
-+++ x264.solaris/configure	Thu Jun 19 12:10:24 2008
+--- x264/configure	Tue Aug 12 03:26:58 2008
++++ x264.modified/configure	Tue Aug 19 16:09:32 2008
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#! /usr/xpg4/bin/sh
  
  if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
  
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
  # check whether 'echo -n' works as expected, otherwise try printf
  if [ "x`echo -n houba`" = xhouba ]
  then
@@ -32,7 +32,16 @@ diff -ru x264/configure x264.solaris/configure
  elif [ "x`printf houba`" = xhouba ]
  then
    ECHON="printf"
-@@ -319,8 +319,10 @@
+@@ -321,8 +321,6 @@
+         echo "If you really want to compile without asm, configure with --disable-asm."
+         exit 1
+     fi
+-else
+-    AS=""
+ fi
+ 
+ CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
+@@ -329,8 +327,10 @@
  
  echo "unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';" > conftest.c
  $CC $CFLAGS conftest.c -c -o conftest.o 2>$DEVNULL || die "endian test failed"
@@ -56,17 +65,3 @@ diff -ru x264/version.sh x264.solaris/version.sh
      VER=`git-rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
      if [ $VER != $LOCALVER ] ; then
          VER="$VER+$(($LOCALVER-$VER))"
-diff -ru x264/common/osdep.h x264.solaris/common/osdep.h
---- x264/common/osdep.h	Mon Jun  9 01:36:08 2008
-+++ x264.solaris/common/osdep.h	Thu Jun 19 10:52:56 2008
-@@ -48,6 +48,10 @@
- #define X264_VERSION "" // no configure script for msvc
- #endif
- 
-+#if defined(SYS_SunOS)
-+#define isfinite _finite
-+#endif
-+
- #ifdef SYS_OPENBSD
- #define isfinite finite
- #endif