diff options
| author | eddyg <[email protected]> | 2009-03-20 04:30:04 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2009-03-20 04:30:04 +0000 |
| commit | af73d2a799fa4b3f3effe57e9c184079ee1872c3 (patch) | |
| tree | 7f881c4568df207557a9b84dfba36d22eaeb4700 /contrib/x264 | |
| parent | 24a14d05f1e1ddc42c9a0ccb9b0c4dfdc2ce29d2 (diff) | |
Another minor step on the way back to Solaris compiles - not linking as yet.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2265 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x264')
| -rw-r--r-- | contrib/x264/P01-solaris.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/contrib/x264/P01-solaris.patch b/contrib/x264/P01-solaris.patch index 24d629ff9..3c0e1daa0 100644 --- a/contrib/x264/P01-solaris.patch +++ b/contrib/x264/P01-solaris.patch @@ -17,30 +17,6 @@ diff -ru x264/Makefile x264.solaris/Makefile diff -ru x264/configure x264.solaris/configure --- 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 - -@@ -75,7 +75,7 @@ - # check whether 'echo -n' works as expected, otherwise try printf - if [ "x`echo -n houba`" = xhouba ] - then -- ECHON="echo -n" -+ ECHON="/usr/ucb/echo -n" - elif [ "x`printf houba`" = xhouba ] - then - ECHON="printf" -@@ -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 @@ -53,15 +29,3 @@ diff -ru x264/configure x264.solaris/configure # autodetect options that weren't forced nor disabled libpthread="" -diff -ru x264/version.sh x264.solaris/version.sh ---- x264/version.sh Mon Jun 9 01:36:08 2008 -+++ x264.solaris/version.sh Thu Jun 19 11:56:19 2008 -@@ -1,7 +1,7 @@ - #!/bin/sh - git-rev-list HEAD | sort > config.git-hash - LOCALVER=`wc -l config.git-hash | awk '{print $1}'` --if [ $LOCALVER \> 1 ] ; then -+if [ $LOCALVER -gt 1 ] ; then - VER=`git-rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'` - if [ $VER != $LOCALVER ] ; then - VER="$VER+$(($LOCALVER-$VER))" |