# is installed for all other systems
if $(OS) = MACOSX
{
- WGET = curl -L -o ;
+ WGET = curl -q -L -o ;
}
else
{
else if $(OS) = SOLARIS
{
FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-solaris.patch " ;
- }
+ }
+ else if $(OS) = MACOSX
+ {
+ FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-h264dsp-crash.diff " ;
+ }
if $(OS) = SOLARIS
{
# 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 $(<) : $(>) ;
--disable-shared --enable-static --disable-encoders \
--enable-encoder=mpeg4 --enable-encoder=ac3 --enable-encoder=snow \
--enable-libfaad --disable-ffmpeg --disable-ffserver \
- --disable-muxers --enable-muxer=ipod --disable-bsfs \
+ --disable-muxers --enable-muxer=ipod --disable-bsfs --disable-vhook \
--extra-cflags="-I$CONTRIB/include" \
--extra-ldflags="-L$CONTRIB/lib" $(FFMPEG_EXTRA_OPTIONS) &&
$(MAKE) && $(MAKE) install &&
{
cd `dirname $(>)` && CONTRIB=`pwd` &&
rm -rf libmp4v2 && (gzip -dc libmp4v2.tar.gz | tar xf - ) &&
- cd mp4v2 && $(LIBMP4V2_PATCH) ./configure --prefix=$CONTRIB &&
- $(MAKE) && make install && cp *.h $CONTRIB/include &&
+ cd libmp4v2 && $(LIBMP4V2_PATCH) rm -rf build && mkdir build && cd build &&
+ ../configure --disable-shared --disable-debug --prefix=$CONTRIB && $(MAKE) && $(MAKE) install &&
$(STRIP) $CONTRIB/lib/libmp4v2.a
}
Wget $(SUBDIR)/libmp4v2.tar.gz : $(SUBDIR)/version_libmp4v2.txt ;
{
LIBX264_PATCH += " $(PATCH) -p1 < ../patch-x264-solaris.patch && " ;
}
- LIBX264_PATCH += "$(PATCH) -p0 < ../patch-x264-idr.patch && " ;
- Depends $(<) : $(>) ;
+ Depends $(<) : $(>) ;
Depends lib : $(<) ;
}
actions LibX264