Fix Solaris builds

git-svn-id: svn://localhost/HandBrake/trunk@1646 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/Jamfile b/contrib/Jamfile
index b3a8545..9bd4148 100644 (file)
--- 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 ac271d5..9ed0eea 100644 (file)
--- 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"