diff options
| author | eddyg <[email protected]> | 2008-06-19 04:23:52 +0000 |
|---|---|---|
| committer | eddyg <[email protected]> | 2008-06-19 04:23:52 +0000 |
| commit | 5bf415fc8aa22376f5f81cf2b9c315bc4751adfe (patch) | |
| tree | e0f3a27393329c54abfe57777db658d3799da6ff /contrib/patch-ffmpeg-solaris.patch | |
| parent | 5cdb0e7948c4170af40742190d5778aeb3ef58ac (diff) | |
Reintroduce Solaris support. Fully tested on everything - apart from Windows, which really shouldn't be affected. Note that I've disabled troublesome components in ffmpeg that didn't work with Solaris. And disabled X support in libmpeg2 for all platforms - 'cos it shouldn't have been there.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1531 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/patch-ffmpeg-solaris.patch')
| -rw-r--r-- | contrib/patch-ffmpeg-solaris.patch | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/contrib/patch-ffmpeg-solaris.patch b/contrib/patch-ffmpeg-solaris.patch index b5e483829..f5cd7d726 100644 --- a/contrib/patch-ffmpeg-solaris.patch +++ b/contrib/patch-ffmpeg-solaris.patch @@ -1,29 +1,25 @@ ---- ffmpeg.base/configure Wed Oct 10 15:39:57 2007 -+++ ffmpeg/configure Wed Oct 10 15:51:44 2007 -@@ -889,7 +889,7 @@ - source_path_used="no" - else - source_path="`cd \"$source_path\"; pwd`" -- echo "$source_path" | grep -q '[[:blank:]]' && -+ echo "$source_path" | /usr/xpg4/bin/grep -q '[[:blank:]]' && - die "Out of tree builds are impossible with whitespace in source path." +--- ffmpeg/configure Sat Jun 7 03:19:09 2008 ++++ ffmpeg.solaris/configure Thu Jun 19 12:10:48 2008 +@@ -50,6 +50,9 @@ + exit 1 fi -@@ -993,7 +993,7 @@ - ;; - --enable-?*|--disable-?*) - eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` -- echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt -+ echo "$CMDLINE_SELECT" | /usr/xpg4/bin/grep -q "^ *$option\$" || die_unknown $opt - $action $option - ;; - --list-*) -@@ -1368,7 +1368,7 @@ - fi ++# Solaris must use the xpg4 version of grep ++PATH=/usr/xpg4/bin:$PATH ++ + show_help(){ + echo "Usage: configure [options]" + echo "Options: [defaults in brackets after descriptions]" +@@ -1585,8 +1588,11 @@ + check_cc <<EOF || die "endian test failed" + unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; + EOF +-od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian ++#od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian ++/usr/bin/tr -cd "BIGE" < $TMPO | grep -q 'B *I *G *E' && enable bigendian - gnu_make(){ -- $1 --version 2>&1 | grep -q GNU -+ $1 --version 2>&1 | /usr/xpg4/bin/grep -q GNU - } ++echo "BIGE=$bigendian" ++ + # --- + # check availability of some header files - if ! gnu_make $make; then |