diff options
| -rw-r--r-- | contrib/Jamfile | 2 | ||||
| -rw-r--r-- | contrib/patch-x264-solaris.patch | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index 2758ad65e..c22c1537b 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -96,7 +96,7 @@ rule LibAvCodec # don't. When we get new versions of FFMPEG we can try enabling # then again. # - FFMPEG_EXTRA_OPTIONS = "--disable-vis --disable-demuxer=mpc8 --disable-vhook" ; + FFMPEG_EXTRA_OPTIONS = "--disable-vis --disable-demuxer=mpc8 --disable-vhook --disable-network" ; } Depends $(<) : $(>) ; diff --git a/contrib/patch-x264-solaris.patch b/contrib/patch-x264-solaris.patch index 9ed0eea34..24d629ff9 100644 --- a/contrib/patch-x264-solaris.patch +++ b/contrib/patch-x264-solaris.patch @@ -65,17 +65,3 @@ diff -ru x264/version.sh x264.solaris/version.sh 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 -ru x264/common/osdep.h x264.solaris/common/osdep.h ---- x264/common/osdep.h Mon Jun 9 01:36:08 2008 -+++ x264.solaris/common/osdep.h Thu Jun 19 10:52:56 2008 -@@ -48,6 +48,10 @@ - #define X264_VERSION "" // no configure script for msvc - #endif - -+#if defined(SYS_SunOS) -+#define isfinite _finite -+#endif -+ - #ifdef SYS_OPENBSD - #define isfinite finite - #endif |