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

4 files changed, 12 insertions, 38 deletions

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 8c6c9d1e4..63ae39f44 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -35,3 +35,11 @@ ifeq (cygwin,$(BUILD.system))
     FFMPEG.CONFIGURE.extra += --enable-memalign-hack
     FFMPEG.GCC.args.extra = -fno-common
 endif
+
+#
+# MPC8 Doesn't compile on SPARC
+#
+ifeq (solaris,$(BUILD.system))
+    FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
+endif
+
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))"
diff --git a/libhb/decmpeg2.c b/libhb/decmpeg2.c
index 4e21aa151..6ad6127d6 100644
--- a/libhb/decmpeg2.c
+++ b/libhb/decmpeg2.c
@@ -94,7 +94,7 @@ static hb_buffer_t *hb_copy_frame( hb_job_t *job, int width, int height,
         sws_scale( context, in.data, in.linesize, 0, height, out.data, out.linesize );
         sws_freeContext( context );
 
-        u_int8_t *data = buf->data;
+        uint8_t *data = buf->data;
         memcpy( data, out.data[0], dst_wh );
         data += dst_wh;
         // U & V planes are 1/4 the size of Y plane.
@@ -110,7 +110,7 @@ static hb_buffer_t *hb_copy_frame( hb_job_t *job, int width, int height,
     {
         // we're scanning or the frame dimensions match the title's dimensions
         // so we can do a straight copy.
-        u_int8_t *data = buf->data;
+        uint8_t *data = buf->data;
         memcpy( data, y, dst_wh );
         data += dst_wh;
         // U & V planes are 1/4 the size of Y plane.
diff --git a/libhb/module.defs b/libhb/module.defs
index 77a13a02f..e3942f781 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -40,6 +40,8 @@ else ifeq ($(BUILD.system),darwin)
     LIBHB.GCC.D += SYS_DARWIN
 else ifeq ($(BUILD.system),linux)
     LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
+else ifeq ($(BUILD.system),solaris)
+    LIBHB.GCC.D += SYS_SunOS _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
 else
     LIBHB.platform.D = SYS_UNKNOWN
 endif