diff options
| author | eddyg <[email protected]> | 2008-08-20 01:54:42 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2008-08-20 01:54:42 +0000 |
| commit | 130d8b674f03a63313997f358a980ad27e0d48f4 (patch) | |
| tree | 5521ac0763ea0126bfaa98f5f97dfb298630b620 /contrib | |
| parent | 074580619aa266cb4a0c047842f48caec07a9b37 (diff) | |
Fix Solaris builds
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1646 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Jamfile | 2 | ||||
| -rw-r--r-- | contrib/patch-x264-solaris.patch | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index b3a8545db..9bd41485b 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -391,7 +391,7 @@ actions LibTheora { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libtheora && (gzip -dc libtheora.tar.gz | tar xf - ) && cd libtheora && - export HAVE_PKG_CONFIG="no" && + HAVE_PKG_CONFIG="no" && export HAVE_PKG_CONFIG && ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --with-vorbis=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared \ --disable-oggtest --disable-vorbistest --disable-sdltest --disable-examples && $(MAKE) && $(MAKE) install && diff --git a/contrib/patch-x264-solaris.patch b/contrib/patch-x264-solaris.patch index ac271d570..9ed0eea34 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" |